Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added Safari tabbed pin icon | maprambo | 2015-11-04 | 4 | -0/+5 | |
* | | | | | | | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval | Thomas Müller | 2015-11-09 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Force approval in GDrive oauth to get refresh_token | Vincent Petry | 2015-11-06 | 1 | -0/+1 | |
* | | | | | | | | | Merge pull request #20383 from owncloud/fix-setupchecks-messages | Thomas Müller | 2015-11-09 | 1 | -28/+36 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Properly detect setup check messages set in the HTML template | Robin McCorkell | 2015-11-08 | 1 | -28/+36 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-09 | 4 | -2/+4 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-08 | 20 | -70/+102 | |
|/ / / / / / / / | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-07 | 4 | -2/+4 | |
* | | | | | | | | Merge pull request #20184 from owncloud/add-carddav | Thomas Müller | 2015-11-06 | 26 | -23/+1056 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | adding individual phpunit.xml and bootstrap.php | Thomas Müller | 2015-11-06 | 2 | -0/+38 | |
| * | | | | | | | Adding occ command to create an addressbook | Thomas Müller | 2015-11-06 | 2 | -0/+60 | |
| * | | | | | | | Introducing CardDAV into core | Thomas Müller | 2015-11-06 | 22 | -23/+958 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #20365 from owncloud/autoloader-fix | Thomas Müller | 2015-11-06 | 3 | -22/+69 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | [autoloader] Make sure to load construct full paths | Roeland Jago Douma | 2015-11-06 | 3 | -22/+69 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #18039 from owncloud/favicon-up-to-ie10 | Thomas Müller | 2015-11-06 | 5 | -3/+3 | |
|\ \ \ \ \ \ \ |