Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14705 from rullzer/avatarcontroller | Lukas Reschke | 2015-03-11 | 13 | -197/+752 |
|\ | |||||
| * | Avatar controller moved to AppFrameWork | Roeland Jago Douma | 2015-03-11 | 13 | -197/+752 |
* | | Merge pull request #13893 from owncloud/create-cachedir-on-user | Morris Jobke | 2015-03-11 | 2 | -26/+28 |
|\ \ | |||||
| * | | Only make sure the cache directory exists when we use it | Robin Appelman | 2015-02-04 | 2 | -26/+28 |
* | | | Merge pull request #14798 from owncloud/enable-oci-autotest-master | Lukas Reschke | 2015-03-11 | 2 | -7/+12 |
|\ \ \ | |||||
| * | | | Don't play with config values ... | Thomas Müller | 2015-03-11 | 2 | -8/+12 |
| * | | | Setting oci as supported database | Thomas Müller | 2015-03-11 | 1 | -0/+1 |
* | | | | Merge pull request #14794 from owncloud/add-console-command-user-add | Morris Jobke | 2015-03-11 | 2 | -0/+116 |
|\ \ \ \ | |||||
| * | | | | Add a console command user:add to create users over the console | Joas Schilling | 2015-03-11 | 2 | -0/+116 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #13648 from oparoz/sfnt-fonts-preview | Morris Jobke | 2015-03-11 | 3 | -1/+22 |
|\ \ \ \ | |||||
| * | | | | Add support for font previews | Olivier Paroz | 2015-02-24 | 3 | -1/+22 |
* | | | | | Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view | Lukas Reschke | 2015-03-11 | 2 | -1/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Allow iframes from same domain in share view | Lukas Reschke | 2015-03-10 | 2 | -1/+11 |
* | | | | | | Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-det... | Morris Jobke | 2015-03-11 | 3 | -1/+82 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Extract the remote host from user input in share dropdown | Joas Schilling | 2015-02-23 | 3 | -1/+82 |
* | | | | | | Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail | Morris Jobke | 2015-03-11 | 6 | -64/+124 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed expected warning count on repair fail | Vincent Petry | 2015-02-27 | 1 | -1/+1 |
| * | | | | | | Detect that the done flag was not set after repair fail | Vincent Petry | 2015-02-27 | 1 | -2/+2 |
| * | | | | | | Properly forward repair errors and warnings | Vincent Petry | 2015-02-27 | 5 | -1/+45 |
| * | | | | | | Do not abort when meeting unfixable legacy storages | Vincent Petry | 2015-02-27 | 2 | -64/+80 |
* | | | | | | | Merge pull request #14791 from owncloud/fix-14516 | Lukas Reschke | 2015-03-11 | 5 | -10/+104 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adding a more meaningful message for sabre dav exception - fixes #14516 | Thomas Müller | 2015-03-11 | 5 | -10/+104 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #14788 from cmeh/patch-3 | Thomas Müller | 2015-03-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Correct "one invalid characters" to "one invalid character" | cmeh | 2015-03-11 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist | Thomas Müller | 2015-03-11 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Always include the installed app version in "occ app:list" | Joas Schilling | 2015-03-11 | 1 | -2/+3 |
* | | | | | | | | Merge pull request #14789 from owncloud/better-app-install-error-messages | Bernhard Posselt | 2015-03-11 | 2 | -7/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | display app update error messages - fixes #14611 | Thomas Müller | 2015-03-11 | 2 | -7/+12 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master | Thomas Müller | 2015-03-11 | 9 | -357/+193 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Properly handle available databases at runtime and respect setup checks in co... | Thomas Müller | 2015-03-11 | 6 | -155/+164 |
| * | | | | | | | No need to restart the web server in cli mode | Thomas Müller | 2015-03-11 | 1 | -1/+1 |
| * | | | | | | | Use occ to install ownCloud in autotest.sh | Thomas Müller | 2015-03-11 | 4 | -201/+28 |
* | | | | | | | | Merge pull request #14783 from owncloud/dont-timeout-cron-master | Morris Jobke | 2015-03-11 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | cron.php on cli has no time limitation - fixes #14481 | Thomas Müller | 2015-03-11 | 1 | -0/+3 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-11 | 126 | -426/+142 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #14640 from owncloud/rescanversionsonlyonce | Thomas Müller | 2015-03-11 | 1 | -3/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Only rescan versions once in trashbin | Vincent Petry | 2015-03-02 | 1 | -3/+13 |
* | | | | | | | | update 3rdparty master | Morris Jobke | 2015-03-10 | 1 | -0/+0 |
* | | | | | | | | Merge pull request #14115 from owncloud/update-symphony-components | Morris Jobke | 2015-03-10 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update symphony components to 2.6.4 | Robin Appelman | 2015-03-10 | 1 | -0/+0 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #14759 from owncloud/clean-up-code | Lukas Reschke | 2015-03-10 | 1 | -6/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Clean-up code and use proper exception types | Lukas Reschke | 2015-03-09 | 1 | -6/+48 |
* | | | | | | | | | Merge pull request #14346 from owncloud/storage-based-path-validation | Lukas Reschke | 2015-03-10 | 26 | -156/+678 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | no translation service in common storage class | Thomas Müller | 2015-03-09 | 5 | -19/+94 |
| * | | | | | | | | | Respect http header 'Accept-Language' on ocs and remote.php calls | Thomas Müller | 2015-03-09 | 3 | -37/+48 |
| * | | | | | | | | | translate error messages | Thomas Müller | 2015-03-09 | 2 | -9/+16 |
| * | | | | | | | | | Optimize loop | Lukas Reschke | 2015-03-09 | 1 | -6/+9 |
| * | | | | | | | | | fixing js unit tests | Thomas Müller | 2015-03-09 | 3 | -31/+0 |
| * | | | | | | | | | deprecate isValidFileName() | Thomas Müller | 2015-03-09 | 2 | -0/+2 |
| * | | | | | | | | | fixing namespaces and PHPDoc | Thomas Müller | 2015-03-09 | 9 | -45/+76 |