summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [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 button
| * 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 tooltips
| * 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 tooltip
| * 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
| | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563
* Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-121-2/+16
|\ | | | | Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
| * 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
|\ \ | |/ |/| Dont hide exceptions master
| * 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
| | | | | | | | | | | | Conflicts: core/templates/login.php lib/base.php
* | 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}
| * Add password input from env variable for occ user:{add, resetpassword}Laurens Post2015-04-042-22/+54
| | | | | | | | | | | | | | | | This commit adds the --password-from-env switch to the `occ user:add` and `occ user:resetpassword` commands. When this parameter is given, Owncloud will use the password specified in environment variable OC_PASS. This is safer than using command line parameters, as those can be read by any process.
* | Merge pull request #15182 from rullzer/fix-8231Thomas Müller2015-04-101-0/+17
|\ \ | | | | | | ajax/share.php should return correct list of suggestions
| * | Make sure we do not return people that we already shared withRoeland Jago Douma2015-03-251-0/+17
| | | | | | | | | | | | | | | We should use the provided list of users and groups that we already shared with to filter suggestions.
* | | Merge pull request #15512 from owncloud/autoclose-settings-menuVincent Petry2015-04-091-2/+4
|\ \ \ | | | | | | | | Don't stop event execution for menu item click
| * | | Don't stop event execution for menu item clickMorris Jobke2015-04-091-2/+4
| | | | | | | | | | | | | | | | * fixes #12326 - the settings menu is closed now, because the event is executed
* | | | Merge pull request #15501 from owncloud/better-output-format-consoleMorris Jobke2015-04-094-18/+110
|\ \ \ \ | | | | | | | | | | Add an option to get the output in plain, json or print_r syntax
| * | | | change handling in app:listJoas Schilling2015-04-092-23/+26
| | | | |
| * | | | Replace print_r() with pretty jsonJoas Schilling2015-04-091-9/+6
| | | | |
| * | | | Add an option to get the output in plain, json or print_r syntaxJoas Schilling2015-04-094-15/+107
| | | | |
* | | | | Merge pull request #15235 from owncloud/remote-share-hintMorris Jobke2015-04-093-6/+30
|\ \ \ \ \ | | | | | | | | | | | | Hint for remote sharing syntax
| * | | | | Correctly generate the doc link via go.phpJoas Schilling2015-04-092-4/+5
| | | | | |
| * | | | | Fix config usageJoas Schilling2015-04-091-6/+5
| | | | | |
| * | | | | fix remote share info icon for IE8Jan-Christoph Borchardt2015-04-091-1/+1
| | | | | |
| * | | | | add more present info about remote shares, fix layout of inputsJan-Christoph Borchardt2015-04-092-2/+17
| | | | | |
| * | | | | correct remote share hintJan-Christoph Borchardt2015-03-261-1/+1
| | | | | |
| * | | | | add remote share status to the configBjoern Schiessle2015-03-261-0/+4
| | | | | |
| * | | | | add hint in Share placeholder on remote share syntaxJan-Christoph Borchardt2015-03-261-1/+6
| | | | | |
* | | | | | Merge pull request #15500 from owncloud/installation-hintMorris Jobke2015-04-095-8/+41
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | add link to installation documentation to setup page
| * | | | | add link to installation documentation to setup pageJan-Christoph Borchardt2015-04-095-2/+19
| | | | | |
| * | | | | fix position of SQLite warningJan-Christoph Borchardt2015-04-091-0/+4
| | | | | |
| * | | | | code style fixesJan-Christoph Borchardt2015-04-091-6/+18
| | | | | |
* | | | | | add admin documentation hints to Federated Cloud Sharing and cronJan-Christoph Borchardt2015-04-091-0/+2
|/ / / / /
* | | | | Merge pull request #15314 from owncloud/app-categories-15274Lukas Reschke2015-04-092-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Add different trust levels to AppStore interface
| * | | | app mgmt app level design enhancementsJan-Christoph Borchardt2015-04-071-1/+1
| | | | |
| * | | | Add experimental applications switchLukas Reschke2015-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | Allows administrators to disable or enabled experimental applications as well as show the trust level.
* | | | | Merge pull request #15448 from owncloud/occ-check-server-env-masterMorris Jobke2015-04-092-0/+40
|\ \ \ \ \ | | | | | | | | | | | | Adding check command to validate server environment
| * | | | | Adding check command to validate server environment - fixes #15429Thomas Müller2015-04-082-0/+40
| | | | | |
* | | | | | Merge pull request #15483 from owncloud/maintenance-refreshThomas Müller2015-04-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix maintenance refresh interval
| * | | | | | Fix maintenance refresh intervalMorris Jobke2015-04-081-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix XMLHttpRequest - send after callback is registered * check for correct type of value - it's a boolean * return correct content-type in status.php