summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* do not remove group if it is emptymichag862015-08-181-3/+0
* 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
| * | | | 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