summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| * moved from html to $('html') to fix unit testsRoeland Jago Douma2015-04-171-2/+1
| * Reset sharedialog valuesRoeland Jago Douma2015-04-171-0/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-222-4/+4
* | Remove the app version from disabled app listJoas Schilling2015-04-203-4/+25
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-194-2/+24
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1810-4/+28
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-174-12/+34
* files_encryption -> encryptionThomas Müller2015-04-161-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-166-0/+16
* Merge pull request #15638 from owncloud/primary-button-disabledMorris Jobke2015-04-151-3/+4
|\
| * add disabled state to primary action buttonJan-Christoph Borchardt2015-04-151-3/+4
* | Merge pull request #15632 from owncloud/remove-tooltip-fadeJan-Christoph Borchardt2015-04-151-1/+1
|\ \ | |/ |/|
| * remove slow fade animation for remaining tipsy tooltipsJan-Christoph Borchardt2015-04-151-1/+1
* | Merge pull request #15626 from owncloud/remove-tooltip-fadeVincent Petry2015-04-151-10/+10
|\|
| * remove slow fade animation for tipsy tooltipJan-Christoph Borchardt2015-04-151-10/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1566-0/+66
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-142-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-14140-390/+304
|/
* fix filepickerMorris Jobke2015-04-131-1/+1
* Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-121-2/+16
|\
| * Add "Reply-To" support to sharing mails and refactor codeLukas Reschke2015-04-101-2/+16
* | fix wrong typeface being used for some buttonsJan-Christoph Borchardt2015-04-111-0/+7
* | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-102-0/+10
|\ \ | |/ |/|
| * more robust share dialogMorris Jobke2015-04-101-0/+4
| * do not disclose information, show generic error on login pageJörn Friedrich Dreyer2015-04-101-0/+6
* | fix share input loading spinner, fix #15522Jan-Christoph Borchardt2015-04-101-1/+5
|/
* Merge pull request #15404 from Crote/occ-password-from-envThomas Müller2015-04-102-22/+54
|\
| * Add password input from env variable for occ user:{add, resetpassword}Laurens Post2015-04-042-22/+54
* | Merge pull request #15182 from rullzer/fix-8231Thomas Müller2015-04-101-0/+17
|\ \
| * | Make sure we do not return people that we already shared withRoeland Jago Douma2015-03-251-0/+17
* | | Merge pull request #15512 from owncloud/autoclose-settings-menuVincent Petry2015-04-091-2/+4
|\ \ \