Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add additional check if we have a valid uid and filename | Bjoern Schiessle | 2016-07-04 | 1 | -0/+4 |
| | |||||
* | Revert "Revert "[stable9] Don't show the updater if updater is incompatible"" | Lukas Reschke | 2016-07-01 | 3 | -13/+108 |
| | | | | This reverts commit f8964705420d64a33e595922c40b5efe1217eaa4. | ||||
* | Merge pull request #277 from nextcloud/traversal-directory-js | Björn Schießle | 2016-07-01 | 2 | -2/+15 |
|\ | | | | | [stable9] Do not allow directory traversal using "../" in JS file list | ||||
| * | 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 |
| | | | | | | | | | | | | | | | | We should not allow directory traversals using "../" here. To test access the following URL once with and then without this patch: http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here | ||||
* | | Merge pull request #282 from nextcloud/fix-tests | Björn Schießle | 2016-07-01 | 6 | -47/+36 |
|\ \ | | | | | | | Fix unit test compatibility issues with phpunit 5.2+ | ||||
| * | | 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 |
| |/ | |||||
* | | Merge pull request #244 from nextcloud/theming-app-stable9 | Björn Schießle | 2016-07-01 | 15 | -0/+4043 |
|\ \ | | | | | | | [stable9] theming app | ||||
| * | | Also fix the dav test | Joas Schilling | 2016-07-01 | 1 | -0/+2 |
| | | | |||||
| * | | initial commit for the theming app | Bjoern Schiessle | 2016-06-30 | 14 | -0/+4041 |
| | | | |||||
* | | | Merge pull request #274 from nextcloud/stable9-sync-upstream | Morris Jobke | 2016-07-01 | 1 | -2/+9 |
|\ \ \ | |_|/ |/| | | [Stable9] sync upstream | ||||
| * | | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstream | Lukas Reschke | 2016-07-01 | 1 | -2/+9 |
| |\ \ | |||||
| | * | | Hide search results after switching directory | Vincent Petry | 2016-06-24 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear. | ||||
| | * | | Fix search result link for file results outside default list | Vincent Petry | 2016-06-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list. | ||||
* | | | | Merge pull request #254 from nextcloud/fix-229-stable9 | Morris Jobke | 2016-06-30 | 2 | -1/+6 |
|\ \ \ \ | |_|_|/ |/| | | | [stable9] get only vcard which match both the address book id and the vcard uri | ||||
| * | | | 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 #260 from nextcloud/fix-versions-stable9 | Lukas Reschke | 2016-06-30 | 1 | -5/+11 |
|\ \ \ \ | |_|/ / |/| | | | [stable9] check permissions before rollback | ||||
| * | | | check permissions before rollback | Bjoern Schiessle | 2016-06-30 | 1 | -5/+11 |
| |/ / | |||||
* | | | Merge pull request #265 from nextcloud/stable9-add-wnd | Morris Jobke | 2016-06-30 | 12 | -5/+679 |
|\ \ \ | | | | | | | | | [stable9] Backport WND | ||||
| * | | | [stable9] Backport WND | Lukas Reschke | 2016-06-30 | 12 | -5/+679 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Backports: - https://github.com/nextcloud/server/pull/233 - https://github.com/nextcloud/server/pull/190 - https://github.com/nextcloud/server/pull/188 | ||||
* | | | 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 | 2 | -5/+48 |
|/ / | |||||
* | | Revert "[stable9] Don't show the updater if updater is incompatible" | Lukas Reschke | 2016-06-26 | 3 | -108/+13 |
| | | | | | | | | This reverts commit 5e2bf16db1d5b2726713d04b019ade8557104fbd. | ||||
* | | Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-sync | Lukas Reschke | 2016-06-26 | 18 | -50/+169 |
|\| | |||||
| * | On mount make sure multiple shares with same target map to unique ones (#23937) | Roeland Douma | 2016-06-23 | 2 | -15/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Scenario: user0 shares a folder 'foo' with user2 user1 shares a folder 'foo' with user2 user2 logs in Before: show only the 'foo' from user1 After: show both. * Added intergration tests | ||||
| * | Rollback version must also adjust cached size | Vincent Petry | 2016-06-22 | 1 | -1/+8 |
| | | |||||
| * | Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9 | Vincent Petry | 2016-06-21 | 1 | -1/+8 |
| |\ | | | | | | | [stable9] Fix null pointer exception in user_ldap | ||||
| | * | Fix null pointer exception in user_ldap | Jörn Friedrich Dreyer | 2016-06-21 | 1 | -1/+8 |
| | | | |||||
| * | | Merge pull request #25199 from owncloud/shared-mount-catch-9 | Vincent Petry | 2016-06-21 | 2 | -11/+25 |
| |\ \ | | | | | | | | | [9.0] Catch exceptions while creating shared mounts | ||||
| | * | | Catch exceptions while creating shared mounts | Robin Appelman | 2016-06-21 | 2 | -11/+25 |
| | |/ | |||||
| * / | dd support to know where the storage test comes from (#25166) | Juan Pablo Villafañez | 2016-06-21 | 8 | -18/+33 |
| |/ | |||||
| * | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
| * | Make getShareFolder use given view instead of static FS (#25150) | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
| | | |||||
| * | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-16 | 1 | -0/+5 |
| | | |||||
| * | Merge pull request #25052 from owncloud/stable9-webdav-download-mimetype | Vincent Petry | 2016-06-15 | 5 | -9/+51 |
| |\ | | | | | | | [stable9] DAV now returns file name with Content-Disposition header | ||||
| | * | DAV now returns file name with Content-Disposition header | Vincent Petry | 2016-06-13 | 5 | -9/+51 |
| | | | |||||
* | | | don't try to log the currently logged in user, this fails on cronjobs. The ↵ | Bjoern Schiessle | 2016-06-22 | 2 | -31/+5 |
| | | | | | | | | | | | | users are logged anyway | ||||
* | | | Some more branding | Lukas Reschke | 2016-06-20 | 1 | -1/+1 |
| | | | |||||
* | | | fixed code | Morris Jobke | 2016-06-20 | 9 | -13/+13 |
| | | | |||||
* | | | fixed translations | Morris Jobke | 2016-06-20 | 94 | -94/+94 |
| | | | |||||
* | | | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized. | ||||
* | | | Make getShareFolder use given view instead of static FS (#25150) | Vincent Petry | 2016-06-20 | 2 | -5/+9 |
| | | | |||||
* | | | Convert Dropbox Forbidden exception to StorageNotAvailableException | Vincent Petry | 2016-06-20 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #170 from nextcloud/fix-references-stable9 | Morris Jobke | 2016-06-20 | 128 | -444/+444 |
|\ \ \ | | | | | | | | | [stable9] Fix some ownCloud/Nextcloud references | ||||
| * | | | fix references in encryption app | Bjoern Schiessle | 2016-06-20 | 73 | -217/+217 |
| | | | | |||||
| * | | | fix references in the federation app | Bjoern Schiessle | 2016-06-20 | 53 | -225/+225 |
| | | | |