summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* assume pgsql >=9 if checking the version failsRobin Appelman2015-11-161-6/+3
|
* Merge pull request #20463 from ↵Thomas Müller2015-11-162-12/+256
|\ | | | | | | | | owncloud/sharing-api-integration-tests-adding-cases Sharing api integration tests adding cases
| * Modified test to PUT only 1 parameter with each updateSergio Bertolin2015-11-121-4/+86
| |
| * Added a test including all the fields of the share update and checking outputSergio Bertolin2015-11-112-3/+86
| |
| * Added a test and logic for checking answer of public sharesSergio Bertolin2015-11-112-9/+88
| |
* | Merge pull request #20510 from owncloud/avatar_unittest_fixThomas Müller2015-11-161-59/+40
|\ \ | | | | | | [Avatar] No need to setup FS for avatar tests
| * | [Avatar] No need to setup FS for avatar testsRoeland Jago Douma2015-11-141-59/+40
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-162-0/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1520-14/+38
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-1430-0/+44
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-13284-594/+312
|/ /
* | Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precisionThomas Müller2015-11-122-1/+68
|\ \ | | | | | | enable microseconds in log timestamps
| * | enable microseconds in log timestampsChristian Schnidrig2015-11-122-1/+68
| | |
* | | Merge pull request #20478 from owncloud/jnweiger-patch-1Thomas Müller2015-11-121-1/+1
|\ \ \ | | | | | | | | Update untrustedDomain.php
| * | | Update untrustedDomain.phpJürgen Weigert2015-11-121-1/+1
|/ / /
* | | Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldapThomas Müller2015-11-121-1/+1
|\ \ \ | | | | | | | | changed 1.000 to 1,000
| * | | changed 1.000 to 1,000sylvain2015-11-121-1/+1
| | | | | | | | | | | | The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating
* | | | Merge pull request #20460 from owncloud/file-handling-wordingThomas Müller2015-11-121-4/+2
|\ \ \ \ | | | | | | | | | | fix layout and wording for file handling admin setting
| * | | | fix layout and wording for file handling admin settingJan-Christoph Borchardt2015-11-111-4/+2
| | | | |
* | | | | Merge pull request #17920 from andyboeh/masterThomas Müller2015-11-121-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Add possibility for alternative logins to force redirection of login page
| * | | | Add hook 'pre_displayLoginPage'Andreas Böhler2015-07-281-8/+1
| | | | |
| * | | | Add possibility for alternative logins to force redirection of login pageAndreas Böhler2015-07-281-0/+8
| | | | |
* | | | | Merge pull request #20461 from owncloud/assetpipeline-on-upgradeThomas Müller2015-11-121-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Do not use the asset pipeline when doing updates
| * | | | | Do not use the asset pipeline when doing updatesJoas Schilling2015-11-111-0/+11
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-128-0/+30
| |_|_|/ / |/| | | |
* | | | | Merge pull request #20148 from owncloud/checkbox-accessibilityThomas Müller2015-11-111-5/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | Make new checkbox style accessible for screenreaders
| * | | | make new checkbox style accessible for screenreadersHendrik Leppelsack2015-10-291-5/+6
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-11124-124/+406
| | | | |
* | | | | 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