summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14899 from owncloud/setupwarning-textMorris Jobke2015-03-151-1/+1
|\
| * Put notice about checking logs in setup warningRobin McCorkell2015-03-151-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-156-14/+18
|/
* Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-objectJoas Schilling2015-03-143-29/+49
|\
| * No user no avatar easy as thatJoas Schilling2015-03-131-6/+5
| * Color avatars of non-existing users gray and display X insteadJoas Schilling2015-03-131-1/+3
| * Fix order of expected and actual on assertEquals() callsJoas Schilling2015-03-131-19/+19
| * Fix getting the avatar of a non-existing userJoas Schilling2015-03-132-10/+29
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-144-0/+14
* | Merge pull request #14871 from owncloud/use-proper-error-typeThomas Müller2015-03-131-18/+24
|\ \
| * | Use proper error type and clean-up codeLukas Reschke2015-03-131-18/+24
* | | Merge pull request #14880 from owncloud/drop-example-backendThomas Müller2015-03-132-72/+0
|\ \ \
| * | | Remove outdated commentLukas Reschke2015-03-131-2/+0
| * | | Drop example user backendLukas Reschke2015-03-131-70/+0
|/ / /
* | | Merge pull request #14867 from owncloud/drop-OC_User_HTTPMorris Jobke2015-03-131-120/+0
|\ \ \
| * | | Remove OC_User_HTTPLukas Reschke2015-03-131-120/+0
| | |/ | |/|
* | | Merge pull request #14874 from owncloud/correct-typehintLukas Reschke2015-03-132-2/+2
|\ \ \ | |_|/ |/| |
| * | Can also be nullLukas Reschke2015-03-132-2/+2
|/ /
* | Merge pull request #14849 from owncloud/fix-11292blizzz2015-03-131-3/+6
|\ \ | |/ |/|
| * support paged results against 389ds.Arthur Schiwon2015-03-121-3/+6
* | Merge pull request #14844 from owncloud/fix-14843-masterThomas Müller2015-03-131-1/+5
|\ \
| * | cron shall not operate in case we are in maintenance mode - fixes #14843Thomas Müller2015-03-121-1/+5
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-03-13100-8/+488
|/
* Merge pull request #14838 from owncloud/add-curl-hard-dependencyThomas Müller2015-03-121-3/+4
|\
| * Add cURL as hard-dependencyLukas Reschke2015-03-121-3/+4
|/
* Merge pull request #14830 from owncloud/kill-locks-table-masterMorris Jobke2015-03-121-83/+0
|\
| * we no longer support webdav locks - no need to keep the columnThomas Müller2015-03-121-83/+0
|/
* Merge pull request #14785 from owncloud/issue/14733-active-class-missing-for-...Thomas Müller2015-03-121-2/+0
|\
| * Do not overwrite the active menu entry of the navigationJoas Schilling2015-03-111-2/+0
* | 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-12122-362/+116
* | | Merge pull request #14809 from rullzer/avatarcontroller_cache_fixThomas Müller2015-03-111-1/+4
|\ \ \
| * | | Fix the avatarcontroller cache needing the cache dirRoeland Jago Douma2015-03-111-1/+4
* | | | Merge pull request #14357 from owncloud/fix/1373Morris Jobke2015-03-111-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Run `updateDataDirectory` after UpdateLukas Reschke2015-03-021-7/+7
* | | | Merge pull request #14705 from rullzer/avatarcontrollerLukas Reschke2015-03-1113-197/+752
|\ \ \ \
| * | | | Avatar controller moved to AppFrameWorkRoeland Jago Douma2015-03-1113-197/+752
* | | | | Merge pull request #13893 from owncloud/create-cachedir-on-userMorris Jobke2015-03-112-26/+28
|\ \ \ \ \
| * | | | | Only make sure the cache directory exists when we use itRobin Appelman2015-02-042-26/+28
* | | | | | Merge pull request #14798 from owncloud/enable-oci-autotest-masterLukas Reschke2015-03-112-7/+12
|\ \ \ \ \ \
| * | | | | | Don't play with config values ...Thomas Müller2015-03-112-8/+12
| * | | | | | 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 #13648 from oparoz/sfnt-fonts-previewMorris Jobke2015-03-113-1/+22
|\ \ \ \ \ \ \
| * | | | | | | Add support for font previewsOlivier Paroz2015-02-243-1/+22
* | | | | | | | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-viewLukas Reschke2015-03-112-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow iframes from same domain in share viewLukas Reschke2015-03-102-1/+11
* | | | | | | | | Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-det...Morris Jobke2015-03-113-1/+82
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |