aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Compatibility shims for OC_Mount_ConfigRobin McCorkell2015-08-198-1603/+232
* Unit tests for new backend APIRobin McCorkell2015-08-1911-0/+977
* Split backend identifiers from the class nameRobin McCorkell2015-08-1918-172/+327
* Authentication mechanisms for external storage backendsRobin McCorkell2015-08-1925-86/+740
* Introduce UserGlobalStoragesServiceRobin McCorkell2015-08-196-36/+312
* Introduce BackendService for managing external storage backendsRobin McCorkell2015-08-1931-558/+1638
* Merge pull request #18415 from owncloud/apps-command-returncode-successifalre...Thomas Müller2015-08-192-2/+0
|\
| * No error code when app already enabled/disabledVincent Petry2015-08-192-2/+0
|/
* Merge pull request #18076 from owncloud/fix-thumbnail-api-masterThomas Müller2015-08-191-1/+1
|\
| * No need to url decode the fileThomas Müller2015-08-051-1/+1
* | Merge pull request #18339 from owncloud/update-jquery-visibilityThomas Müller2015-08-192-24/+81
|\ \
| * | update jquery-visibility in files appMorris Jobke2015-08-172-24/+81
* | | Merge pull request #18374 from owncloud/router-appsMorris Jobke2015-08-192-0/+16
|\ \ \
| * | | Only load app routes if the app has already been loadedRobin McCorkell2015-08-182-0/+16
* | | | Merge pull request #18384 from owncloud/apps-command-returncodeThomas Müller2015-08-192-0/+4
|\ \ \ \
| * | | | Return error code on failure with occ app:enable/disableVincent Petry2015-08-182-0/+4
| |/ / /
* | | | Merge pull request #14401 from owncloud/ux-s2s-ldapThomas Müller2015-08-195-13/+106
|\ \ \ \
| * | | | adjust to current masterArthur Schiwon2015-04-131-3/+2
| * | | | fix and more robustness thx to scrutinizerArthur Schiwon2015-04-131-1/+4
| * | | | allow login names to be used for s2s with LDAP usersArthur Schiwon2015-04-135-12/+103
* | | | | Merge pull request #18390 from rullzer/fix_setupchecksBernhard Posselt2015-08-182-8/+16
|\ \ \ \ \
| * | | | | Move remaining setupchecks to new fomatRoeland Jago Douma2015-08-182-8/+16
* | | | | | Merge pull request #14314 from owncloud/clean-up-ocs-codeBernhard Posselt2015-08-183-64/+6
|\ \ \ \ \ \
| * | | | | | Cleanup OCS codeLukas Reschke2015-08-143-64/+6
* | | | | | | Merge pull request #18287 from owncloud/smb-1.0.3Thomas Müller2015-08-1822-1017/+136
|\ \ \ \ \ \ \
| * | | | | | | update icewind/smb to 1.0.4Robin Appelman2015-08-1711-43/+99
| * | | | | | | remove travis filesRobin Appelman2015-08-143-66/+2
| * | | | | | | update icewind/smb to 1.0.3Robin Appelman2015-08-1319-954/+81
* | | | | | | | Merge pull request #14825 from rullzer/avatarcontroller_nodeVincent Petry2015-08-183-19/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Move avatarcontroller towards Node ApiRoeland Jago Douma2015-08-183-19/+30
* | | | | | | | | Merge pull request #18389 from owncloud/fix-17770Morris Jobke2015-08-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix extracting basename from path in sharingRobin McCorkell2015-08-181-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #18392 from owncloud/remote-nologThomas Müller2015-08-181-3/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Avoid logging normal exceptions in remote.phpRobin McCorkell2015-08-181-3/+8
| |/ / / / / / /
* | | | | | | | Merge pull request #18381 from owncloud/public-share-fixdepsloadingMorris Jobke2015-08-182-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Only show delete action in menu when delete permission existsVincent Petry2015-08-181-1/+1
| * | | | | | | | Load missing JS dep in public link pageVincent Petry2015-08-181-0/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #17975 from owncloud/settings_admin_warning_levelsJan-Christoph Borchardt2015-08-185-50/+185
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [Post setup checks] add proper CSSMorris Jobke2015-08-171-1/+6
| * | | | | | | All setup messages are now properly typesRoeland Jago Douma2015-07-303-57/+143
| * | | | | | | Allow setupchecks to specify a warning levelRoeland Jago Douma2015-07-304-12/+56
* | | | | | | | Merge pull request #18310 from hasso/selection-string-fixVincent Petry2015-08-182-10/+18
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Move decaration to the beginning of the blockHasso Tepper2015-08-181-3/+5
| * | | | | | | Update unit test to reflect the string changeHasso Tepper2015-08-171-1/+1
| * | | | | | | Move selectionVars into if statementHasso Tepper2015-08-171-5/+4
| * | | | | | | Fix the string counting a selected files/dirsHasso Tepper2015-08-141-9/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #18364 from owncloud/config-sample-tyopsThomas Müller2015-08-171-16/+17
|\ \ \ \ \ \ \
| * | | | | | | clean up typos in config.sample.phpCarla Schroder2015-08-171-16/+17
|/ / / / / / /
* | | | | | | Merge pull request #17182 from owncloud/user_ini_upload_sizeRobin McCorkell2015-08-176-35/+263
|\ \ \ \ \ \ \
| * | | | | | | Unit test OC_Files::setUploadLimit()Robin McCorkell2015-07-204-14/+213