summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |_|/ |/| |
* | | Merge pull request #8416 from owncloud/sharing_keep_mount_points_visibleBjörn Schießle2014-05-2110-78/+432
|\ \ \
| * | | move the mount point up if a share is mounted to a subfolder and the subfolde...Bjoern Schiessle2014-05-2110-78/+432
* | | | Merge pull request #8652 from owncloud/logfile_rotateMorris Jobke2014-05-211-1/+2
|\ \ \ \
| * | | | use custom logfile path if defined, otherwise use default of owncloud.log in ...scolebrook2014-05-201-1/+2
* | | | | Merge pull request #8612 from owncloud/share-updateshareiconsafterrenameBjörn Schießle2014-05-212-35/+73
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fixed issues with renamingVincent Petry2014-05-162-35/+73
* | | | | Merge pull request #8646 from owncloud/publicshare-fixesBjörn Schießle2014-05-213-24/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed JS issues in public pageVincent Petry2014-05-202-23/+30
| * | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | only start migration if the encryption was initialized; allow to overwrite ke...Bjoern Schiessle2014-05-192-3/+49
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2083-322/+11920
* | | Merge pull request #8639 from owncloud/drop-briefThomas Müller2014-05-19130-864/+884
|\ \ \
| * | | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-19130-868/+888
* | | | Merge pull request #6457 from owncloud/db-convert-toolFrank Karlitschek2014-05-195-98/+495
|\ \ \ \ | |/ / / |/| | |
| * | | fixing typos and adding PHPDocThomas Müller2014-05-121-2/+3
| * | | Add message about unsupported Microsoft SQL Server.Andreas Fischer2014-05-091-0/+5
| * | | Store normalised DBMS type in $type.Andreas Fischer2014-05-091-2/+2
| * | | Pass Connection instead of AbstractSchemaManager to clearSchema().Andreas Fischer2014-04-151-8/+5
| * | | Use exceptions for in input validation.Andreas Fischer2014-04-151-12/+9
| * | | Do not block when nothing is passed via stdin.Andreas Fischer2014-04-151-1/+4
| * | | Do not ask for password before input parameter validation.Andreas Fischer2014-04-151-15/+30
| * | | Remove unnecessary sprintf.Andreas Fischer2014-04-151-8/+2
| * | | Move (extended) input validation out into validateInput() method.Andreas Fischer2014-04-151-12/+19
| * | | Add message for converting to SQLite being unsupported.Andreas Fischer2014-04-151-0/+7
| * | | Use a variable for the DBMS tyoe we are converting to.Andreas Fischer2014-04-151-4/+5