summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 creation
| * 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
| * 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
|\ | | | | Sharing improvements
| * 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
| | | | | | | | point should be adjusted to ne unique again
| * 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 log
| * | 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'
| * | | 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 images
| * | | 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 users
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | Priority on external storage mounts
| * | | 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
| | | | | | | | | | | | | | | | A mount applicable to all users is as good a definition of global as can be
| * | | Add storage priority supportRobin McCorkell2014-05-212-4/+60
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each storage backend has a default priority, assigned to any system mounts created in ownCloud. mount.json can be manually modified to change these priorities. The priority order is as follows: * Personal * User * Group * Global Within each mount type, the mount with the highest priority is active. The storage backend defaults were chosen to be the following: * Local - 150 * Remote storage - 100 * SMB / CIFS with OC login - 90
* | | 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
|\ \ \ | | | | | | | | Handle excpetions in console master
| * | | 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
|\ \ \ \ | | | | | | | | | | Add a method to get the values for multiple users to OC\Preferences
| * | | | 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
| |_|/ / |/| | |
* | | | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visibleBjörn Schießle2014-05-2110-78/+432
|\ \ \ \ | | | | | | | | | | [sharing] move the mount point up if the parent folder no longer exists
| * | | | move the mount point up if a share is mounted to a subfolder and the ↵Bjoern Schiessle2014-05-2110-78/+432
| | | | | | | | | | | | | | | | | | | | subfolder no longer exists
* | | | | Merge pull request #8652 from owncloud/logfile_rotateMorris Jobke2014-05-211-1/+2
|\ \ \ \ \ | | | | | | | | | | | | rotate custom logfile if defined
| * | | | | use custom logfile path if defined, otherwise use default of owncloud.log in ↵scolebrook2014-05-201-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | data directory
* | | | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\ \ \ \ \ | |_|/ / / |/| | | | [master] Fixed issues with renaming
| * | | | Fixed issues with renamingVincent Petry2014-05-162-35/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - summary is now untouched on rename instead of bogus incrementation - fixes "Share" status icon by only triggring "fileActionsReady" once - row is now reinserted even when rename is cancelled, this removes the hacky/buggy code that tried to rename the element back - added unit tests to cover the fixed cases
* | | | | Merge pull request #8646 from owncloud/publicshare-fixesBjörn Schießle2014-05-213-24/+31
|\ \ \ \ \ | |_|_|/ / |/| | | | [master] Fixed for public link page
| * | | | Fixed JS issues in public pageVincent Petry2014-05-202-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | | - fixed subdir detection when uploading into subdir - add class detection before overriding to avoid JS errors
| * | | | Fixed download URL in public pageVincent Petry2014-05-201-1/+1
| | |/ / | |/| |
* | | | Merge pull request #8637 from owncloud/enc_improved_error_handlingVincent Petry2014-05-212-3/+49
|\ \ \ \ | |/ / / |/| | | [encryption] improved error handling during password change
| * | | only start migration if the encryption was initialized; allow to overwrite ↵Bjoern Schiessle2014-05-192-3/+49
| | |/ | |/| | | | | | | keys if no files exists
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 02:07:41 +0000