summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16067 from owncloud/verbosity-in-app-code-checkLukas Reschke2015-05-061-6/+17
|\
| * Add verbosity option to app:check-codeMorris Jobke2015-05-051-6/+17
* | Merge pull request #16017 from owncloud/proper-update-notificationMorris Jobke2015-05-062-4/+35
|\ \
| * | Use OC.Notification for update notificationsMorris Jobke2015-05-032-4/+35
* | | Merge pull request #16037 from owncloud/enc_dont_disable_encryptionJan-Christoph Borchardt2015-05-051-0/+4
|\ \ \ | |_|/ |/| |
| * | Don't highlight disabled labels on hoverMorris Jobke2015-05-051-0/+4
* | | Fix the "app-id" parameter description of app:check-codeJoas Schilling2015-05-051-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-052-0/+2
* | | Add an occ command to get the status of encryptionJoas Schilling2015-05-042-0/+57
* | | Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions...Joas Schilling2015-05-042-1/+26
|\ \ \ | |/ / |/| |
| * | Added unit test for reshare by share ownerVincent Petry2015-04-291-0/+25
| * | Do not restrict permissions for the original ownerJoas Schilling2015-04-291-1/+1
* | | Merge pull request #15958 from owncloud/usage-of-public-log-interfaceThomas Müller2015-05-041-1/+1
|\ \ \
| * | | Use internally \OCP\ILogger instead of \OC\LogMorris Jobke2015-04-301-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-042-0/+8
* | | | Merge pull request #16009 from owncloud/fix-searchresultsMorris Jobke2015-05-031-4/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix search results from other places, account for margin-bottom in files listJan-Christoph Borchardt2015-05-021-4/+6
* | | | Merge pull request #16001 from owncloud/add-multiselect-new-titleMorris Jobke2015-05-022-2/+3
|\ \ \ \
| * | | | force minimum multiselect width to properly show longer groupsJan-Christoph Borchardt2015-05-011-1/+1
| * | | | also add title to multiselect create new element, fix #15954Jan-Christoph Borchardt2015-05-011-1/+2
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-022-6/+6
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-012-0/+52
* | | Merge pull request #15951 from owncloud/fix-install-againMorris Jobke2015-04-301-1/+1
|\ \ \
| * | | make command optionalBernhard Posselt2015-04-291-1/+1
* | | | Merge pull request #15947 from owncloud/add-title-to-multiselectMorris Jobke2015-04-301-5/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | add title to multiselect list items so longer group names are visible, fix #1...Jan-Christoph Borchardt2015-04-291-5/+6
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-304-52/+52
* | | Merge pull request #15942 from owncloud/revert-15875-multiline-buttonsJoas Schilling2015-04-301-4/+1
|\ \ \ | |_|/ |/| |
| * | Revert "fix layout for multiline buttons which are <a class='button'>"Jan-Christoph Borchardt2015-04-291-4/+1
| |/
* / default to an empty string for database password if ommitedBernhard Posselt2015-04-291-1/+4
|/
* Fix routesLukas Reschke2015-04-281-4/+4
* fix typoThomas Müller2015-04-271-1/+1
* handle case where the given language is unknown - refs #15794Thomas Müller2015-04-271-0/+4
* Merge pull request #15681 from owncloud/issue/15667-occ-encryptionMorris Jobke2015-04-275-0/+266
|\
| * Undefined index: defaultJoas Schilling2015-04-271-1/+1
| * Fix scrutinizer complainJoas Schilling2015-04-271-1/+1
| * Use interfaceJoas Schilling2015-04-271-4/+4
| * Add unit tests for the commandsJoas Schilling2015-04-271-6/+6
| * Make getDefaultModuleId public and get module protectedJoas Schilling2015-04-272-31/+14
| * Add occ commands to manage the encryption modulesJoas Schilling2015-04-275-0/+283
* | Merge pull request #15875 from owncloud/multiline-buttonsJoas Schilling2015-04-271-1/+4
|\ \ | |/ |/|
| * fix layout for multiline buttons which are <a class='button'>Jan-Christoph Borchardt2015-04-261-1/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-272-0/+2
|/
* Merge pull request #15835 from owncloud/delete-permission-iconJan-Christoph Borchardt2015-04-241-1/+3
|\
| * Show hint if there is no delete permissionMorris Jobke2015-04-231-1/+3
* | Unify the output of the user commands and use DIJoas Schilling2015-04-236-16/+40
* | Check if the user exists before trying to delete himJoas Schilling2015-04-231-5/+12
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-236-6/+78
* Merge pull request #15639 from rullzer/fix_15368Morris Jobke2015-04-232-2/+99
|\
| * Added unit testsRoeland Jago Douma2015-04-171-0/+94