summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Update .user.ini when setting upload size limitRobin McCorkell2015-07-203-23/+52
* | Merge pull request #18345 from owncloud/increase-setMailAddress-testsThomas Müller2015-08-171-5/+13
|\ \
| * | [test] more tests for UserController::setMailAddressMorris Jobke2015-08-171-5/+13
* | | Merge pull request #18343 from owncloud/degrade-log-about-missing-appThomas Müller2015-08-171-1/+1
|\ \ \ | |/ / |/| |
| * | Degrade log message about missing app in appstore to debugMorris Jobke2015-08-171-1/+1
|/ /
* | Merge pull request #18331 from owncloud/fix-htaccess-whitespaceRobin McCorkell2015-08-161-24/+24
|\ \
| * | properly indent .htaccessMorris Jobke2015-08-161-24/+24
|/ /
* | Merge pull request #18318 from owncloud/files-sidebar-fixtabsMorris Jobke2015-08-167-83/+199
|\ \
| * | Improve right sidebar tabs behaviorVincent Petry2015-08-147-83/+199
* | | Merge pull request #18320 from owncloud/public_upload_capabilityThomas Müller2015-08-142-0/+21
|\ \ \
| * | | Add public upload to capabilityRoeland Jago Douma2015-08-142-0/+21
* | | | Merge pull request #18316 from owncloud/event-dispatcherThomas Müller2015-08-143-2/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Integration in files app to load scripts and styles on requestThomas Müller2015-08-141-0/+3
| * | | Adding EventDispatcher to IServerContainerThomas Müller2015-08-142-2/+24
|/ / /
* | | Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-...Thomas Müller2015-08-142-16/+16
|\ \ \
| * | | Fix config map provider for testsJoas Schilling2015-08-131-11/+11
| * | | Fix default values of sharing capabilitiesJoas Schilling2015-08-131-5/+5
* | | | Merge pull request #18302 from owncloud/mark-ldap-password-as-sensitiveMorris Jobke2015-08-141-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Mark ldap agent password as sensitiveJoas Schilling2015-08-141-0/+1
* | | | Merge pull request #18090 from owncloud/keep-ocs-status-code-in-syncBernhard Posselt2015-08-143-7/+9
|\ \ \ \ | |/ / / |/| | |
| * | | With V2 we should ensure that the status codes are kept in syncThomas Müller2015-08-133-7/+9
| |/ /
* | | Merge pull request #18279 from owncloud/fix-ldap-proxy-everyonecountMorris Jobke2015-08-131-1/+3
|\ \ \
| * | | also don't count group members when more than 1 ldap configs are activeArthur Schiwon2015-08-131-1/+3
| |/ /
* | | Merge pull request #18178 from owncloud/files-sidebar-actionsJan-Christoph Borchardt2015-08-1315-266/+495
|\ \ \
| * | | Make file actions work from sidebarVincent Petry2015-08-1212-265/+422
| * | | Introduce FileInfoModelVincent Petry2015-08-122-0/+72
| * | | Fix showMenu animation callbackVincent Petry2015-08-121-1/+1
* | | | Merge pull request #18262 from owncloud/add-basic-tests-for-scannersMorris Jobke2015-08-131-0/+82
|\ \ \ \ | |_|/ / |/| | |
| * | | Add a basic unit test which notifies us about incompatible extendingJoas Schilling2015-08-131-0/+82
|/ / /
* | | Merge pull request #16543 from rullzer/files_sharing_proper_function_argsVincent Petry2015-08-132-25/+70
|\ \ \
| * | | Extend tests for files_sharing apiRoeland Jago Douma2015-08-111-0/+48
| * | | Move private functions to proper list of argumentsRoeland Jago Douma2015-08-111-25/+22
* | | | Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporaryVincent Petry2015-08-131-3/+2
|\ \ \ \
| * | | | Show strage full warning for shared storages temporaryMorris Jobke2015-08-121-3/+2
* | | | | Merge pull request #18122 from owncloud/replace-tipsyJan-Christoph Borchardt2015-08-135-24/+19
|\ \ \ \ \
| * | | | | replace tipsys with tooltipsHendrik Leppelsack2015-08-125-24/+19
| |/ / / /
* | | | | Merge pull request #17785 from owncloud/snapjs-sensitivityMorris Jobke2015-08-121-1/+2
|\ \ \ \ \
| * | | | | fix mobile scrolling, lower sidebar sensitivity, fix #11193Jan-Christoph Borchardt2015-08-071-1/+2
* | | | | | Merge pull request #18242 from owncloud/password-feedbackMorris Jobke2015-08-121-2/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | more understandable 'Wrong password' feedbackJan-Christoph Borchardt2015-08-121-2/+1
|/ / / / /
* | | | | Merge pull request #18065 from owncloud/new-trashbin-retentionThomas Müller2015-08-127-44/+428
|\ \ \ \ \
| * | | | | Fix testsVictor Dubiniuk2015-08-101-7/+1
| * | | | | Migrate settingsVictor Dubiniuk2015-08-103-20/+93
| * | | | | Enhance trashbin expiration settingsVictor Dubiniuk2015-08-106-36/+353
* | | | | | Merge pull request #17982 from owncloud/appframework-sanitize-nameThomas Müller2015-08-122-0/+29
|\ \ \ \ \ \
| * | | | | | Sanitize class names before registerService/queryRobin McCorkell2015-07-302-0/+29
* | | | | | | Merge pull request #17865 from rullzer/less_static_prov_apiThomas Müller2015-08-128-458/+1128
|\ \ \ \ \ \ \