summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #317 from nextcloud/scrutinizer-fixedRoeland Douma2016-07-0819-30/+55
|\ | | | | Scrutinizer fixes
| * Fix test using private propertriesRobin Appelman2016-07-082-2/+2
| |
| * combine if statementsRobin Appelman2016-07-081-13/+10
| |
| * handle errors while getting fileinfoRobin Appelman2016-07-081-1/+1
| |
| * Allow nullRobin Appelman2016-07-081-1/+1
| |
| * Fix type hintingRobin Appelman2016-07-085-6/+7
| |
| * add missing varRobin Appelman2016-07-081-2/+2
| |
| * hint global handlebarsRobin Appelman2016-07-083-2/+8
| |
| * dont overwrite a variable with a different typeRobin Appelman2016-07-081-3/+3
| |
| * Fix undefined propertiesRobin Appelman2016-07-086-2/+23
|/
* [tx-robot] updated from transifexNextcloud bot2016-07-0846-150/+200
|
* Merge pull request #314 from jernst/masterLukas Reschke2016-07-073-9/+51
|\ | | | | Allow wildcard * to be used in trusted domains
| * Extended documentation on trusted_domains to cover ports and wildcards.Johannes Ernst2016-07-071-0/+6
| |
| * Disallow certain malformed domain names even if they match the trusted ↵Johannes Ernst2016-07-062-3/+10
| | | | | | | | | | | | domain expression Stricter checking for valid domain names
| * Trusted domain wildcard checking made shorter, supporting multiple *Johannes Ernst2016-07-062-33/+34
| | | | | | | | Added test cases
| * Duh, no 'next' in PHP.Johannes Ernst2016-07-061-2/+2
| | | | | | | | Use === instead of == for extra paranoia.
| * Allow wildcard * to be used in trusted domains, to support setups where no ↵Johannes Ernst2016-07-051-2/+30
| | | | | | | | reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com)
* | Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-07158-603/+517
|\ \ | | | | | | Sync master
| * | Simplify test code and don't show anything if no date is setMorris Jobke2016-07-072-10/+4
| | |
| * | add unit testsMorris Jobke2016-07-071-3/+40
| | |
| * | Update header during update callbackMorris Jobke2016-07-071-5/+5
| | |
| * | Not set expiration date is represented as 0Morris Jobke2016-07-071-1/+4
| | |
| * | add "Never" if expiration date is not setMorris Jobke2016-07-071-2/+3
| | |
| * | Add expiration date to share by link viewMorris Jobke2016-07-072-0/+41
| | |
| * | Change png icons to svgJuan Pablo Villafáñez2016-07-072-2/+2
| | |
| * | Revert "occ web executor (#24957)"Morris Jobke2016-07-077-324/+6
| | | | | | | | | | | | This reverts commit 854352d9a064a1e469ede207493bce44fd41d96c.
| * | Revert "Bypass upgrade page when occ controller is requested"Morris Jobke2016-07-071-15/+3
| | | | | | | | | | | | This reverts commit 89e581acf8d30e11a27f1d23560d54306615ae7e.
| * | Merge branch 'master' into sync-masterMorris Jobke2016-07-07811-3207/+9572
| |\ \
| * | | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-07158-1050/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4. Revert "[tx-robot] updated from transifex" This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e. Revert "[tx-robot] updated from transifex" This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2. Revert "[tx-robot] updated from transifex" This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6. Revert "[tx-robot] updated from transifex" This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29. Revert "[tx-robot] updated from transifex" This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f.
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0748-16/+324
| | | |
| * | | Set content type when downloading log file to force download in some ↵Vincent Petry2016-07-062-0/+4
| | | | | | | | | | | | | | | | browsers (#25382)
| * | | Use named parameter instead of direct value for system tags search param ↵Vincent Petry2016-07-061-1/+1
| | | | | | | | | | | | | | | | (#25380)
| * | | Merge pull request #25361 from ↵Vincent Petry2016-07-061-0/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/sharing-inttestforusershareaftergroupshare Add integration test for sharing with group, then user in group
| | * | | Add integration test for sharing with group, then user in groupVincent Petry2016-07-051-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Add integration test for the use case where a group share exists and then the same owner creates a direct share to a user in that group.
| * | | | Merge pull request #25325 from owncloud/filelist-prependslashVincent Petry2016-07-062-1/+10
| |\ \ \ \ | | | | | | | | | | | | Filelist change dir auto-prepend slash
| | * | | | Filelist change dir auto-prepend slashVincent Petry2016-07-012-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend a slash to directories in case it was missing since many places assume that it's there.
| * | | | | Ignore invalid paths in the JS file list (#25368)Vincent Petry2016-07-062-0/+39
| | | | | |
| * | | | | Upgrading the log level From Debug to INFO to be consistent with ↵Carlos Damken2016-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | files_trashbin (#25367)
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0632-24/+56
| | | | | |
| * | | | | Merge pull request #25356 from owncloud/checkupgrade-bypassVincent Petry2016-07-051-3/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | Bypass upgrade page when occ controller is requested
| | * | | | | Bypass upgrade page when occ controller is requestedVictor Dubiniuk2016-07-051-3/+15
| | | | | | |
| * | | | | | Merge pull request #25344 from owncloud/fix-ldap-check-userVincent Petry2016-07-051-0/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | check if renamed user is still valid by reapplying the ldap filter
| | * | | | | check if renamed user is still valid by reapplying the ldap filter (#25338)felixboehm2016-07-041-0/+4
| | | | | | |
| * | | | | | fix swift primary object store test (#25281)Thomas Müller2016-07-054-2/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wait for socket to be open * Fix call on null * Allow DB access for MountProviderTest Makes unit tests pass when using object store, since their FS access is actually oc_filecache DB access. It is currently not possible to mock or bypass the logic from "SharedMount::verifyMountPoint()" triggered by this test.
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0518-12/+160
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04124-185/+56
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove SVG fallback
| | * | | | | adjusts tests to removal of svg fallbackHendrik Leppelsack2016-07-011-38/+1
| | | | | | |
| | * | | | | remove svg classesHendrik Leppelsack2016-07-0115-35/+35
| | | | | | |
| | * | | | | remove png references in coreHendrik Leppelsack2016-07-013-18/+11
| | | | | | |
| | * | | | | remove png actions, fileicons, etcHendrik Leppelsack2016-07-01105-0/+0
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 04:17:25 +0000