Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge from develop 2.0 for release #1095

Merged
merged 170 commits into from
Mar 29, 2015
Merged

merge from develop 2.0 for release #1095

merged 170 commits into from
Mar 29, 2015

Conversation

fehguy
Copy link
Contributor

@fehguy fehguy commented Mar 29, 2015

No description provided.

vincentjames501 and others added 30 commits July 24, 2014 08:35
@vincentjames501
If possible, support audio content types
698db2a 
Adding support for HTML5 audio playback if the browser supports both the audio HTML5 element and the content type.
add simple translation support
483fff8
more phrases
020c738
translated of title-attribute and extended a list ow known lexemes
49e6389
merge
f6d1fd0
@daedeloth
Adding (ignored) oauth2 state parameter.
9c65824
@mohsen1
Add underscore source map file
a6f20aa 
Fixes #949
@fehguy
Merge pull request #951 from mohsen1/develop_2.0
a20825e 
Add underscore source map file
@mohsen1
Set marked options to render GFM correctly
4613723 
Fixes #825
@mohsen1
When running gulp watch watch handlebars file changes too
82323e2
@mohsen1
Add 'required' class to list parameter if it's required
8abc30a 
Fixes #700
@mohsen1
user gulp-order to produce ordered template
0cd13c7
@fehguy
Merge pull request #960 from mohsen1/develop_2.0
0a0e384 
Set marked options to render GFM correctly and fix #700
@fehguy
Merge pull request #964 from mohsen1/diff-fix
3249125 
Diff fix
@fehguy
updated js lib
7d3d100
@fehguy
merged
b6c05bd
codestyle
5bc2a5d
readme
6b78d3e
merg
707e848
@fehguy
reverted files
82d8356
@IvanGoncharov
Oauth 2.0: use space as delimiter for scopes.
28e493c
@fehguy
rebuilt client
41976fe
@fehguy
Merge branch 'develop_2.0' of https://github.com/APIs-guru/swagger-ui …
0faf307 
…into APIs-guru-develop_2.0
@fehguy
Merge branch 'APIs-guru-develop_2.0' into develop_2.0t push origin de…
3abe601 
…velop_2.0
@fehguy
made space-delimited
322892e
Appended the checks of existing of translated attributes
8a206e1
@stefanotravelli @mohsen1
Fix OAuth2 login when no scope is defined
bb1ebce
@fehguy @mohsen1
reduced timeout
352e049
@fehguy @mohsen1
moved from render to init method
c847551
@fehguy @mohsen1
updated from master
9d0c6c5
fehguy and others added 24 commits March 24, 2015 13:10
@fehguy
Merge pull request #1064 from mohsen1/umd
b78a8e5 
Make SwaggerUi UMD compatible
@mohsen1
Add ability to override redirectUrl in swagger-oauth
ede1faa 
Fixes #457
@mohsen1
Rename redirectUrl optoon to oauth2RedirectUrl
6523318
@fehguy
Merge pull request #1066 from mohsen1/configurable-redirecturl
a7093e6 
Add ability to override redirectUrl in swagger-oauth
@151dd
Fixing sorter typo
7979f75 
Original code didn't work because of a mix between the use of 'apisSorters' and 'apisSorter' references. Changed all 'apisSorters' refs to 'apisSorter'.
@mohsen1
Use SwaggerJS from npm
99eaf4e 
* Uses npm to download latest swagger-js (for now. When swagger-js is
   released we will replace git address with actual swagger-ui)

* Uses `postinstall` to generate `browser` folder of swagger-ui. This
 can go when swagger-ui is published.
@mohsen1
Append .json to v1 spec files to enforce Content-Type when serving in…
445e035 
… test
@mohsen1
Use node_modules/.bin for binary executions in scripts of package.json
70114fe
@fehguy
Merge pull request #1067 from mohsen1/use-swagger-js-from-npm
68e2543 
Use SwaggerJS from npm
@mohsen1
xit out tests that are failing due to SwaggerJS
b36c6e5
@fehguy
Update .travis.yml
cc8f9ef
@mohsen1
Merge pull request #1074 from mohsen1/xit
cc34e27 
xit out tests that are failing due to SwaggerJS
@mohsen1
Add file download to try operation
6b8f6e2
@mohsen1
Add support for downloading via Blob
c157fe4
@mohsen1
Add link innerText
d451c2b
@mohsen1
Fix JSHint issues
3de0b36
@mohsen1
Merge pull request #1071 from danrice01/patch-1
311abe7 
Fixing sorter typo
@fehguy
Merge pull request #1079 from mohsen1/develop_2.0
f9db063 
Add file download to try operation
@fehguy
updated links
e214e7a
@fehguy
removed shred
82a29e4
@fehguy
rebuilt
0c6fcde
@mohsen1
Cleanup package.json
0cf041d 
swagger-client@2.1.0-M2.alpha2 need to get published for this
@fehguy
Merge pull request #1094 from mohsen1/pkg.json
987c5d4 
Cleanup package.json
@fehguy
updated package, rebuilt
978588a
@fehguy
Copy link
Contributor Author

fehguy commented Mar 29, 2015

@mohsen1 check it out, please

@mohsen1
Copy link
Contributor

mohsen1 commented Mar 29, 2015

@fehguy Looks good. I made 1ea7786 to clean up a bit. The releases table needs a quick update with M2 stuff. You can merge and then make that change in master too

fehguy added a commit that referenced this pull request Mar 29, 2015
@fehguy
Merge pull request #1095 from swagger-api/develop_2.0
6254644 
merge from develop 2.0 for release
@fehguy fehguy merged commit 6254644 into master Mar 29, 2015
vincent-zurczak pushed a commit to roboconf/swagger-ui that referenced this pull request Aug 18, 2016
@fehguy
Merge pull request swagger-api#1095 from swagger-api/develop_2.0
b5205a7 
merge from develop 2.0 for release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@fehguy @mohsen1 @briehman @vincentjames501 @daedeloth @IvanGoncharov @stefanotravelli @webron @whitlockjc @151dd