summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20124 from owncloud/postscriptum-20093C. Montero Luque2015-11-102-4/+4
|\ | | | | remove uselessly used parameter, read all user attributes also when l…
| * remove uselessly used parameter, read all user attributes also when looking ↵Arthur Schiwon2015-11-062-4/+4
| | | | | | | | up users in groups
* | Merge pull request #20176 from owncloud/font-styleThomas Müller2015-11-107-12/+28
|\ \ | | | | | | move font back from Light to Regular for body text, fix #18954
| * | move font back from Light to Regular for body text on normal-res screens, ↵Jan-Christoph Borchardt2015-11-107-12/+28
| | | | | | | | | | | | fix #18954
* | | Merge pull request #20434 from owncloud/set-ie-class-for-ie10plusThomas Müller2015-11-102-1/+14
|\ \ \ | | | | | | | | Set "ie" CSS class for IE10, IE11
| * | | Set "ie" CSS class for IE10, IE11Vincent Petry2015-11-102-1/+14
| | | | | | | | | | | | | | | | Fixed border in file action menu
* | | | Merge pull request #20436 from owncloud/checkboxThomas Müller2015-11-101-1/+1
|\ \ \ \ | | | | | | | | | | use new checkbox style for Apps mgmt settings
| * | | | use new checkbox style for Apps mgmt settingsJan-Christoph Borchardt2015-11-101-1/+1
| | | | |
* | | | | Merge pull request #20429 from ↵Thomas Müller2015-11-102-2/+54
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | owncloud/sharing-api-integration-tests-get-share-by-id Added test to get info of a specific share id
| * | | | Added test to get info of a specific share idSergio Bertolin2015-11-102-2/+54
|/ / / / | | | | | | | | | | | | | | | | | | | | Check fields of the share response Added missing fields to check if their values are numbers
* | | | Merge pull request #20195 from owncloud/add-caldavtesterThomas Müller2015-11-105-0/+1077
|\ \ \ \ | | | | | | | | | | Add CalDAVTester to travis
| * | | | Add CalDAVTester to travisThomas Müller2015-11-105-0/+1077
| | | | |
* | | | | Merge pull request #20224 from owncloud/fileinfo-ownerRobin Appelman2015-11-106-17/+104
|\ \ \ \ \ | | | | | | | | | | | | Add getOwner to FileInfo
| * | | | | Add tests for FileInfo ownerRobin Appelman2015-11-102-10/+60
| | | | | |
| * | | | | Add getOwner to FileInfoRobin Appelman2015-11-104-7/+44
| | |/ / / | |/| | |
* | | | | Merge pull request #20431 from owncloud/carddav-enforce-displaynameThomas Müller2015-11-102-1/+8
|\ \ \ \ \ | | | | | | | | | | | | When creating addressbooks, make sure the displayname is set
| * | | | | When creating addressbooks, make sure the displayname is setArthur Schiwon2015-11-102-1/+8
| | | | | |
* | | | | | Merge pull request #20428 from ↵Thomas Müller2015-11-101-0/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | owncloud/add-log-statement-for-trusted-domain-error Add warning log entry when user accesses untrusted domain
| * | | | | 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 exists
| * | | | | 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 user count on undo of user deletion
| * | | | | 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 error
| * | | | 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 property
| * | | | 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 available
| * | | | Use native CSPRNG if availableLukas Reschke2015-11-092-6/+21
| | | | | | | | | | | | | | | | | | | | Unfortunately only PHP 7…
* | | | | Merge pull request #16604 from owncloud/cache-escape-likeRobin Appelman2015-11-107-62/+149
|\ \ \ \ \ | | | | | | | | | | | | escape like parameter in cache operations
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [LDAP Wizard] make all the buttons beautiful
| * | | | | 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 requirements
| * | | | | 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 group
| * | | | | Fix Error message when sharing outside of groupRoeland Jago Douma2015-11-091-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | For #19788
* | | | | Merge pull request #20404 from owncloud/fix_autoloader_testsThomas Müller2015-11-101-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Fix autoloader unit test output
| * | | | | Fix autoloader unit test outputRoeland Jago Douma2015-11-091-1/+0
| |/ / / / | | | | | | | | | | | | | | | Removed leftover print statement
* | | | | Merge pull request #20397 from owncloud/fix-carddav-lookupThomas Müller2015-11-091-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | Register DAVACL plugin to provide current-user-principal
| * | | | Register DAVACL plugin to provide current-user-principalThomas Müller2015-11-091-0/+2
| | | | |
* | | | | Merge pull request #20351 from ↵Thomas Müller2015-11-093-3/+58
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/sharing-api-integration-tests-getting-shares Added tests about getting shares of a file and a test for deleting a …
| * | | | Added tests about getting shares of a file and a test for deleting a user ↵Sergio Bertolin2015-11-063-3/+58
| | | | | | | | | | | | | | | | | | | | from a group which doesn't exist
* | | | | Merge pull request #20236 from maprambo/safari-pinned-tab-iconThomas Müller2015-11-094-0/+5
|\ \ \ \ \ | | | | | | | | | | | | added Safari tabbed pin icon
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 16:58:22 +0000