summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22103 from ErikPel/tag-css-fixThomas Müller2016-02-041-1/+7
|\
| * Fixes #22097Erik Pellikka2016-02-031-1/+7
| * Revert "setting to skip migration tests by default"Morris Jobke2016-02-032-12/+0
* | Merge pull request #22101 from owncloud/comments-filerowThomas Müller2016-02-032-0/+4
|\ \
| * | Add file row indicator for unread commentsVincent Petry2016-02-032-0/+4
| |/
| * Merge pull request #22090 from owncloud/skip-migration-tests-settingThomas Müller2016-02-032-0/+12
| |\
| | * setting to skip migration tests by defaultMorris Jobke2016-02-032-0/+12
* | | Merge pull request #22086 from RealRancor/RealRancor-patch-1Thomas Müller2016-02-031-1/+0
|\ \ \
| * | | Remove files_locking from shipped.jsonRealRancor2016-02-031-1/+0
| |/ /
* / / host and hostname are different thingsRoeland Jago Douma2016-02-031-2/+19
|/ /
* | Merge pull request #21961 from owncloud/comments-guiThomas Müller2016-02-035-23/+67
|\ \ | |/ |/|
| * Fix parsing empty Webdav property nodesVincent Petry2016-02-022-2/+2
| * Expose display name in JS sideVincent Petry2016-02-022-1/+33
| * Add pagination support for comments GUIVincent Petry2016-02-022-20/+31
| * Comments GUIVincent Petry2016-02-021-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-032-4/+4
|/
* Merge pull request #22054 from vincchan/vincchan/fix#20199Thomas Müller2016-02-023-27/+79
|\
| * changed variables to lowercaseVincent Chan2016-02-021-5/+5
| * Move data protection check to javascriptVincent Chan2016-02-013-27/+79
* | Merge pull request #22023 from owncloud/interruptable-commandsThomas Müller2016-02-021-0/+38
|\ \
| * | Move signal handling to the base class to allow other commands to reuse this ...Thomas Müller2016-02-011-0/+38
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-024-0/+20
| |/ |/|
* | Merge pull request #21953 from owncloud/make-enable_avatars-more-robustThomas Müller2016-02-011-1/+1
|\ \
| * | Make enable_avatars setting more robustMorris Jobke2016-01-271-1/+1
* | | Merge pull request #22034 from matthias-g/patch-1Thomas Müller2016-02-011-2/+2
|\ \ \ | |_|/ |/| |
| * | Update explanation of how to enable debug modematthias-g2016-01-301-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3118-2/+134
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-01-3012-0/+26
* | Merge pull request #21992 from owncloud/share-dialog-error-handlingThomas Müller2016-01-292-7/+158
|\ \
| * | Properly forward error messages in share dialogVincent Petry2016-01-282-7/+158
* | | Merge pull request #21981 from owncloud/systemtags-trim-nameThomas Müller2016-01-291-5/+6
|\ \ \
| * | | Trim tag names to avoid problemsJoas Schilling2016-01-281-5/+6
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-29130-326/+28
|/ /
* | Fix share default expiration date calculationVincent Petry2016-01-282-9/+8
* | Share dialog use OCS APIVincent Petry2016-01-288-537/+611
* | Merge pull request #21958 from owncloud/systemtags-styleThomas Müller2016-01-285-25/+46
|\ \
| * | Use boxes for system tags, shorten permission textVincent Petry2016-01-285-25/+46
| |/
* / Fix system tags conflict situationsVincent Petry2016-01-272-3/+85
|/
* Fix system tags proppatch with booleansVincent Petry2016-01-273-10/+53
* Deprecate getFirstWeekDay() and getDateFormat() in favor of l()Joas Schilling2016-01-261-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-264-10/+12
* System tags sidebar selector now respects permissionsVincent Petry2016-01-255-244/+405
* Expose whether user is an admin through a methodVincent Petry2016-01-251-1/+13
* Merge pull request #18444 from owncloud/occ-config-typesThomas Müller2016-01-253-21/+191
|\
| * Allow array recursion in getJoas Schilling2016-01-141-3/+16
| * Allow deleting a nested system config valueJoas Schilling2016-01-142-10/+52
| * Retain backwards compatibilityJoas Schilling2016-01-141-51/+56
| * occ config:system:set can now set other value typesRobin McCorkell2016-01-141-9/+119
* | Merge pull request #21811 from owncloud/fix-unauthenticated-avatarThomas Müller2016-01-251-2/+5
|\ \
| * | Show default placeholder if avatar image can't be fetchedMorris Jobke2016-01-201-2/+5