summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Warn users not to enable DEBUG in productive environmentsLukas Reschke2013-01-251-0/+2
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #1258 from owncloud/no-inline-jsLukas Reschke2013-01-2544-1344/+16285
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use black background imagesLukas Reschke2013-01-251-1/+1
| * | | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-2581-488/+645
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1307 from owncloud/js_linkToRemoteLukas Reschke2013-01-251-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add js linkToRemote and linkToRemoteBaseThomas Tanghus2013-01-251-0/+21
|/ / / / / / / / / /
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2532-113/+175
* | | | | | | | | | Merge pull request #1291 from owncloud/drop-simpletest-compatibility-masterLukas Reschke2013-01-2423-215/+196
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | drop SimpleTest compatibilityThomas Mueller2013-01-2423-215/+196
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1286 from owncloud/ocs_apiThomas Müller2013-01-241-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Code style updateTom Needham2013-01-231-1/+1
| * | | | | | | | | | Check that api methods return the correct result typeTom Needham2013-01-161-0/+3
* | | | | | | | | | | Merge pull request #1265 from j-ed/masterLukas Reschke2013-01-242-2/+18
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-2/+2
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-1/+1
| * | | | | | | | | | Update config/config.sample.phpj-ed2013-01-221-0/+10
| * | | | | | | | | | Update lib/mail.phpj-ed2013-01-221-2/+8
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-2434-170/+244
| | | * | | | | | | | This breaks the installationLukas Reschke2013-01-251-4/+5
| | | * | | | | | | | Initialize router also if ownCloud isn't installedLukas Reschke2013-01-251-16/+18
| | | * | | | | | | | Allow the loading of external imagesLukas Reschke2013-01-252-2/+2
| | | * | | | | | | | Notice about changing the standard policyLukas Reschke2013-01-231-0/+1
| | | * | | | | | | | Allow admins to change the CSP policy in the config fileLukas Reschke2013-01-232-1/+4
| | | * | | | | | | | update to jquery-ui 1.10.0Thomas Mueller2013-01-2319-1126/+16027
| | | * | | | | | | | Fix merge conflictLukas Reschke2013-01-231-12/+0
| | | * | | | | | | | Fix merge conflictLukas Reschke2013-01-231-8/+0
| | | * | | | | | | | Merge master...Lukas Reschke2013-01-23207-1883/+8268
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-23166-1081/+4115
* | | | | | | | | | | Merge pull request #1113 from owncloud/fix-issue-1085Michael Gapczynski2013-01-226-18/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make database connection error messages less verboseMichael Gapczynski2013-01-211-2/+3
| * | | | | | | | | | | returning http status code 503 in case connecting to the database failedThomas Mueller2013-01-211-0/+8
| * | | | | | | | | | | Merge branch 'master' into fix-issue-1085Michael Gapczynski2013-01-07148-2782/+3647
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move template parameters around so database error page is properly renderedMichael Gapczynski2013-01-076-18/+15
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1259 from TheSFReader/masterThomas Müller2013-01-221-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add ebook specific mimetypesTheSFReader2013-01-171-1/+0
| * | | | | | | | | | | | Add ebook specific mimetypesTheSFReader2013-01-171-0/+3
* | | | | | | | | | | | | Merge pull request #1237 from owncloud/fix-template-testsicewind19912013-01-221-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove unnecessary ob_end_clean() from template testsMichael Gapczynski2013-01-191-4/+0
* | | | | | | | | | | | | | Merge pull request #1105 from owncloud/files_encryptionSam Tuke2013-01-2238-793/+4118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-22740-9271/+9056
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed depreciated fileSam Tuke2013-01-221-0/+0
| * | | | | | | | | | | | | Added localisation for encryption settingsSam Tuke2013-01-222-27/+114
| * | | | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-22331-3181/+3552
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removed debugging commentsSam Tuke2013-01-141-49/+0
| * | | | | | | | | | | | | | Removed old and unnecessary commentsSam Tuke2013-01-101-7/+0
| * | | | | | | | | | | | | | Removed misleading crypto gen commentSam Tuke2013-01-101-2/+0
| * | | | | | | | | | | | | | Removed unnecessary lineSam Tuke2013-01-101-1/+0
| * | | | | | | | | | | | | | Removed phantom depreciated filesSam Tuke2013-01-102-96/+0
| * | | | | | | | | | | | | | Merge branch 'master' into files_encryptionSam Tuke2013-01-10247-4949/+7068
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Re-added 'checkAdminUser'Sam Tuke2013-01-101-6/+10
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 19:15:07 +0000