Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | manage select2 via bower | Morris Jobke | 2014-11-06 | 63 | -1301/+16 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11982 from owncloud/bower-underscore | Vincent Petry | 2014-11-06 | 7 | -8/+35 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | bower underscore | Morris Jobke | 2014-11-05 | 7 | -8/+35 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-06 | 100 | -308/+182 | |
* | | | | | | | | Merge pull request #11983 from owncloud/drop-chosen | Morris Jobke | 2014-11-06 | 2 | -2/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | drop unused library chosen | Morris Jobke | 2014-11-05 | 2 | -2/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11970 from owncloud/bower-handlebars | Thomas Müller | 2014-11-05 | 4 | -1/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | bower handlebars | Morris Jobke | 2014-11-05 | 4 | -1/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 14 | -184/+192 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | ignore core/vendor in scrutinizer | Morris Jobke | 2014-11-05 | 1 | -4/+1 | |
| * | | | | | | | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 13 | -164/+175 | |
| * | | | | | | | fix whitespace | Morris Jobke | 2014-11-04 | 1 | -16/+16 | |
* | | | | | | | | Merge pull request #11968 from owncloud/drop-jquery-placeholder | Lukas Reschke | 2014-11-05 | 3 | -218/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | drop unused jquery.placeholder | Morris Jobke | 2014-11-05 | 3 | -218/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #11355 from owncloud/unbold | Thomas Müller | 2014-11-05 | 3 | -7/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | explicitly unbold text by default, otherwise might be bold | Jan-Christoph Borchardt | 2014-11-05 | 1 | -0/+2 | |
| * | | | | | | | | unbold labels and folders | Jan-Christoph Borchardt | 2014-11-05 | 2 | -7/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #11965 from owncloud/fix-jsonresponse | Thomas Müller | 2014-11-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | fix typo in content type | Bernhard Posselt | 2014-11-05 | 2 | -2/+2 | |
* | | | | | | | | | Merge pull request #11928 from owncloud/support-HTML-in-logo | Thomas Müller | 2014-11-05 | 3 | -1/+21 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Support HTML in logo claim | Lukas Reschke | 2014-11-03 | 3 | -1/+21 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #11962 from owncloud/fix-server-sharing-strings | Thomas Müller | 2014-11-05 | 1 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | adjust strings - fixed #11930 | Thomas Müller | 2014-11-05 | 1 | -3/+11 | |
| | |/ / / / / / | |/| | | | | | |