Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #287 from nextcloud/rc1-for-9-0-52v9.0.52RC1 | Lukas Reschke | 2016-07-01 | 1 | -2/+2 |
|\ | |||||
| * | 9.0.52 RC1 | Lukas Reschke | 2016-07-01 | 1 | -2/+2 |
|/ | |||||
* | Revert "Revert "[stable9] Don't show the updater if updater is incompatible"" | Lukas Reschke | 2016-07-01 | 3 | -13/+108 |
* | Merge pull request #277 from nextcloud/traversal-directory-js | Björn Schießle | 2016-07-01 | 2 | -2/+15 |
|\ | |||||
| * | Match on 405 | Lukas Reschke | 2016-07-01 | 2 | -1/+6 |
| * | Match for /../ | Lukas Reschke | 2016-07-01 | 2 | -1/+5 |
| * | Do not allow directory traversal using "../" | Lukas Reschke | 2016-07-01 | 2 | -1/+5 |
* | | Merge pull request #282 from nextcloud/fix-tests | Björn Schießle | 2016-07-01 | 12 | -50/+53 |
|\ \ | |||||
| * | | Fix Single execution of preview tests | Joas Schilling | 2016-07-01 | 2 | -0/+10 |
| * | | Fix Comments tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -10/+0 |
| * | | Fix Sharing app tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 2 | -8/+4 |
| * | | Fix Encryption tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 2 | -7/+6 |
| * | | Fix DAV tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -22/+26 |
| * | | Fix Share Manager tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+1 |
| * | | Fix Notification tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| * | | Fix Appframework tests with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+3 |
| * | | Fix AvatarControllerTest with phpunit 5.2+ | Joas Schilling | 2016-07-01 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #244 from nextcloud/theming-app-stable9 | Björn Schießle | 2016-07-01 | 23 | -6/+4075 |
|\ \ | |||||
| * | | Also fix the dav test | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| * | | Clear the storage wrappers after clearing the hooks | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| * | | initial commit for the theming app | Bjoern Schiessle | 2016-06-30 | 21 | -6/+4071 |
* | | | Merge pull request #274 from nextcloud/stable9-sync-upstream | Morris Jobke | 2016-07-01 | 2 | -2/+10 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream | Lukas Reschke | 2016-07-01 | 2 | -2/+10 |
| |\ \ | |||||
| | * \ | Merge pull request #25264 from owncloud/stable9-search-fixsearchfromotherfile... | Vincent Petry | 2016-07-01 | 1 | -2/+9 |
| | |\ \ | |||||
| | | * | | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | | * | | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | * | | | Merge pull request #25234 from owncloud/stable9-iedavclient-nullheaders | Vincent Petry | 2016-07-01 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Init the headers in iedavclient.js | Vincent Petry | 2016-06-22 | 1 | -0/+1 |
| | * | | | | ownCloud 9.0.3v9.0.3 | Daniel Molkentin | 2016-06-29 | 1 | -2/+2 |
| | | |/ / | | |/| | | |||||
* | | | | | Merge pull request #254 from nextcloud/fix-229-stable9 | Morris Jobke | 2016-06-30 | 2 | -1/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | get only vcard which match both the address book id and the vcard uri | Bjoern Schiessle | 2016-06-30 | 2 | -1/+6 |
* | | | | | Merge pull request #266 from nextcloud/fix-262 | Björn Schießle | 2016-06-30 | 1 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | getShareByToken() should also consider remote shares | Bjoern Schiessle | 2016-06-30 | 1 | -1/+11 |
* | | | | | | Merge pull request #260 from nextcloud/fix-versions-stable9 | Lukas Reschke | 2016-06-30 | 1 | -5/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | check permissions before rollback | Bjoern Schiessle | 2016-06-30 | 1 | -5/+11 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #249 from nextcloud/add-exemption-for-acs | Lukas Reschke | 2016-06-30 | 1 | -0/+17 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add exemption for ACS endpoint | Lukas Reschke | 2016-06-29 | 1 | -0/+17 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #261 from nextcloud/stable9-fix243 | Marius Blüm | 2016-06-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | targets 3rdparty submodule from Nc instead of oC | Marius Blüm | 2016-06-30 | 1 | -1/+1 |
* | | | | | | Merge pull request #265 from nextcloud/stable9-add-wnd | Morris Jobke | 2016-06-30 | 12 | -5/+679 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [stable9] Backport WND | Lukas Reschke | 2016-06-30 | 12 | -5/+679 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #251 from nextcloud/make-it-user-saml | Marius Blüm | 2016-06-30 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Mark user_saml official and kill user_shibboleth | Lukas Reschke | 2016-06-30 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #263 from nextcloud/dav-permission-check-stable9 | Morris Jobke | 2016-06-30 | 4 | -6/+97 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Name method properly | Lukas Reschke | 2016-06-30 | 1 | -1/+1 |
| * | | | | | add some additonal permission checks to the webdav backend | Bjoern Schiessle | 2016-06-30 | 4 | -6/+97 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #240 from nextcloud/password_policy_events_stable9 | Lukas Reschke | 2016-06-30 | 8 | -63/+138 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add events to check passwords with the password policy app | Bjoern Schiessle | 2016-06-28 | 8 | -63/+138 |
| |/ / / | |||||
* | | | | Merge pull request #259 from nextcloud/stable9-set-disposition | Lukas Reschke | 2016-06-30 | 2 | -2/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [stable9] Set content-type to "application/octet-stream" | Lukas Reschke | 2016-06-30 | 2 | -2/+7 |
|/ / / |