| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #12050 from owncloud/use-proper-array-name | Lukas Reschke | 2014-11-08 | 1 | -1/+1 |
| |\ | |||||
| | * | Use proper array key | Lukas Reschke | 2014-11-08 | 1 | -1/+1 |
| * | | Merge pull request #12038 from sebomoto/fix-user-dropdown | Lukas Reschke | 2014-11-08 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | changed default dropdown content | Sebastian Bolt | 2014-11-07 | 1 | -1/+1 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-08 | 50 | -34/+122 |
| |/ / | |||||
| * | | logging changes | Craig Morrissey | 2014-11-07 | 1 | -0/+3 |
| * | | Merge pull request #11736 from owncloud/enc_get_fileinfo_from_real_file | Björn Schießle | 2014-11-07 | 4 | -10/+14 |
| |\ \ | |/ |/| | |||||
| | * | only set the values we need and make sure that we write the file info for both | Bjoern Schiessle | 2014-11-07 | 1 | -3/+7 |
| | * | don't scan part files | Bjoern Schiessle | 2014-11-07 | 2 | -5/+5 |
| | * | also try to get file info from part file | Bjoern Schiessle | 2014-11-07 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #11575 from owncloud/cache-watcher-propagate | Robin Appelman | 2014-11-07 | 3 | -0/+38 |
| |\ | |||||
| | * | Also propagate etag changes when the watcher finds a changed file | Robin Appelman | 2014-11-07 | 3 | -0/+38 |
| |/ | |||||
| * | Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_... | Lukas Reschke | 2014-11-07 | 5 | -3/+22 |
| |\ | |||||
| | * | throw exception if private key is missing | Bjoern Schiessle | 2014-11-05 | 4 | -1/+21 |
| | * | still try to encrypt files, even if the session is not initialized. The strea... | Bjoern Schiessle | 2014-11-04 | 1 | -2/+1 |
| * | | 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 | 118 | -128/+162 |
| * | | | 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 | 7 | -14/+71 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | Fix sharing tests | Robin Appelman | 2014-11-06 | 3 | -2/+15 |
| | * | | | Support displaynames for dummy user backend | Robin Appelman | 2014-11-06 | 1 | -3/+18 |
| | * | | | Setup shared mounts for the correct user when setting up the filesystem for t... | Robin Appelman | 2014-11-06 | 3 | -6/+33 |
| | * | | | Dont make real users in tests | Robin Appelman | 2014-11-06 | 1 | -3/+5 |
| * | | | | Merge pull request #12000 from owncloud/bower-strengthify | Morris Jobke | 2014-11-06 | 8 | -16/+212 |
| |\ \ \ \ | |||||
| | * | | | | bower strengthify | Morris Jobke | 2014-11-06 | 8 | -16/+212 |
| |/ / / / | |||||
| * | | | | 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 |
| * | | | | Merge pull request #11947 from owncloud/public-hash-api | Thomas Müller | 2014-11-06 | 7 | -0/+341 |
| |\ \ \ \ | |||||
| | * | | | | Add OCP\Security\IHasher | Lukas Reschke | 2014-11-06 | 7 | -0/+341 |
| |/ / / / | |||||
| * | | | | update to 3rdparty master | Morris Jobke | 2014-11-06 | 1 | -0/+0 |
| * | | | | 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 | 4 | -29/+18 |
| |\ \ \ \ | |||||
| | * | | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic cache... | Robin Appelman | 2014-11-05 | 4 | -29/+18 |
| * | | | | | Merge pull request #11993 from owncloud/enc_repeat_password | Lukas Reschke | 2014-11-06 | 1 | -1/+15 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| | * | | | | check if the provided password is really the current log-in password | Bjoern Schiessle | 2014-11-06 | 1 | -1/+15 |
| * | | | | | Merge pull request #11984 from owncloud/bower-md5 | Thomas Müller | 2014-11-06 | 5 | -1/+287 |
| |\ \ \ \ \ | |||||
| | * | | | | | md5 now handled via bower | Morris Jobke | 2014-11-06 | 5 | -1/+287 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #11985 from owncloud/bower-snap | Morris Jobke | 2014-11-06 | 6 | -5/+805 |
| |\ \ \ \ \ | |||||
| | * | | | | | bower snapjs | Morris Jobke | 2014-11-06 | 6 | -5/+805 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #11989 from owncloud/bower-zxcvbn | Thomas Müller | 2014-11-06 | 7 | -3/+72 |
| |\ \ \ \ \ | |||||
| | * | | | | | bower zxcvbn | Morris Jobke | 2014-11-06 | 7 | -3/+72 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #11981 from owncloud/bower-jcrop | Thomas Müller | 2014-11-06 | 8 | -2/+1893 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | bower jcrop | Morris Jobke | 2014-11-06 | 8 | -2/+1893 |
| |/ / / / | |||||
| * | | | | Merge pull request #11980 from owncloud/bower-select2 | Morris Jobke | 2014-11-06 | 63 | -1301/+16 |
| |\ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |