summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Extract the remote host from user input in share dropdownJoas Schilling2015-02-233-1/+82
* | | | | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfailMorris Jobke2015-03-116-64/+124
|\ \ \ \ \ \
| * | | | | | Fixed expected warning count on repair failVincent Petry2015-02-271-1/+1
| * | | | | | Detect that the done flag was not set after repair failVincent Petry2015-02-271-2/+2
| * | | | | | Properly forward repair errors and warningsVincent Petry2015-02-275-1/+45
| * | | | | | Do not abort when meeting unfixable legacy storagesVincent Petry2015-02-272-64/+80
* | | | | | | Merge pull request #14791 from owncloud/fix-14516Lukas Reschke2015-03-115-10/+104
|\ \ \ \ \ \ \
| * | | | | | | Adding a more meaningful message for sabre dav exception - fixes #14516Thomas Müller2015-03-115-10/+104
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #14788 from cmeh/patch-3Thomas Müller2015-03-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correct "one invalid characters" to "one invalid character"cmeh2015-03-111-1/+1
| |/ / / / / /
* | | | | | | 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
* | | | | | | | Merge pull request #14789 from owncloud/better-app-install-error-messagesBernhard Posselt2015-03-112-7/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | display app update error messages - fixes #14611Thomas Müller2015-03-112-7/+12
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-masterThomas Müller2015-03-119-357/+193
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Properly handle available databases at runtime and respect setup checks in co...Thomas Müller2015-03-116-155/+164
| * | | | | | | No need to restart the web server in cli modeThomas Müller2015-03-111-1/+1
| * | | | | | | Use occ to install ownCloud in autotest.shThomas Müller2015-03-114-201/+28
* | | | | | | | Merge pull request #14783 from owncloud/dont-timeout-cron-masterMorris Jobke2015-03-111-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | cron.php on cli has no time limitation - fixes #14481Thomas Müller2015-03-111-0/+3
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-11126-426/+142
|/ / / / / / /
* | | | | | | Merge pull request #14640 from owncloud/rescanversionsonlyonceThomas Müller2015-03-111-3/+13
|\ \ \ \ \ \ \
| * | | | | | | Only rescan versions once in trashbinVincent Petry2015-03-021-3/+13
* | | | | | | | update 3rdparty masterMorris Jobke2015-03-101-0/+0
* | | | | | | | Merge pull request #14115 from owncloud/update-symphony-componentsMorris Jobke2015-03-101-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | update symphony components to 2.6.4Robin Appelman2015-03-101-0/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #14759 from owncloud/clean-up-codeLukas Reschke2015-03-101-6/+48
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean-up code and use proper exception typesLukas Reschke2015-03-091-6/+48
* | | | | | | | | Merge pull request #14346 from owncloud/storage-based-path-validationLukas Reschke2015-03-1026-156/+678
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | no translation service in common storage classThomas Müller2015-03-095-19/+94
| * | | | | | | | | Respect http header 'Accept-Language' on ocs and remote.php callsThomas Müller2015-03-093-37/+48
| * | | | | | | | | translate error messagesThomas Müller2015-03-092-9/+16
| * | | | | | | | | Optimize loopLukas Reschke2015-03-091-6/+9
| * | | | | | | | | fixing js unit testsThomas Müller2015-03-093-31/+0
| * | | | | | | | | deprecate isValidFileName()Thomas Müller2015-03-092-0/+2
| * | | | | | | | | fixing namespaces and PHPDocThomas Müller2015-03-099-45/+76