summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-22573-4669/+4404
* Merge pull request #4131 from owncloud/scanner-splitBart Visscher2013-07-215-49/+140
|\
| * Split scanning logic from ajax fileRobin Appelman2013-07-193-46/+119
| * add option to get the mountmanager from the filesystemRobin Appelman2013-07-191-1/+8
| * Make Cache\Scanner an emitterRobin Appelman2013-07-191-2/+13
* | Merge pull request #4092 from owncloud/base-better-errorsBart Visscher2013-07-214-24/+17
|\ \
| * | Result of && if not the partBart Visscher2013-07-191-1/+1
| * | Display the exception error backtrace preformattedBart Visscher2013-07-161-0/+3
| * | Early errors (in base.php) don't have session availableBart Visscher2013-07-162-2/+5
| * | Cleanup error generation in base.phpBart Visscher2013-07-161-20/+8
| * | Use autoloader for Patchwork/PHP/Shim/NormalizerBart Visscher2013-07-162-2/+1
* | | Merge pull request #3880 from owncloud/code-checkerBart Visscher2013-07-214-10/+68
|\ \ \
| * | | Correct casing of OC_User and pass through the params to getUsersBart Visscher2013-07-191-8/+8
| * | | Add OC_L10N to public apiBart Visscher2013-07-192-0/+10
| * | | Add OC_Image to public apiBart Visscher2013-07-192-0/+30
| * | | Add classes replaced by the public api to the code checkerBart Visscher2013-05-171-2/+20
* | | | Merge pull request #4145 from owncloud/fix-failing-mastericewind19912013-07-213-1/+19
|\ \ \ \
| * | | | mark test as incomplete because I can't reproduce jenkins failureMorris Jobke2013-07-211-0/+3
| * | | | fix failing master branch - Test_Config::testWriteDataMorris Jobke2013-07-212-1/+16
|/ / / /
* | | | add proper deprecated tagMorris Jobke2013-07-211-0/+1
* | | | Merge pull request #4118 from owncloud/remove-size-experimentMorris Jobke2013-07-217-40/+7
|\ \ \ \
| * | | | add back public API function, but mark as deprecatedJan-Christoph Borchardt2013-07-201-0/+10
| * | | | finally remove the file size obfuscation as it had more disadvantages. I was ...Jan-Christoph Borchardt2013-07-187-48/+5
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-21537-1072/+1086
* | | | | Merge pull request #4130 from owncloud/ie-show-passwordMorris Jobke2013-07-201-0/+9
|\ \ \ \ \
| * | | | | deactivate show password toggle for IEJan-Christoph Borchardt2013-07-191-0/+9
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-20534-1055/+1055
* | | | | | Merge pull request #4119 from owncloud/external-storage-statusThomas Müller2013-07-194-5/+19
|\ \ \ \ \ \
| * | | | | | replace external storage status images with CSS, also use form to distinguish...Jan-Christoph Borchardt2013-07-184-5/+19
| | |/ / / / | |/| | | |
* | | | | | LDAP: fix background job, resolves #3528Arthur Schiwon2013-07-191-11/+9
| |_|_|_|/ |/| | | |
* | | | | Add message about completed updateArthur Schiwon2013-07-191-0/+1
* | | | | non-ajax Upgrade script utility, usable via CLI or wget. Requires PR 4047.Arthur Schiwon2013-07-191-0/+76
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-19544-1156/+1181
* | | | Merge pull request #3947 from runky/patch-1Andreas Fischer2013-07-191-1/+1
|\ \ \ \
| * | | | Update authenticate.phprunky2013-07-051-1/+1
* | | | | Merge pull request #2221 from owncloud/doctrineBart Visscher2013-07-1815-4454/+847
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Tweaks to the MDB2SchemaReaderBart Visscher2013-07-183-2/+7
| * | | | Merge branch 'master' into doctrineBart Visscher2013-07-131146-24101/+33540
| |\ \ \ \
| * | | | | Only change integer type when the length is setBart Visscher2013-07-051-1/+1
| * | | | | Add comment to column definitionBart Visscher2013-07-051-0/+4
| * | | | | Move DoctrineStatementWrapper to its own fileBart Visscher2013-06-282-183/+190
| * | | | | Remove deadcodeBart Visscher2013-06-283-30/+0
| * | | | | enable oracle testingJörn Friedrich Dreyer2013-06-281-2/+1
| * | | | | adding PHPDocThomas Mueller2013-06-273-4/+11
| * | | | | check item id is setJörn Friedrich Dreyer2013-06-271-1/+1
| * | | | | Oracle doesn't know & as bitwise ANDBart Visscher2013-06-261-1/+7
| * | | | | View test needs a dummy userBart Visscher2013-06-261-0/+9
| * | | | | Use Doctrine platform to add limit and offset to queryBart Visscher2013-06-261-15/+4
| * | | | | Change nullable of filecache.etag and permissions.userBart Visscher2013-06-261-2/+2
| * | | | | Always quote db identifiers in OC_DB_MDB2SchemaReaderBart Visscher2013-06-241-4/+3