aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2Joas Schilling2015-03-034-25/+25
|\
| * Fix the behaviour of getLanguageCode() to match the expectation of the nameJoas Schilling2015-03-032-23/+8
| * Use findLanguage() instead of creating the object firstJoas Schilling2015-03-031-2/+1
| * Add a test of what everyone thinks should be the result of this methodJoas Schilling2015-03-031-0/+16
* | Merge pull request #14660 from metaworx/replace-static-dbtableprefix-with-con...Joas Schilling2015-03-031-2/+2
|\ \
| * | replace 'oc_' with dbtableprefix form config for temporary table names and in...martin-rueegg2015-03-031-2/+2
* | | Merge pull request #14574 from owncloud/fix-irequest-for-older-php-versionsThomas Müller2015-03-034-122/+48
|\ \ \
| * | | Simplify codeLukas Reschke2015-03-011-2/+3
| * | | Read from IRequest instead of reading twiceLukas Reschke2015-02-274-122/+47
* | | | Merge pull request #14638 from owncloud/issue/14538-repairstep-drop-old-tablesThomas Müller2015-03-034-0/+147
|\ \ \ \
| * | | | Add a test for dropping the tablesJoas Schilling2015-03-032-0/+62
| * | | | Add a repair step to delete old tablesJoas Schilling2015-03-022-0/+85
* | | | | Merge pull request #14586 from owncloud/proper-appcodechecker-docuThomas Müller2015-03-031-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | proper description of appcodechecker in config sampleMorris Jobke2015-02-271-2/+3
* | | | | Merge pull request #14496 from owncloud/kill-substr-mssql-masterThomas Müller2015-03-031-102/+0
|\ \ \ \ \
| * | | | | Remove hacky Substring support for MSSQLLukas Reschke2015-02-251-102/+0
* | | | | | Merge pull request #14653 from sebomoto/fix_loading_feedbackMorris Jobke2015-03-031-0/+1
|\ \ \ \ \ \
| * | | | | | fix for loading spinner reappearing after errors in db-connectionSebastian Bolt2015-03-021-0/+1
* | | | | | | Merge pull request #14652 from owncloud/kill-download-from-urlVincent Petry2015-03-033-164/+13
|\ \ \ \ \ \ \
| * | | | | | | remove $content parameterThomas Müller2015-03-021-7/+4
| * | | | | | | Remove "Download from URL" featureLukas Reschke2015-03-023-163/+15
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-03106-122/+198
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #14615 from kampka/cron-commandLukas Reschke2015-03-026-0/+237
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow configuring background job mode from the consoleChristian Kampka2015-03-026-0/+237
* | | | | | | Adding dependency labelsThomas Müller2015-03-021-0/+6
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #14633 from owncloud/issue/14627-maintenance-mode-message-...Thomas Müller2015-03-021-1/+1
|\ \ \ \ \ \
| * | | | | | Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #14573 from owncloud/enc-migrate-disable-updaterVincent Petry2015-03-024-14/+70
|\ \ \ \ \ \
| * | | | | | Move keys instead of copy during encryption key migrationVincent Petry2015-02-271-2/+2
| * | | | | | add some tests for disabled updaterRobin Appelman2015-02-271-0/+30
| * | | | | | Disable the cache updater when doing the encryption migrationRobin Appelman2015-02-271-9/+15
| * | | | | | Allow disabling the cache updaterRobin Appelman2015-02-272-3/+23
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #14635 from owncloud/cleanup-config.sample.phpLukas Reschke2015-03-021-19/+20
|\ \ \ \ \ \
| * | | | | | fix link for Preview documentationMorris Jobke2015-03-021-2/+2
| * | | | | | fix line breaks in config.sample.phpMorris Jobke2015-03-021-17/+18
|/ / / / / /
* | | | | | Merge pull request #14608 from kampka/masterThomas Müller2015-03-021-0/+1
|\ \ \ \ \ \
| * | | | | | Don't swallow errors in console.phpChristian Kampka2015-02-281-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #14535 from owncloud/fix-files-externalThomas Müller2015-03-022-2/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix files external test run and add common-tests optionMorris Jobke2015-02-262-2/+12
* | | | | | Merge pull request #14593 from owncloud/fix/13994Morris Jobke2015-03-023-1/+39
|\ \ \ \ \ \
| * | | | | | Simplify codeLukas Reschke2015-03-011-4/+4
| * | | | | | Add detection for invalid CLI configuration for settings pageLukas Reschke2015-02-273-1/+39
* | | | | | | Merge pull request #14570 from rullzer/ocs_sane_permissionsMorris Jobke2015-03-022-1/+79
|\ \ \ \ \ \ \
| * | | | | | | Shares should have a least read permissionRoeland Jago Douma2015-03-012-1/+79
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0284-158/+232
* | | | | | | | Merge pull request #14614 from jakobsack/masterMorris Jobke2015-03-012-5/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve language on backgroundjob admin pageJakob Sack2015-03-011-2/+2
| * | | | | | | | Rename $human_time to $relative_time in cron settingsJakob Sack2015-02-281-3/+3
| * | | | | | | | Add absolute time of last cronjob as hover tipJakob Sack2015-02-282-4/+11
| * | | | | | | | Use relative time for cron statusJakob Sack2015-02-281-3/+3
| | |_|_|/ / / / | |/| | | | | |