Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #8274 from owncloud/appframework-db | Morris Jobke | 2014-05-12 | 11 | -0/+1421 |
|\ | |||||
| * | Make db connection protected | Bernhard Posselt | 2014-05-11 | 1 | -1/+1 |
| * | dont update entity and dont run an update query if an entity wasnt changed at... | Bernhard Posselt | 2014-04-23 | 4 | -2/+33 |
| * | fix phpdoc for entities | Bernhard Posselt | 2014-04-20 | 2 | -4/+9 |
| * | Fix typo & add type | Lukas Reschke | 2014-04-20 | 1 | -4/+4 |
| * | remove useless import | Bernhard Posselt | 2014-04-19 | 1 | -1/+0 |
| * | move db into iservercontainer | Bernhard Posselt | 2014-04-19 | 8 | -10/+28 |
| * | remove unusued variable | Bernhard Posselt | 2014-04-19 | 1 | -6/+0 |
| * | remove unusued variable | Bernhard Posselt | 2014-04-19 | 1 | -1/+0 |
| * | fix doc strings for db facade | Bernhard Posselt | 2014-04-19 | 2 | -2/+2 |
| * | fix scrutinizer issues | Bernhard Posselt | 2014-04-19 | 3 | -12/+27 |
| * | port database layer from appframework to core | Bernhard Posselt | 2014-04-19 | 10 | -0/+1360 |
* | | Merge pull request #8518 from owncloud/multiselect-width-fix | Morris Jobke | 2014-05-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | reduce multiselect max-width from 400 to 200px to not take too much space | Jan-Christoph Borchardt | 2014-05-09 | 1 | -1/+1 |
* | | | Merge pull request #8504 from owncloud/cors-middleware | Bernhard Posselt | 2014-05-11 | 9 | -5/+321 |
|\ \ \ | |||||
| * | | | Fix method signature | Bernhard Posselt | 2014-05-11 | 1 | -2/+1 |
| * | | | add cors middleware | Bernhard Posselt | 2014-05-09 | 9 | -5/+322 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-11 | 396 | -1387/+1421 |
* | | | | Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload | Lukas Reschke | 2014-05-10 | 1 | -45/+61 |
|\ \ \ \ | |||||
| * | | | | polish jslint for files-upload.js | Jörn Friedrich Dreyer | 2014-05-09 | 1 | -45/+61 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-10 | 91 | -178/+15473 |
* | | | | Merge pull request #7546 from owncloud/no_freaking_tag_dupes | Lukas Reschke | 2014-05-09 | 2 | -22/+33 |
|\ \ \ \ | |||||
| * | | | | Yet another cleanup | Thomas Tanghus | 2014-03-05 | 2 | -22/+33 |
* | | | | | Merge pull request #8496 from owncloud/fix-folder-icon | Jan-Christoph Borchardt | 2014-05-09 | 1 | -5/+4 |
|\ \ \ \ \ | |||||
| * | | | | | fix folder icon (file had a big background rectangle before) | Jan-Christoph Borchardt | 2014-05-07 | 1 | -5/+4 |
* | | | | | | Merge pull request #8512 from owncloud/fix-memcached-hasKey | Andreas Fischer | 2014-05-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Memcached hasKey should test for success, the get can fail for other reasons. | Bart Visscher | 2014-05-08 | 1 | -1/+1 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-09 | 27 | -137/+186 |
* | | | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfix | Vincent Petry | 2014-05-08 | 3 | -6/+65 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix getPathById for Oracle | Vincent Petry | 2014-05-08 | 1 | -0/+4 |
| * | | | | | Added unit test for sharing ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -2/+55 |
| * | | | | | Fix sharing of ext storage mount points | Vincent Petry | 2014-05-08 | 1 | -4/+6 |
* | | | | | | Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-... | Andreas Fischer | 2014-05-08 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Use strict type comparison | Lukas Reschke | 2014-05-07 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #8293 from owncloud/files_external_fix_readData | Vincent Petry | 2014-05-08 | 1 | -19/+18 |
|\ \ \ \ \ | |||||
| * | | | | | Permit personal mount points to be used for sharing | Robin McCorkell | 2014-04-21 | 1 | -19/+18 |
* | | | | | | Merge pull request #8221 from owncloud/type-hinting-sharing | Vincent Petry | 2014-05-08 | 5 | -168/+179 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use 'boolean' as type instead of 'bool' | Bart Visscher | 2014-05-07 | 1 | -21/+21 |
| * | | | | | | Typo | Bart Visscher | 2014-05-06 | 1 | -1/+1 |
| * | | | | | | Correct return type for getFilePath | Bart Visscher | 2014-05-01 | 1 | -1/+1 |
| * | | | | | | Better documentation for isValidSource function | Bart Visscher | 2014-05-01 | 1 | -4/+1 |
| * | | | | | | Some more params are optional | Bart Visscher | 2014-05-01 | 1 | -3/+3 |
| * | | | | | | Merge branch 'master' into type-hinting-sharing | Bart Visscher | 2014-04-28 | 1045 | -20063/+51293 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix PHPdoc in OC\Share\Share and OCP\Share | Bart Visscher | 2014-04-15 | 2 | -155/+158 |
| * | | | | | | | Fix PHPdoc in apps/files_sharing | Bart Visscher | 2014-04-15 | 4 | -1/+15 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-05-08 | 14 | -17/+20 |
* | | | | | | | | Merge pull request #8497 from owncloud/sharing_cleanup | Björn Schießle | 2014-05-07 | 3 | -24/+9 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup | Bjoern Schiessle | 2014-05-07 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix endless loop on windows servers | Joas Schilling | 2014-05-07 | 2 | -2/+2 |
| * | | | | | | | | remove error_log output | Bjoern Schiessle | 2014-05-07 | 1 | -2/+1 |
| |/ / / / / / / |