summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #15158 from owncloud/fix-failing-masterRobin Appelman2015-03-242-5/+14
|\| | | | |
| * | | | | *cough*Joas Schilling2015-03-242-5/+14
* | | | | | Merge pull request #14998 from rullzer/ocs_api_new_urlMorris Jobke2015-03-242-2/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Added extra unit testRoeland Jago Douma2015-03-211-0/+5
| * | | | | OCS API should return fancy OC urlRoeland Jago Douma2015-03-211-2/+1
* | | | | | Merge pull request #15153 from owncloud/uniquename-nodeLukas Reschke2015-03-243-0/+57
|\ \ \ \ \ \
| * | | | | | Add `getNonExistingName()` to the node apiRobin Appelman2015-03-243-0/+57
* | | | | | | Merge pull request #15112 from owncloud/security-warning-sectionMorris Jobke2015-03-243-97/+39
|\ \ \ \ \ \ \
| * | | | | | | consolidate all admin warnings and notices into one sectionJan-Christoph Borchardt2015-03-243-97/+39
* | | | | | | | Merge pull request #15156 from owncloud/file-summary-alignMorris Jobke2015-03-241-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | correctly align file list summary when the list has the favorite featureJan-Christoph Borchardt2015-03-241-0/+3
| |/ / / / / / /
* | | | | | | | Merge pull request #15048 from owncloud/avatar-crop-squareMorris Jobke2015-03-241-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | round width and height when cropping avatarRobin Appelman2015-03-201-1/+1
* | | | | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-shareMorris Jobke2015-03-244-26/+209
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Add a unit test for the naming conflict on the mountpoint nameJoas Schilling2015-03-172-6/+155
| * | | | | | | Use insertIfNotExists() instead of manual logicJoas Schilling2015-03-171-24/+31
| * | | | | | | Correctly get the unique mountpoint name when mounting the shareJoas Schilling2015-03-173-10/+37
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #15151 from owncloud/use-local-timeDaniel Hansson2015-03-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't use hardcoded date and timeDaniel Hansson2015-03-241-1/+1
* | | | | | | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryptionVincent Petry2015-03-241-14/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove range header exception for encryptionjknockaert2015-03-241-14/+0
* | | | | | | | | Merge pull request #15127 from owncloud/admin-tips-jenkinsMorris Jobke2015-03-242-2/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add Tips & tricks section to admin settingsJan-Christoph Borchardt2015-03-232-2/+21
* | | | | | | | | | Merge pull request #15126 from owncloud/sabre-storagenotavailableMorris Jobke2015-03-242-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Soft fail in CustomPropertiesBackend whenever storage not availableVincent Petry2015-03-232-1/+15
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #15149 from owncloud/fix-enable-for-groupJoas Schilling2015-03-242-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable methodJoas Schilling2015-03-242-2/+10
* | | | | | | | | | Merge pull request #15145 from owncloud/fix-15097-masterVincent Petry2015-03-245-23/+130
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | when the path doesnt exist show a proper error pageRobin Appelman2015-03-241-0/+2
| * | | | | | | | | | Properly catch whether a share is `null`Lukas Reschke2015-03-245-23/+128
* | | | | | | | | | | Merge pull request #15143 from owncloud/24h-time-formatJan-Christoph Borchardt2015-03-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use 24h format instead of 12h formatDaniel Hansson2015-03-241-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-listVincent Petry2015-03-242-16/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not walk over the users directory, but over the list of tagged objectsJoas Schilling2015-03-232-16/+14
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #15142 from owncloud/issue/15138-feedback-for-empty-apps-listMorris Jobke2015-03-247-37/+34
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Use the same style when no search result was foundJoas Schilling2015-03-242-6/+11
| * | | | | | | | | | Do not duplicate the empty content cssJoas Schilling2015-03-242-24/+1
| * | | | | | | | | | Display a message when no apps can be found for this oc versionJoas Schilling2015-03-243-7/+22
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #15012 from Volker-E/masterMorris Jobke2015-03-2411-53/+40
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | fixing #15023, getting comments out of HTML outputVolker E2015-03-213-6/+7
| * | | | | | | | | fixing #15027, cleaning up obsolete IE5-7 workaround codeVolker E2015-03-199-40/+26
| * | | | | | | | | fixing #15011 by adding ARIA roles where distinctVolker E2015-03-182-7/+7
* | | | | | | | | | Revert "Change to 24H format instead of 12H format"Vincent Petry2015-03-241-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-24130-278/+164
* | | | | | | | | Change to 24H format instead of 12H formatDaniel Hansson2015-03-231-1/+1
* | | | | | | | | Merge pull request #15121 from owncloud/email-sent-unboldMorris Jobke2015-03-231-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unbold share email sent notificationJan-Christoph Borchardt2015-03-231-4/+4
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #15075 from owncloud/fix-15056-masterThomas Müller2015-03-231-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unneeded status element from json response on /categories - fixes 15056Thomas Müller2015-03-231-1/+0
* | | | | | | | | | Merge pull request #15123 from owncloud/fix_14098blizzz2015-03-232-1/+15
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |