Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20124 from owncloud/postscriptum-20093 | C. Montero Luque | 2015-11-10 | 2 | -4/+4 |
|\ | |||||
| * | remove uselessly used parameter, read all user attributes also when looking u... | Arthur Schiwon | 2015-11-06 | 2 | -4/+4 |
* | | Merge pull request #20176 from owncloud/font-style | Thomas Müller | 2015-11-10 | 7 | -12/+28 |
|\ \ | |||||
| * | | move font back from Light to Regular for body text on normal-res screens, fix... | Jan-Christoph Borchardt | 2015-11-10 | 7 | -12/+28 |
* | | | Merge pull request #20434 from owncloud/set-ie-class-for-ie10plus | Thomas Müller | 2015-11-10 | 2 | -1/+14 |
|\ \ \ | |||||
| * | | | Set "ie" CSS class for IE10, IE11 | Vincent Petry | 2015-11-10 | 2 | -1/+14 |
* | | | | Merge pull request #20436 from owncloud/checkbox | Thomas Müller | 2015-11-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | use new checkbox style for Apps mgmt settings | Jan-Christoph Borchardt | 2015-11-10 | 1 | -1/+1 |
* | | | | | Merge pull request #20429 from owncloud/sharing-api-integration-tests-get-sha... | Thomas Müller | 2015-11-10 | 2 | -2/+54 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Added test to get info of a specific share id | Sergio Bertolin | 2015-11-10 | 2 | -2/+54 |
|/ / / / | |||||
* | | | | Merge pull request #20195 from owncloud/add-caldavtester | Thomas Müller | 2015-11-10 | 5 | -0/+1077 |
|\ \ \ \ | |||||
| * | | | | Add CalDAVTester to travis | Thomas Müller | 2015-11-10 | 5 | -0/+1077 |
* | | | | | Merge pull request #20224 from owncloud/fileinfo-owner | Robin Appelman | 2015-11-10 | 6 | -17/+104 |
|\ \ \ \ \ | |||||
| * | | | | | Add tests for FileInfo owner | Robin Appelman | 2015-11-10 | 2 | -10/+60 |
| * | | | | | Add getOwner to FileInfo | Robin Appelman | 2015-11-10 | 4 | -7/+44 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20431 from owncloud/carddav-enforce-displayname | Thomas Müller | 2015-11-10 | 2 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | When creating addressbooks, make sure the displayname is set | Arthur Schiwon | 2015-11-10 | 2 | -1/+8 |
* | | | | | | Merge pull request #20428 from owncloud/add-log-statement-for-trusted-domain-... | Thomas Müller | 2015-11-10 | 1 | -0/+9 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Add warning log entry when user accesses untrusted domain | Lukas Reschke | 2015-11-10 | 1 | -0/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20422 from owncloud/fix-20421-master | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Ensure the user folder exists | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20424 from owncloud/fix-group-count-undo | Thomas Müller | 2015-11-10 | 1 | -10/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix #18072 | Thomas Müller | 2015-11-10 | 1 | -10/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #20389 from owncloud/storage_not_available | Thomas Müller | 2015-11-10 | 1 | -1/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | use a HintException to have some useful user output in case of an error | Björn Schießle | 2015-11-10 | 1 | -1/+16 |
* | | | | | Merge pull request #20415 from owncloud/fix-addressbook-home-set | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Adding CardDAV plugin to provide addressbook-home-set property | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
* | | | | | Merge pull request #20373 from owncloud/use-random-int-if-it-exists | Thomas Müller | 2015-11-10 | 2 | -6/+21 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Use native CSPRNG if available | Lukas Reschke | 2015-11-09 | 2 | -6/+21 |
* | | | | | Merge pull request #16604 from owncloud/cache-escape-like | Robin Appelman | 2015-11-10 | 7 | -62/+149 |
|\ \ \ \ \ | |||||
| * | | | | | escape like parameter for move queries | Robin Appelman | 2015-11-05 | 1 | -1/+1 |
| * | | | | | Add escapeLikeParameter to IDBConnection | Robin Appelman | 2015-11-05 | 3 | -0/+28 |
| * | | | | | Add test for special character during move | Robin Appelman | 2015-11-05 | 1 | -0/+48 |
| * | | | | | define escape character for like statements on oracle | Robin Appelman | 2015-11-05 | 1 | -0/+1 |
| * | | | | | define escape character for like statements on sqlite | Robin Appelman | 2015-11-05 | 1 | -0/+1 |
| * | | | | | move from OC_DB to IDBConnection | Robin Appelman | 2015-11-05 | 1 | -62/+71 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-10 | 2 | -0/+2 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #20333 from owncloud/fix-18956 | Thomas Müller | 2015-11-10 | 7 | -12/+26 |
|\ \ \ \ \ | |||||
| * | | | | | make all the buttons beautiful | Arthur Schiwon | 2015-11-05 | 7 | -12/+26 |
| |/ / / / | |||||
* | | | | | Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement | Thomas Müller | 2015-11-10 | 2 | -0/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Do not allow two different version requirements | Joas Schilling | 2015-11-09 | 2 | -0/+19 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20403 from owncloud/fix_19788 | Thomas Müller | 2015-11-10 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix Error message when sharing outside of group | Roeland Jago Douma | 2015-11-09 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #20404 from owncloud/fix_autoloader_tests | Thomas Müller | 2015-11-10 | 1 | -1/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Fix autoloader unit test output | Roeland Jago Douma | 2015-11-09 | 1 | -1/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #20397 from owncloud/fix-carddav-lookup | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Register DAVACL plugin to provide current-user-principal | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
* | | | | | Merge pull request #20351 from owncloud/sharing-api-integration-tests-getting... | Thomas Müller | 2015-11-09 | 3 | -3/+58 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Added tests about getting shares of a file and a test for deleting a user fro... | Sergio Bertolin | 2015-11-06 | 3 | -3/+58 |
* | | | | | Merge pull request #20236 from maprambo/safari-pinned-tab-icon | Thomas Müller | 2015-11-09 | 4 | -0/+5 |
|\ \ \ \ \ |