summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8274 from owncloud/appframework-dbMorris Jobke2014-05-1211-0/+1421
|\
| * Make db connection protectedBernhard Posselt2014-05-111-1/+1
| * dont update entity and dont run an update query if an entity wasnt changed at...Bernhard Posselt2014-04-234-2/+33
| * fix phpdoc for entitiesBernhard Posselt2014-04-202-4/+9
| * Fix typo & add typeLukas Reschke2014-04-201-4/+4
| * remove useless importBernhard Posselt2014-04-191-1/+0
| * move db into iservercontainerBernhard Posselt2014-04-198-10/+28
| * remove unusued variableBernhard Posselt2014-04-191-6/+0
| * remove unusued variableBernhard Posselt2014-04-191-1/+0
| * fix doc strings for db facadeBernhard Posselt2014-04-192-2/+2
| * fix scrutinizer issuesBernhard Posselt2014-04-193-12/+27
| * port database layer from appframework to coreBernhard Posselt2014-04-1910-0/+1360
* | Merge pull request #8518 from owncloud/multiselect-width-fixMorris Jobke2014-05-111-1/+1
|\ \
| * | reduce multiselect max-width from 400 to 200px to not take too much spaceJan-Christoph Borchardt2014-05-091-1/+1
* | | Merge pull request #8504 from owncloud/cors-middlewareBernhard Posselt2014-05-119-5/+321
|\ \ \
| * | | Fix method signatureBernhard Posselt2014-05-111-2/+1
| * | | add cors middlewareBernhard Posselt2014-05-099-5/+322
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-11396-1387/+1421
* | | | Merge pull request #8520 from owncloud/jslint_polishing_in_file_uploadLukas Reschke2014-05-101-45/+61
|\ \ \ \
| * | | | polish jslint for files-upload.jsJörn Friedrich Dreyer2014-05-091-45/+61
| | |/ / | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-1091-178/+15473
* | | | Merge pull request #7546 from owncloud/no_freaking_tag_dupesLukas Reschke2014-05-092-22/+33
|\ \ \ \
| * | | | Yet another cleanupThomas Tanghus2014-03-052-22/+33
* | | | | Merge pull request #8496 from owncloud/fix-folder-iconJan-Christoph Borchardt2014-05-091-5/+4
|\ \ \ \ \
| * | | | | fix folder icon (file had a big background rectangle before)Jan-Christoph Borchardt2014-05-071-5/+4
* | | | | | Merge pull request #8512 from owncloud/fix-memcached-hasKeyAndreas Fischer2014-05-091-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Memcached hasKey should test for success, the get can fail for other reasons.Bart Visscher2014-05-081-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0927-137/+186
* | | | | | Merge pull request #8499 from owncloud/shareextstoragemountpointfixVincent Petry2014-05-083-6/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix getPathById for OracleVincent Petry2014-05-081-0/+4
| * | | | | Added unit test for sharing ext storage mount pointsVincent Petry2014-05-081-2/+55
| * | | | | Fix sharing of ext storage mount pointsVincent Petry2014-05-081-4/+6
* | | | | | Merge pull request #8493 from owncloud/we-certainly-don't-want-type-juggling-...Andreas Fischer2014-05-081-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Use strict type comparisonLukas Reschke2014-05-071-2/+2
| |/ / / /
* | | | | Merge pull request #8293 from owncloud/files_external_fix_readDataVincent Petry2014-05-081-19/+18
|\ \ \ \ \
| * | | | | Permit personal mount points to be used for sharingRobin McCorkell2014-04-211-19/+18
* | | | | | Merge pull request #8221 from owncloud/type-hinting-sharingVincent Petry2014-05-085-168/+179
|\ \ \ \ \ \
| * | | | | | Use 'boolean' as type instead of 'bool'Bart Visscher2014-05-071-21/+21
| * | | | | | TypoBart Visscher2014-05-061-1/+1
| * | | | | | Correct return type for getFilePathBart Visscher2014-05-011-1/+1
| * | | | | | Better documentation for isValidSource functionBart Visscher2014-05-011-4/+1
| * | | | | | Some more params are optionalBart Visscher2014-05-011-3/+3
| * | | | | | Merge branch 'master' into type-hinting-sharingBart Visscher2014-04-281045-20063/+51293
| |\ \ \ \ \ \
| * | | | | | | Fix PHPdoc in OC\Share\Share and OCP\ShareBart Visscher2014-04-152-155/+158
| * | | | | | | Fix PHPdoc in apps/files_sharingBart Visscher2014-04-154-1/+15
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-0814-17/+20
* | | | | | | | Merge pull request #8497 from owncloud/sharing_cleanupBjörn Schießle2014-05-073-24/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanupBjoern Schiessle2014-05-072-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix endless loop on windows serversJoas Schilling2014-05-072-2/+2
| * | | | | | | | remove error_log outputBjoern Schiessle2014-05-071-2/+1
| |/ / / / / / /