Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | do not remove group if it is empty | michag86 | 2015-08-18 | 1 | -3/+0 |
* | Merge pull request #18390 from rullzer/fix_setupchecks | Bernhard Posselt | 2015-08-18 | 2 | -8/+16 |
|\ | |||||
| * | Move remaining setupchecks to new fomat | Roeland Jago Douma | 2015-08-18 | 2 | -8/+16 |
* | | Merge pull request #14314 from owncloud/clean-up-ocs-code | Bernhard Posselt | 2015-08-18 | 3 | -64/+6 |
|\ \ | |||||
| * | | Cleanup OCS code | Lukas Reschke | 2015-08-14 | 3 | -64/+6 |
* | | | Merge pull request #18287 from owncloud/smb-1.0.3 | Thomas Müller | 2015-08-18 | 22 | -1017/+136 |
|\ \ \ | |||||
| * | | | update icewind/smb to 1.0.4 | Robin Appelman | 2015-08-17 | 11 | -43/+99 |
| * | | | remove travis files | Robin Appelman | 2015-08-14 | 3 | -66/+2 |
| * | | | update icewind/smb to 1.0.3 | Robin Appelman | 2015-08-13 | 19 | -954/+81 |
* | | | | Merge pull request #14825 from rullzer/avatarcontroller_node | Vincent Petry | 2015-08-18 | 3 | -19/+30 |
|\ \ \ \ | |||||
| * | | | | Move avatarcontroller towards Node Api | Roeland Jago Douma | 2015-08-18 | 3 | -19/+30 |
* | | | | | Merge pull request #18389 from owncloud/fix-17770 | Morris Jobke | 2015-08-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix extracting basename from path in sharing | Robin McCorkell | 2015-08-18 | 1 | -1/+1 |
* | | | | | | Merge pull request #18392 from owncloud/remote-nolog | Thomas Müller | 2015-08-18 | 1 | -3/+8 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Avoid logging normal exceptions in remote.php | Robin McCorkell | 2015-08-18 | 1 | -3/+8 |
| |/ / / / | |||||
* | | | | | Merge pull request #18381 from owncloud/public-share-fixdepsloading | Morris Jobke | 2015-08-18 | 2 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Only show delete action in menu when delete permission exists | Vincent Petry | 2015-08-18 | 1 | -1/+1 |
| * | | | | | Load missing JS dep in public link page | Vincent Petry | 2015-08-18 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #17975 from owncloud/settings_admin_warning_levels | Jan-Christoph Borchardt | 2015-08-18 | 5 | -50/+185 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [Post setup checks] add proper CSS | Morris Jobke | 2015-08-17 | 1 | -1/+6 |
| * | | | | All setup messages are now properly types | Roeland Jago Douma | 2015-07-30 | 3 | -57/+143 |
| * | | | | Allow setupchecks to specify a warning level | Roeland Jago Douma | 2015-07-30 | 4 | -12/+56 |
* | | | | | Merge pull request #18310 from hasso/selection-string-fix | Vincent Petry | 2015-08-18 | 2 | -10/+18 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Move decaration to the beginning of the block | Hasso Tepper | 2015-08-18 | 1 | -3/+5 |
| * | | | | Update unit test to reflect the string change | Hasso Tepper | 2015-08-17 | 1 | -1/+1 |
| * | | | | Move selectionVars into if statement | Hasso Tepper | 2015-08-17 | 1 | -5/+4 |
| * | | | | Fix the string counting a selected files/dirs | Hasso Tepper | 2015-08-14 | 1 | -9/+16 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #18364 from owncloud/config-sample-tyops | Thomas Müller | 2015-08-17 | 1 | -16/+17 |
|\ \ \ \ | |||||
| * | | | | clean up typos in config.sample.php | Carla Schroder | 2015-08-17 | 1 | -16/+17 |
|/ / / / | |||||
* | | | | Merge pull request #17182 from owncloud/user_ini_upload_size | Robin McCorkell | 2015-08-17 | 6 | -35/+263 |
|\ \ \ \ | |||||
| * | | | | Unit test OC_Files::setUploadLimit() | Robin McCorkell | 2015-07-20 | 4 | -14/+213 |
| * | | | | Update .user.ini when setting upload size limit | Robin McCorkell | 2015-07-20 | 3 | -23/+52 |
* | | | | | Merge pull request #18345 from owncloud/increase-setMailAddress-tests | Thomas Müller | 2015-08-17 | 1 | -5/+13 |
|\ \ \ \ \ | |||||
| * | | | | | [test] more tests for UserController::setMailAddress | Morris Jobke | 2015-08-17 | 1 | -5/+13 |
* | | | | | | Merge pull request #18343 from owncloud/degrade-log-about-missing-app | Thomas Müller | 2015-08-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Degrade log message about missing app in appstore to debug | Morris Jobke | 2015-08-17 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #18331 from owncloud/fix-htaccess-whitespace | Robin McCorkell | 2015-08-16 | 1 | -24/+24 |
|\ \ \ \ \ | |||||
| * | | | | | properly indent .htaccess | Morris Jobke | 2015-08-16 | 1 | -24/+24 |
|/ / / / / | |||||
* | | | | | Merge pull request #18318 from owncloud/files-sidebar-fixtabs | Morris Jobke | 2015-08-16 | 7 | -83/+199 |
|\ \ \ \ \ | |||||
| * | | | | | Improve right sidebar tabs behavior | Vincent Petry | 2015-08-14 | 7 | -83/+199 |
* | | | | | | Merge pull request #18320 from owncloud/public_upload_capability | Thomas Müller | 2015-08-14 | 2 | -0/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add public upload to capability | Roeland Jago Douma | 2015-08-14 | 2 | -0/+21 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #18316 from owncloud/event-dispatcher | Thomas Müller | 2015-08-14 | 3 | -2/+27 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Integration in files app to load scripts and styles on request | Thomas Müller | 2015-08-14 | 1 | -0/+3 |
| * | | | | | Adding EventDispatcher to IServerContainer | Thomas Müller | 2015-08-14 | 2 | -2/+24 |
|/ / / / / | |||||
* | | | | | Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-... | Thomas Müller | 2015-08-14 | 2 | -16/+16 |
|\ \ \ \ \ | |||||
| * | | | | | Fix config map provider for tests | Joas Schilling | 2015-08-13 | 1 | -11/+11 |
| * | | | | | Fix default values of sharing capabilities | Joas Schilling | 2015-08-13 | 1 | -5/+5 |
* | | | | | | Merge pull request #18302 from owncloud/mark-ldap-password-as-sensitive | Morris Jobke | 2015-08-14 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Mark ldap agent password as sensitive | Joas Schilling | 2015-08-14 | 1 | -0/+1 |