summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-25138-866/+174
* Merge pull request #15171 from owncloud/sabre-logforbiddenasdebugThomas Müller2015-03-241-0/+3
|\
| * Log forbidden in debug levelVincent Petry2015-03-241-0/+3
* | Merge pull request #14949 from owncloud/sabre-2.1.3Lukas Reschke2015-03-242-1/+2
|\ \
| * | Update 3rd party ref for sabre 2.1.3Vincent Petry2015-03-191-0/+0
| * | Fix Principal connector overrideVincent Petry2015-03-171-1/+2
| * | Update sabre-2.1.3 thirdparty submoduleVincent Petry2015-03-171-0/+0
* | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \
| * | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
* | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-testsMorris Jobke2015-03-242-154/+67
|\ \ \ \
| * | | | Merge the two tests into oneJoas Schilling2015-03-242-154/+67
* | | | | Merge pull request #14919 from rullzer/files_thumbnail_fixMorris Jobke2015-03-243-15/+53
|\ \ \ \ \
| * | | | | No longer directly output OC_Image for thumbnailsRoeland Jago Douma2015-03-243-15/+53
|/ / / / /
* | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 10:35:25 +0000