summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* add additional check if we have a valid uid and filenameBjoern Schiessle2016-07-041-0/+4
* Revert "Revert "[stable9] Don't show the updater if updater is incompatible""Lukas Reschke2016-07-013-13/+108
* Merge pull request #277 from nextcloud/traversal-directory-jsBjörn Schießle2016-07-012-2/+15
|\
| * Match on 405Lukas Reschke2016-07-012-1/+6
| * Match for /../Lukas Reschke2016-07-012-1/+5
| * Do not allow directory traversal using "../"Lukas Reschke2016-07-012-1/+5
* | Merge pull request #282 from nextcloud/fix-testsBjörn Schießle2016-07-016-47/+36
|\ \
| * | Fix Comments tests with phpunit 5.2+Joas Schilling2016-07-011-10/+0
| * | Fix Sharing app tests with phpunit 5.2+Joas Schilling2016-07-012-8/+4
| * | Fix Encryption tests with phpunit 5.2+Joas Schilling2016-07-012-7/+6
| * | Fix DAV tests with phpunit 5.2+Joas Schilling2016-07-011-22/+26
| |/
* | Merge pull request #244 from nextcloud/theming-app-stable9Björn Schießle2016-07-0115-0/+4043
|\ \
| * | Also fix the dav testJoas Schilling2016-07-011-0/+2
| * | initial commit for the theming appBjoern Schiessle2016-06-3014-0/+4041
* | | Merge pull request #274 from nextcloud/stable9-sync-upstreamMorris Jobke2016-07-011-2/+9
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'upstream/stable9' into stable9-sync-upstreamLukas Reschke2016-07-011-2/+9
| |\ \
| | * | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | * | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
* | | | Merge pull request #254 from nextcloud/fix-229-stable9Morris Jobke2016-06-302-1/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | get only vcard which match both the address book id and the vcard uriBjoern Schiessle2016-06-302-1/+6
* | | | Merge pull request #260 from nextcloud/fix-versions-stable9Lukas Reschke2016-06-301-5/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | check permissions before rollbackBjoern Schiessle2016-06-301-5/+11
| |/ /
* | | Merge pull request #265 from nextcloud/stable9-add-wndMorris Jobke2016-06-3012-5/+679
|\ \ \
| * | | [stable9] Backport WNDLukas Reschke2016-06-3012-5/+679
| |/ /
* | | Name method properlyLukas Reschke2016-06-301-1/+1
* | | add some additonal permission checks to the webdav backendBjoern Schiessle2016-06-302-5/+48
|/ /
* | Revert "[stable9] Don't show the updater if updater is incompatible"Lukas Reschke2016-06-263-108/+13
* | Merge remote-tracking branch 'upstream/stable9' into stable9-upstream-syncLukas Reschke2016-06-2618-50/+169
|\|
| * On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-06-232-15/+49
| * Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8
| * Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9Vincent Petry2016-06-211-1/+8
| |\
| | * Fix null pointer exception in user_ldapJörn Friedrich Dreyer2016-06-211-1/+8
| * | Merge pull request #25199 from owncloud/shared-mount-catch-9Vincent Petry2016-06-212-11/+25
| |\ \
| | * | Catch exceptions while creating shared mountsRobin Appelman2016-06-212-11/+25
| | |/
| * / dd support to know where the storage test comes from (#25166)Juan Pablo Villafañez2016-06-218-18/+33
| |/
| * Delay files_sharing's registerMountProvidersVincent Petry2016-06-201-2/+3
| * Make getShareFolder use given view instead of static FS (#25150)Vincent Petry2016-06-202-5/+9
| * Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-161-0/+5
| * Merge pull request #25052 from owncloud/stable9-webdav-download-mimetypeVincent Petry2016-06-155-9/+51
| |\
| | * DAV now returns file name with Content-Disposition headerVincent Petry2016-06-135-9/+51
* | | don't try to log the currently logged in user, this fails on cronjobs. The us...Bjoern Schiessle2016-06-222-31/+5
* | | Some more brandingLukas Reschke2016-06-201-1/+1
* | | fixed codeMorris Jobke2016-06-209-13/+13
* | | fixed translationsMorris Jobke2016-06-2094-94/+94
* | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-201-2/+3
* | | Make getShareFolder use given view instead of static FS (#25150)Vincent Petry2016-06-202-5/+9
* | | Convert Dropbox Forbidden exception to StorageNotAvailableExceptionVincent Petry2016-06-201-0/+5
* | | Merge pull request #170 from nextcloud/fix-references-stable9Morris Jobke2016-06-20128-444/+444
|\ \ \
| * | | fix references in encryption appBjoern Schiessle2016-06-2073-217/+217
| * | | fix references in the federation appBjoern Schiessle2016-06-2053-225/+225