summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #20431 from owncloud/carddav-enforce-displaynameThomas Müller2015-11-102-1/+8
|\ \ \ \ \ \ \
| * | | | | | | When creating addressbooks, make sure the displayname is setArthur Schiwon2015-11-102-1/+8
* | | | | | | | Merge pull request #20428 from owncloud/add-log-statement-for-trusted-domain-...Thomas Müller2015-11-101-0/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Add warning log entry when user accesses untrusted domainLukas Reschke2015-11-101-0/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #20422 from owncloud/fix-20421-masterThomas Müller2015-11-101-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Ensure the user folder existsThomas Müller2015-11-101-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #20424 from owncloud/fix-group-count-undoThomas Müller2015-11-101-10/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix #18072Thomas Müller2015-11-101-10/+2
| |/ / / / / /
* | | | | | | Merge pull request #20389 from owncloud/storage_not_availableThomas Müller2015-11-101-1/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | use a HintException to have some useful user output in case of an errorBjörn Schießle2015-11-101-1/+16
* | | | | | | Merge pull request #20415 from owncloud/fix-addressbook-home-setThomas Müller2015-11-101-0/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Adding CardDAV plugin to provide addressbook-home-set propertyThomas Müller2015-11-101-0/+2
* | | | | | | Merge pull request #20373 from owncloud/use-random-int-if-it-existsThomas Müller2015-11-102-6/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use native CSPRNG if availableLukas Reschke2015-11-092-6/+21
* | | | | | | Merge pull request #16604 from owncloud/cache-escape-likeRobin Appelman2015-11-107-62/+149
|\ \ \ \ \ \ \
| * | | | | | | escape like parameter for move queriesRobin Appelman2015-11-051-1/+1
| * | | | | | | Add escapeLikeParameter to IDBConnectionRobin Appelman2015-11-053-0/+28
| * | | | | | | Add test for special character during moveRobin Appelman2015-11-051-0/+48
| * | | | | | | define escape character for like statements on oracleRobin Appelman2015-11-051-0/+1
| * | | | | | | define escape character for like statements on sqliteRobin Appelman2015-11-051-0/+1
| * | | | | | | move from OC_DB to IDBConnectionRobin Appelman2015-11-051-62/+71
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-102-0/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #20333 from owncloud/fix-18956Thomas Müller2015-11-107-12/+26
|\ \ \ \ \ \ \
| * | | | | | | make all the buttons beautifulArthur Schiwon2015-11-057-12/+26
| |/ / / / / /
* | | | | | | Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirementThomas Müller2015-11-102-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Do not allow two different version requirementsJoas Schilling2015-11-092-0/+19
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #20403 from owncloud/fix_19788Thomas Müller2015-11-101-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Fix Error message when sharing outside of groupRoeland Jago Douma2015-11-091-2/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #20404 from owncloud/fix_autoloader_testsThomas Müller2015-11-101-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix autoloader unit test outputRoeland Jago Douma2015-11-091-1/+0
| |/ / / / / /
* | | | | | | Merge pull request #20397 from owncloud/fix-carddav-lookupThomas Müller2015-11-091-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Register DAVACL plugin to provide current-user-principalThomas Müller2015-11-091-0/+2
* | | | | | | Merge pull request #20351 from owncloud/sharing-api-integration-tests-getting...Thomas Müller2015-11-093-3/+58
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Added tests about getting shares of a file and a test for deleting a user fro...Sergio Bertolin2015-11-063-3/+58
* | | | | | | Merge pull request #20236 from maprambo/safari-pinned-tab-iconThomas Müller2015-11-094-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Added Safari tabbed pin iconmaprambo2015-11-044-0/+5
* | | | | | | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapprovalThomas Müller2015-11-091-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-061-0/+1
* | | | | | | | | Merge pull request #20383 from owncloud/fix-setupchecks-messagesThomas Müller2015-11-091-28/+36
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Properly detect setup check messages set in the HTML templateRobin McCorkell2015-11-081-28/+36
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-094-2/+4
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-0820-70/+102
|/ / / / / / / /
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-074-2/+4
* | | | | | | | Merge pull request #20184 from owncloud/add-carddavThomas Müller2015-11-0626-23/+1056
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | adding individual phpunit.xml and bootstrap.phpThomas Müller2015-11-062-0/+38
| * | | | | | | Adding occ command to create an addressbookThomas Müller2015-11-062-0/+60
| * | | | | | | Introducing CardDAV into coreThomas Müller2015-11-0622-23/+958
|/ / / / / / /
* | | | | | | Merge pull request #20365 from owncloud/autoloader-fixThomas Müller2015-11-063-22/+69
|\ \ \ \ \ \ \
| * | | | | | | [autoloader] Make sure to load construct full pathsRoeland Jago Douma2015-11-063-22/+69
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #18039 from owncloud/favicon-up-to-ie10Thomas Müller2015-11-065-3/+3
|\ \ \ \ \ \ \