summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14613 from kampka/no-table-prefixMorris Jobke2015-03-121-2/+6
|\
| * Install command should not require table prefixChristian Kampka2015-03-111-2/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-1280-338/+0
* | Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-115-188/+298
|\ \
| * | Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-115-188/+298
* | | Merge pull request #14798 from owncloud/enable-oci-autotest-masterLukas Reschke2015-03-111-1/+1
|\ \ \
| * | | Don't play with config values ...Thomas Müller2015-03-111-2/+1
| * | | Setting oci as supported databaseThomas Müller2015-03-111-0/+1
* | | | Merge pull request #14794 from owncloud/add-console-command-user-addMorris Jobke2015-03-112-0/+116
|\ \ \ \ | |/ / / |/| | |
| * | | Add a console command user:add to create users over the consoleJoas Schilling2015-03-112-0/+116
| |/ /
* | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfailMorris Jobke2015-03-113-0/+15
|\ \ \
| * | | Properly forward repair errors and warningsVincent Petry2015-02-273-0/+15
* | | | Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applistThomas Müller2015-03-111-2/+3
|\ \ \ \
| * | | | Always include the installed app version in "occ app:list"Joas Schilling2015-03-111-2/+3
* | | | | Properly handle available databases at runtime and respect setup checks in co...Thomas Müller2015-03-112-135/+45
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-112-0/+6
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-102-2/+50
* | | | Verify CSRF token already in update.php and not the EventSource codeLukas Reschke2015-03-091-0/+2
* | | | Merge pull request #14743 from owncloud/autoconfig-passwordMorris Jobke2015-03-091-0/+8
|\ \ \ \
| * | | | Convert 'abcpassword' to 'abcpass' during setupRobin McCorkell2015-03-071-0/+8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-098-54/+184
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0810-10/+30
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0712-4/+24
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0616-0/+56
* | | | Merge pull request #14582 from rullzer/avatar_fixesMorris Jobke2015-03-044-37/+72
|\ \ \ \
| * | | | Avatars in share dialog fixesRoeland Jago Douma2015-03-034-37/+72
| |/ / /
* | | | Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-b...Morris Jobke2015-03-044-1/+441
|\ \ \ \
| * | | | Added missing done() calls for async testsVincent Petry2015-03-031-20/+31
| * | | | Let users configure security headers in their WebserverLukas Reschke2015-03-024-1/+430
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0422-12/+90
* | | | | 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
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-0370-82/+90
* | | | Merge pull request #14615 from kampka/cron-commandLukas Reschke2015-03-025-0/+179
|\ \ \ \ | |/ / / |/| | |
| * | | Allow configuring background job mode from the consoleChristian Kampka2015-03-025-0/+179
| | |/ | |/|
* | | Maintenance mode message might be misleadingJoas Schilling2015-03-021-1/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-022-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-018-0/+36
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-288-4/+58
* | Merge pull request #14585 from owncloud/fix-avatars-for-users-with-atLukas Reschke2015-02-272-3/+3
|\ \
| * | Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| |/
* / Fix avatars in masterLukas Reschke2015-02-271-1/+1
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2733-665/+181
|\
| * Revert "Updating license headers"Morris Jobke2015-02-2633-665/+181
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-2718-0/+94
* | Merge pull request #13969 from raimund-schluessler/masterMorris Jobke2015-02-261-4/+11
|\ \
| * | Fix variable already definedRaimund Schlüßler2015-02-091-1/+1
| * | Append search results to custom containerRaimund Schlüßler2015-02-081-4/+11
* | | Merge pull request #14208 from owncloud/oc-msg-remove-object-dependencyMorris Jobke2015-02-261-36/+71
|\ \ \ | |_|/ |/| |
| * | Remove dependency from arbitrary data object structure for easier usageJoas Schilling2015-02-201-36/+71