summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
* don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
* Merge pull request #7305 from owncloud/extstorage-configclassLukas Reschke2014-02-222-1/+32
|\
| * Merge branch 'master' into extstorage-configclassRobin Appelman2014-02-2112-31/+259
| |\
| * | Added extra checks for ext storage classVincent Petry2014-02-202-1/+32
* | | Merge pull request #7355 from owncloud/new-menu-svgicewind19912014-02-212-13/+28
|\ \ \
| * | | fix too much distance between text and iconJan-Christoph Borchardt2014-02-211-1/+1
| * | | use SVG icons from icons.css for New file menuJan-Christoph Borchardt2014-02-212-13/+28
| | |/ | |/|
* | | fix test so that it doesn't depend on the array orderBjoern Schiessle2014-02-211-14/+25
* | | fix usersPath and add unit testsBjoern Schiessle2014-02-212-10/+110
|/ /
* | Merge pull request #7312 from owncloud/ldap_fix_add_testThomas Müller2014-02-212-3/+169
|\ \
| * | LDAP: fix and extend testsArthur Schiwon2014-02-202-3/+169
* | | Merge pull request #7290 from owncloud/issue/5463icewind19912014-02-201-1/+1
|\ \ \
| * | | Correctly redirect to settings page when not selecting cert file for uploadJoas Schilling2014-02-191-1/+1
* | | | Merge pull request #7205 from owncloud/fix_7153blizzz2014-02-201-0/+6
|\ \ \ \
| * | | | LDAP: prevent other configuration from being deleted when deleting the first ...Arthur Schiwon2014-02-141-0/+6
* | | | | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-4/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-4/+2
* | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-202-6/+12
|\ \ \ \ \
| * | | | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-182-6/+12
* | | | | | Revert "Added extra checks for ext storage class"Vincent Petry2014-02-202-31/+1
* | | | | | Merge pull request #7284 from owncloud/ldap_filter_compilationLukas Reschke2014-02-202-0/+14
|\ \ \ \ \ \
| * | | | | | LDAP: improve compilation of filtersArthur Schiwon2014-02-192-0/+14
* | | | | | | Merge pull request #7294 from owncloud/extstorage-configclassLukas Reschke2014-02-202-1/+31
|\ \ \ \ \ \ \
| * | | | | | | Added extra checks for ext storage classVincent Petry2014-02-192-1/+31
| | |_|_|_|_|/ | |/| | | | |
* / | | | | | Fixed ext storage webdav path encodingVincent Petry2014-02-193-17/+55
|/ / / / / /
* | | | | | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-199-118/+227
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Trashbin select all now doesn't send file listVincent Petry2014-02-173-79/+109
| * | | | | Do not send file list for select all on Download/deleteVincent Petry2014-02-136-39/+118
* | | | | | Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_pr...Jan-Christoph Borchardt2014-02-191-11/+8
|\ \ \ \ \ \
| * | | | | | cleanup and actually execute the queryJörn Friedrich Dreyer2013-11-011-4/+8
| * | | | | | use doctrine to construct concat expressionJörn Friedrich Dreyer2013-11-011-8/+1
| * | | | | | Concatenate string in SQL instead of PHPJörn Friedrich Dreyer2013-11-011-10/+10
* | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-1912-13/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1912-13/+36
* | | | | | | Merge pull request #7257 from owncloud/filelist-fileinfoVincent Petry2014-02-193-26/+6
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | use a FileInfo object of the directory when generting the filelistRobin Appelman2014-02-183-26/+6
* | | | | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1825-89/+228
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-1813-31/+43
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-1313-31/+43
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Style fixesBart Visscher2014-02-121-1/+1
| * | | | | | Merge pull request #7235 from DavidVentura/masterJan-Christoph Borchardt2014-02-171-1/+1
| |\ \ \ \ \ \
| | * | | | | | small change for compatibilityDavid2014-02-171-1/+1
| * | | | | | | Merge pull request #7211 from mattcaron/masterVincent Petry2014-02-171-1/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Consolidate two sections, per code review. Issue #1648Matthew Caron2014-02-171-6/+2
| | * | | | | | | Fit shared videos to viewer, just like images. Issue #1648Matthew Caron2014-02-141-0/+7
| | |/ / / / / /
| * | | | | | | LDAP: improve wizard strings, fixes #5567Arthur Schiwon2014-02-173-3/+3
| * | | | | | | don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
| * | | | | | | catch errors during decryptionBjoern Schiessle2014-02-172-16/+105