Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-28 | 24 | -36/+228 |
* | Merge pull request #24290 from owncloud/mimetypealiases-2 | Thomas Müller | 2016-04-28 | 1 | -1/+1 |
|\ | |||||
| * | correct typo in mimetypealiases.dist.json | Carla Schroder | 2016-04-26 | 1 | -1/+1 |
* | | Merge pull request #24315 from owncloud/l10n_psr4 | Thomas Müller | 2016-04-28 | 3 | -0/+0 |
|\ \ | |||||
| * | | Move \OC\L10N to PSR-4 | Roeland Jago Douma | 2016-04-27 | 2 | -0/+0 |
| * | | Move OC_L10N_String to legacy folder | Roeland Jago Douma | 2016-04-27 | 1 | -0/+0 |
|/ / | |||||
* | | Merge pull request #24310 from owncloud/enoch85-patch-1 | Thomas Müller | 2016-04-27 | 1 | -2/+2 |
|\ \ | |||||
| * | | 2015 --> 2016 | Daniel Hansson | 2016-04-27 | 1 | -2/+2 |
|/ / | |||||
* | | Merge pull request #23942 from owncloud/fix-behat | Thomas Müller | 2016-04-27 | 1 | -6/+6 |
|\ \ | |||||
| * | | Use baseUrl as provided | Thomas Müller | 2016-04-12 | 1 | -6/+6 |
* | | | Merge pull request #22777 from owncloud/encrypt_all_master_key | Thomas Müller | 2016-04-27 | 4 | -29/+116 |
|\ \ \ | |||||
| * | | | if we don't have a encrypted file key we can return a empty string right away | Bjoern Schiessle | 2016-04-26 | 2 | -5/+38 |
| * | | | don't create a private-/public-key pair for each user if the master key is en... | Bjoern Schiessle | 2016-04-26 | 3 | -24/+78 |
* | | | | Merge pull request #21417 from J0WI/css-fixes | Thomas Müller | 2016-04-27 | 7 | -27/+38 |
|\ \ \ \ | |||||
| * | | | | fixed fallbacks and code style | jowi | 2016-01-02 | 7 | -27/+38 |
* | | | | | Merge pull request #24286 from owncloud/hooks_psr4 | Thomas Müller | 2016-04-27 | 6 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Move \OC\Hooks to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-27 | 48 | -40/+206 |
* | | | | | Merge pull request #24246 from owncloud/local-invalid | Lukas Reschke | 2016-04-26 | 2 | -0/+17 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | add tests | Robin Appelman | 2016-04-26 | 1 | -0/+14 |
| * | | | | error out if a local storage isn't setup correctly | Robin Appelman | 2016-04-25 | 1 | -0/+3 |
* | | | | | Merge pull request #24027 from owncloud/translate_ocs_share | Thomas Müller | 2016-04-26 | 4 | -63/+94 |
|\ \ \ \ \ | |||||
| * | | | | | Translate OCS Share API error messages | Roeland Jago Douma | 2016-04-25 | 4 | -63/+94 |
* | | | | | | Merge pull request #24277 from owncloud/more-sanity | Thomas Müller | 2016-04-26 | 1 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't write empty RewriteBase | Lukas Reschke | 2016-04-26 | 1 | -1/+9 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #24269 from owncloud/backgroundjob_psr4 | Thomas Müller | 2016-04-26 | 6 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Move \OC\BackgroundJob to PSR-4 | Roeland Jago Douma | 2016-04-26 | 6 | -0/+0 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-26 | 204 | -1114/+1230 |
* | | | | | | Merge pull request #24256 from owncloud/scanner-propagate | Morris Jobke | 2016-04-26 | 2 | -0/+40 |
|\ \ \ \ \ \ | |||||
| * | | | | | | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 2 | -0/+40 |
* | | | | | | | Merge pull request #24262 from owncloud/fix-24228 | Morris Jobke | 2016-04-26 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | check whether index is set before using it | Arthur Schiwon | 2016-04-25 | 1 | -1/+2 |
* | | | | | | | | Merge pull request #24199 from owncloud/ocp-repair | Morris Jobke | 2016-04-26 | 35 | -199/+369 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new in... | Thomas Müller | 2016-04-25 | 35 | -199/+369 |
* | | | | | | | | Merge pull request #24268 from owncloud/search_psr4 | Thomas Müller | 2016-04-26 | 5 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move \OC\Search to PSR-4 | Roeland Jago Douma | 2016-04-26 | 5 | -0/+0 |
* | | | | | | | | | Merge pull request #24266 from owncloud/mimetypealiases | Roeland Douma | 2016-04-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | correct occ command for mimetypealiases | Carla Schroder | 2016-04-25 | 1 | -1/+1 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator | Thomas Müller | 2016-04-25 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | LDAP Wizard: reset connection status indicator when switching LDAP config | Arthur Schiwon | 2016-04-25 | 1 | -0/+11 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #22783 from patelfenil/bugfix-issue-17320 | Thomas Müller | 2016-04-25 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove image now not coming when user changes fullname. Fixes #17320 | patelfenil | 2016-03-07 | 1 | -2/+9 |
* | | | | | | | | | Merge pull request #22648 from owncloud/propagate-single | Thomas Müller | 2016-04-25 | 8 | -29/+56 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 8 | -29/+56 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #24264 from owncloud/route_psr4 | Lukas Reschke | 2016-04-25 | 3 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Move \OC\Route to PSR-4 | Roeland Jago Douma | 2016-04-25 | 3 | -0/+0 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #24251 from owncloud/fix-mailer | Roeland Douma | 2016-04-25 | 2 | -3/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix the syntax and methods in the sample | Joas Schilling | 2016-04-25 | 1 | -3/+4 |
| * | | | | | | | | Allow automatic dependency injection for OCP\Mail\Mailer | Joas Schilling | 2016-04-25 | 1 | -0/+4 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #24244 from owncloud/mount-unique | Vincent Petry | 2016-04-25 | 2 | -2/+22 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | |