Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-10 | 2 | -2/+2 |
* | logging changes | Craig Morrissey | 2014-11-07 | 1 | -0/+3 |
* | don't scan part files | Bjoern Schiessle | 2014-11-07 | 2 | -5/+5 |
* | Also propagate etag changes when the watcher finds a changed file | Robin Appelman | 2014-11-07 | 2 | -0/+7 |
* | Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_... | Lukas Reschke | 2014-11-07 | 1 | -1/+7 |
|\ | |||||
| * | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 1 | -1/+7 |
* | | Merge pull request #12019 from owncloud/fix-template-shortcuts | Thomas Müller | 2014-11-07 | 1 | -2/+2 |
|\ \ | |||||
| * | | second parameter in template shortcuts script() and style() is optional | Morris Jobke | 2014-11-06 | 1 | -2/+2 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-07 | 2 | -0/+2 |
* | | | Merge pull request #12003 from owncloud/password-migration | Lukas Reschke | 2014-11-06 | 2 | -33/+9 |
|\ \ \ | |/ / |/| | | |||||
| * | | Load PHPAss via autoloader | Lukas Reschke | 2014-11-06 | 1 | -1/+2 |
| * | | Use new hashing API for OC_User_Database | Lukas Reschke | 2014-11-06 | 1 | -32/+7 |
* | | | Merge pull request #12009 from owncloud/make-optional | Morris Jobke | 2014-11-06 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Make second argument optional | Lukas Reschke | 2014-11-06 | 1 | -2/+2 |
* | | | | Merge pull request #11945 from owncloud/share-setup-other-user | Robin Appelman | 2014-11-06 | 1 | -3/+18 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Support displaynames for dummy user backend | Robin Appelman | 2014-11-06 | 1 | -3/+18 |
* | | | | Merge pull request #11998 from owncloud/add-get-logger-to-interface | Lukas Reschke | 2014-11-06 | 1 | -0/+7 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add getLogger() to IServerContainer | Lukas Reschke | 2014-11-06 | 1 | -0/+7 |
* | | | | Add OCP\Security\IHasher | Lukas Reschke | 2014-11-06 | 4 | -0/+220 |
* | | | | Merge pull request #11883 from owncloud/clear-session-for-setup | Lukas Reschke | 2014-11-06 | 1 | -1/+2 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Clear session before setup | Lukas Reschke | 2014-10-31 | 1 | -1/+2 |
* | | | | Merge pull request #11972 from owncloud/usermanager-remove-delete | Lukas Reschke | 2014-11-06 | 2 | -22/+5 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic cache... | Robin Appelman | 2014-11-05 | 2 | -22/+5 |
* | | | | md5 now handled via bower | Morris Jobke | 2014-11-06 | 1 | -1/+1 |
* | | | | bower snapjs | Morris Jobke | 2014-11-06 | 1 | -1/+1 |
* | | | | Merge pull request #11982 from owncloud/bower-underscore | Vincent Petry | 2014-11-06 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | bower underscore | Morris Jobke | 2014-11-05 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-06 | 2 | -0/+2 |
|/ / / / | |||||
* | | | | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
* | | | | | Merge pull request #11965 from owncloud/fix-jsonresponse | Thomas Müller | 2014-11-05 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix typo in content type | Bernhard Posselt | 2014-11-05 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 2 | -0/+20 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 2 | -0/+20 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-05 | 2 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | fix shortcuts - underline instead of camelCase | Morris Jobke | 2014-11-04 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Merge pull request #11916 from owncloud/introduce-bower | Morris Jobke | 2014-11-04 | 3 | -17/+75 |
|\ \ \ | |||||
| * | | | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 1 | -1/+1 |
| * | | | ability to add bower resources | Morris Jobke | 2014-11-03 | 2 | -16/+74 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-04 | 2 | -2/+2 |
* | | | Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig | Morris Jobke | 2014-11-03 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | First check whether it is the default config before touchign | Lukas Reschke | 2014-11-03 | 1 | -1/+1 |
* | | | Update Pimple to V3.0 | Thomas Müller | 2014-11-03 | 3 | -15/+17 |
* | | | Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 | Thomas Müller | 2014-11-03 | 1 | -2/+0 |
|/ / | |||||
* | | fix odd behaviour | Morris Jobke | 2014-10-31 | 1 | -4/+8 |
* | | Merge pull request #9044 from owncloud/add-missing-email-principal | Vincent Petry | 2014-10-31 | 1 | -0/+12 |
|\ \ | |||||
| * | | adding missing email address for principal | libasys | 2014-10-24 | 1 | -0/+12 |
* | | | Merge pull request #11539 from owncloud/mount-setup-once | Vincent Petry | 2014-10-31 | 1 | -1/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Reset the users setup after clearing mounts | Robin Appelman | 2014-10-28 | 1 | -0/+1 |
| * | | Only mount the storages for the user once | Robin Appelman | 2014-10-27 | 1 | -1/+5 |