summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8674 from owncloud/watch-policyFrank Karlitschek2014-05-263-2/+13
|\
| * Add a config option fro setting the filesystem watcher policyRobin Appelman2014-05-232-1/+12
| * Fix phpdocRobin Appelman2014-05-221-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-26327-3252/+7930
* | Merge pull request #8711 from owncloud/l10n-fully-translatable-ldapVolkan Gezer2014-05-256-15/+17
|\ \
| * | make user_ldap fully translatableVolkan Gezer2014-05-256-15/+17
|/ /
* | Merge pull request #8705 from wakeup/masterThomas Müller2014-05-251-1/+1
|\ \
| * | fix typoVolkan Gezer2014-05-241-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2564-379/+422
|/ /
* | Merge pull request #8688 from owncloud/public-image-positioningLukas Reschke2014-05-241-7/+0
|\ \
| * | Show less whitespace above publicly shared imagesRobin Appelman2014-05-231-7/+0
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-24267-7207/+8890
* | | Merge pull request #8699 from owncloud/sharing_improvementsBjörn Schießle2014-05-231-23/+26
|\ \ \
| * | | fix share label creationBjoern Schiessle2014-05-231-23/+26
| |/ /
* | | Merge pull request #8690 from owncloud/design-noiseJan-Christoph Borchardt2014-05-234-15/+10
|\ \ \ | |/ / |/| |
| * | remove noise texture from interface (not necessary, and blurry on high-res)Jan-Christoph Borchardt2014-05-234-15/+10
|/ /
* | Merge pull request #8675 from owncloud/sharing-improvementsBjörn Schießle2014-05-232-8/+13
|\ \
| * | prevent default action when clicking on the share notificationBjoern Schiessle2014-05-231-1/+6
| * | always check for unique filename, if a file gets added from outside the mountBjoern Schiessle2014-05-221-6/+6
| * | fileList needs be be declared before the if-statementBjoern Schiessle2014-05-221-1/+1
* | | Merge pull request #8671 from owncloud/log-upload-errorsVincent Petry2014-05-231-1/+3
|\ \ \
| * | | php upload errors are written to logThomas Müller2014-05-221-1/+3
* | | | Merge pull request #8658 from realriot/masterThomas Müller2014-05-231-1/+1
|\ \ \ \
| * | | | Changed access mode for Dropbox to 'auto'Sascha Schmidt2014-05-211-1/+1
* | | | | Merge pull request #8647 from owncloud/public-image-scalingVincent Petry2014-05-231-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Dont scale up the preview for publicly shared imagesRobin Appelman2014-05-221-1/+2
|/ / / /
* | | | Merge pull request #8599 from owncloud/sharing_disable_for_groupsBjörn Schießle2014-05-2220-23/+352
|\ \ \ \ | |_|_|/ |/| | |
| * | | allow admin to disable sharing for specific groups of usersBjoern Schiessle2014-05-2220-23/+352
* | | | Merge pull request #8163 from Xenopathic/files_external_priorityVincent Petry2014-05-223-5/+275
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use default priority of 100 if backend default is not setRobin McCorkell2014-05-211-2/+7
| * | | Add priority overriding commentsRobin McCorkell2014-05-211-0/+4
| * | | Fix priority merging logic and add unit testRobin McCorkell2014-05-212-0/+55
| * | | Add unit testsRobin McCorkell2014-05-212-8/+130
| * | | Use constants for priority type and add commentsRobin McCorkell2014-05-211-13/+16
| * | | Use more strict type comparisonsRobin McCorkell2014-05-211-4/+4
| * | | Preserve priority if already setRobin McCorkell2014-05-211-0/+5
| * | | Treat 'all users' as 'global'Robin McCorkell2014-05-211-1/+21
| * | | Add storage priority supportRobin McCorkell2014-05-212-4/+60
| |/ /
* | | Fix for #8654Remco Brenninkmeijer2014-05-221-3/+3
* | | Merge pull request #8634 from owncloud/handle-excpetions-in-console-masterThomas Müller2014-05-222-21/+26
|\ \ \
| * | | fix description of console command maintenance:repair - fixes #8574Thomas Müller2014-05-191-1/+1
| * | | adding try/catch + switch to config object as provided by the server containerThomas Müller2014-05-191-20/+25
* | | | Merge pull request #8659 from owncloud/get-preference-multiple-userVincent Petry2014-05-222-0/+74
|\ \ \ \
| * | | | Clean the database after the testJoas Schilling2014-05-211-0/+4
| * | | | Correctly create list of placeholdersJoas Schilling2014-05-211-1/+1
| * | | | Add a lot of users for testingJoas Schilling2014-05-211-1/+15
| * | | | Move return to new lineJoas Schilling2014-05-211-1/+3
| * | | | Add test case for getValueForUsers()Joas Schilling2014-05-211-0/+19
| * | | | Add a method to get the values for multiple users to OC\PreferencesJoas Schilling2014-05-211-0/+35
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2212-25/+25
| |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 02:02:39 +0000