summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-202-2/+2
|
* Scrutinizer Auto-FixesScrutinizer Auto-Fixer2015-05-191-1/+0
| | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ | | | | Remove hard coded limit of 15 from getShareWith
| * add support for limit request parameter to getShareWithCraig Morrissey2015-05-152-4/+6
| |
* | Add hint about additional PHP database modulesMorris Jobke2015-05-183-1/+11
| | | | | | | | * fixes #16391
* | Merge pull request #15738 from rullzer/fix_15611Vincent Petry2015-05-182-10/+53
|\ \ | | | | | | Fix to make sure expiration date is properly set
| * | Fix to make sure expiration date is properly setRoeland Jago Douma2015-05-182-10/+53
| | | | | | | | | | | | | | | | | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test
* | | Reset share dialog values so we start out cleanRoeland Jago Douma2015-05-182-0/+111
|/ / | | | | | | * Unit test
* | Merge pull request #16242 from owncloud/use-oc-webrootThomas Müller2015-05-151-4/+1
|\ \ | |/ |/| Use OC.webroot instead of calculating the URL
| * Use OC.webroot instead of calculating the URLLukas Reschke2015-05-111-4/+1
| | | | | | | | | | | | Calculating the URL is error-prone as it doesn't work when for example `public.php` is requested and might even be harmful as it could leak sensitive information. Since `oc.js` is even available when maintenance mode is available it is better to use the global `OC.webroot` that is not controlled by any user.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-154-0/+4
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-142-0/+2
| |
* | Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-appsLukas Reschke2015-05-131-0/+3
|\ \ | | | | | | Add info message for upgrade of an 3rdparty app
| * | Add info message for upgrade of an 3rdparty appMorris Jobke2015-05-121-0/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-136-2/+64
|/ /
* | Merge pull request #16282 from owncloud/fix-multiselect-ellipsizeMorris Jobke2015-05-121-0/+1
|\ \ | | | | | | ellipsize first item in multiselect, fix #16174
| * | ellipsize first item in multiselect, fix #16174Jan-Christoph Borchardt2015-05-121-0/+1
| |/
* | Merge pull request #16104 from owncloud/resize-filepickerJan-Christoph Borchardt2015-05-122-2/+7
|\ \ | |/ |/| Resize filepicker on window size change
| * add max-width of 600px to filepickerMorris Jobke2015-05-061-1/+2
| |
| * Resize filepicker on window size changeMorris Jobke2015-05-061-1/+5
| | | | | | | | | | * add 20 px space to each direction -> 10px padding to left, right, top and bottom * fixes #16100
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-114-2/+14
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-106-2/+6
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-092-0/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0818-22/+132
| |
* | Merge pull request #16035 from ↵Thomas Müller2015-05-073-5/+25
|\ \ | | | | | | | | | | | | owncloud/issue-15975-occ-encryption-enable-warning-no-module Display a message when there is a problem with the default module
| * | Display a message when there is a problem with the default moduleJoas Schilling2015-05-043-5/+25
| | |
* | | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-071-0/+6
|\ \ \ | | | | | | | | Display the module settings in the list of the encryption modules
| * | | Display the module settings in the list of the encryption modulesJoas Schilling2015-05-041-0/+6
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-07110-120/+12
| | |
* | | Merge pull request #16067 from owncloud/verbosity-in-app-code-checkLukas Reschke2015-05-061-6/+17
|\ \ \ | |_|/ |/| | Add verbosity option to app:check-code
| * | Add verbosity option to app:check-codeMorris Jobke2015-05-051-6/+17
| | | | | | | | | | | | | | | * by default only lists files with errors * option -v lists all files even if there are no errors
* | | Merge pull request #16017 from owncloud/proper-update-notificationMorris Jobke2015-05-062-4/+35
|\ \ \ | | | | | | | | Use OC.Notification for update notifications
| * | | Use OC.Notification for update notificationsMorris Jobke2015-05-032-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * instead of a static rendering inside PHP use the JS OC.Notification.showTemporary to hide the notification after 7 seconds automatically * fixes #14811
* | | | Merge pull request #16037 from owncloud/enc_dont_disable_encryptionJan-Christoph Borchardt2015-05-051-0/+4
|\ \ \ \ | |_|/ / |/| | | don't let the the user disable encryption once it was activated
| * | | 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 ↵Joas Schilling2015-05-042-1/+26
|\ \ \ | |/ / |/| | | | | | | | owncloud/issue-15771-dont-restrict-permissions-for-share-owner Do not restrict permissions for the original owner
| * | 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\Log
| * | | Use internally \OCP\ILogger instead of \OC\LogMorris Jobke2015-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | * this is the preparation for some upcoming logger related changes * also fixes an issue in the public interface where we request an internal class as parameter
* | | | [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 list
| * | | 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
|\ \ \ \ | | | | | | | | | | also add title to multiselect create new element, force multiselect wider width, fix #15954
| * | | | 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
|/ / /