Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-08 | 46 | -150/+200 |
| | |||||
* | Merge pull request #314 from jernst/master | Lukas Reschke | 2016-07-07 | 3 | -9/+51 |
|\ | | | | | Allow wildcard * to be used in trusted domains | ||||
| * | Extended documentation on trusted_domains to cover ports and wildcards. | Johannes Ernst | 2016-07-07 | 1 | -0/+6 |
| | | |||||
| * | Disallow certain malformed domain names even if they match the trusted ↵ | Johannes Ernst | 2016-07-06 | 2 | -3/+10 |
| | | | | | | | | | | | | domain expression Stricter checking for valid domain names | ||||
| * | Trusted domain wildcard checking made shorter, supporting multiple * | Johannes Ernst | 2016-07-06 | 2 | -33/+34 |
| | | | | | | | | Added test cases | ||||
| * | Duh, no 'next' in PHP. | Johannes Ernst | 2016-07-06 | 1 | -2/+2 |
| | | | | | | | | Use === instead of == for extra paranoia. | ||||
| * | Allow wildcard * to be used in trusted domains, to support setups where no ↵ | Johannes Ernst | 2016-07-05 | 1 | -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-master | Lukas Reschke | 2016-07-07 | 158 | -603/+517 |
|\ \ | | | | | | | Sync master | ||||
| * | | Simplify test code and don't show anything if no date is set | Morris Jobke | 2016-07-07 | 2 | -10/+4 |
| | | | |||||
| * | | add unit tests | Morris Jobke | 2016-07-07 | 1 | -3/+40 |
| | | | |||||
| * | | Update header during update callback | Morris Jobke | 2016-07-07 | 1 | -5/+5 |
| | | | |||||
| * | | Not set expiration date is represented as 0 | Morris Jobke | 2016-07-07 | 1 | -1/+4 |
| | | | |||||
| * | | add "Never" if expiration date is not set | Morris Jobke | 2016-07-07 | 1 | -2/+3 |
| | | | |||||
| * | | Add expiration date to share by link view | Morris Jobke | 2016-07-07 | 2 | -0/+41 |
| | | | |||||
| * | | Change png icons to svg | Juan Pablo Villafáñez | 2016-07-07 | 2 | -2/+2 |
| | | | |||||
| * | | Revert "occ web executor (#24957)" | Morris Jobke | 2016-07-07 | 7 | -324/+6 |
| | | | | | | | | | | | | This reverts commit 854352d9a064a1e469ede207493bce44fd41d96c. | ||||
| * | | Revert "Bypass upgrade page when occ controller is requested" | Morris Jobke | 2016-07-07 | 1 | -15/+3 |
| | | | | | | | | | | | | This reverts commit 89e581acf8d30e11a27f1d23560d54306615ae7e. | ||||
| * | | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 811 | -3207/+9572 |
| |\ \ | |||||
| * | | | Revert "[tx-robot] updated from transifex" | Morris Jobke | 2016-07-07 | 158 | -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 transifex | Jenkins for ownCloud | 2016-07-07 | 48 | -16/+324 |
| | | | | |||||
| * | | | Set content type when downloading log file to force download in some ↵ | Vincent Petry | 2016-07-06 | 2 | -0/+4 |
| | | | | | | | | | | | | | | | | browsers (#25382) | ||||
| * | | | Use named parameter instead of direct value for system tags search param ↵ | Vincent Petry | 2016-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | (#25380) | ||||
| * | | | Merge pull request #25361 from ↵ | Vincent Petry | 2016-07-06 | 1 | -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 group | Vincent Petry | 2016-07-05 | 1 | -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-prependslash | Vincent Petry | 2016-07-06 | 2 | -1/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Filelist change dir auto-prepend slash | ||||
| | * | | | | Filelist change dir auto-prepend slash | Vincent Petry | 2016-07-01 | 2 | -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 Petry | 2016-07-06 | 2 | -0/+39 |
| | | | | | | |||||
| * | | | | | Upgrading the log level From Debug to INFO to be consistent with ↵ | Carlos Damken | 2016-07-06 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | files_trashbin (#25367) | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-06 | 32 | -24/+56 |
| | | | | | | |||||
| * | | | | | Merge pull request #25356 from owncloud/checkupgrade-bypass | Vincent Petry | 2016-07-05 | 1 | -3/+15 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Bypass upgrade page when occ controller is requested | ||||
| | * | | | | | Bypass upgrade page when occ controller is requested | Victor Dubiniuk | 2016-07-05 | 1 | -3/+15 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #25344 from owncloud/fix-ldap-check-user | Vincent Petry | 2016-07-05 | 1 | -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) | felixboehm | 2016-07-04 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | fix swift primary object store test (#25281) | Thomas Müller | 2016-07-05 | 4 | -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 transifex | Jenkins for ownCloud | 2016-07-05 | 18 | -12/+160 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #25240 from owncloud/remove-svg | Morris Jobke | 2016-07-04 | 124 | -185/+56 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove SVG fallback | ||||
| | * | | | | | adjusts tests to removal of svg fallback | Hendrik Leppelsack | 2016-07-01 | 1 | -38/+1 |
| | | | | | | | |||||
| | * | | | | | remove svg classes | Hendrik Leppelsack | 2016-07-01 | 15 | -35/+35 |
| | | | | | | | |||||
| | * | | | | | remove png references in core | Hendrik Leppelsack | 2016-07-01 | 3 | -18/+11 |
| | | | | | | | |||||
| | * | | | | | remove png actions, fileicons, etc | Hendrik Leppelsack | 2016-07-01 | 105 | -0/+0 |
| | | | | | | | |||||
| | * | | | | | remove javascript png fallback for svg | Hendrik Leppelsack | 2016-07-01 | 1 | -94/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #25253 from owncloud/users-fixotherquotadropdown | Vincent Petry | 2016-07-04 | 1 | -3/+15 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix "Other" value handling in quota dropdown in users page | ||||
| | * | | | | | | Prevent negative or non-number values in quota input | Vincent Petry | 2016-06-24 | 1 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | Fix "Other" value handling in quota dropdown in users page | Vincent Petry | 2016-06-23 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents "other" value to be deleted. When appending custom value, put it above the "other" entry. | ||||
| * | | | | | | | Merge pull request #25314 from owncloud/files_external-backends-config | Vincent Petry | 2016-07-04 | 1 | -3/+18 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | show configuration options for authentication backends | ||||
| | * | | | | | | | show configuration options for authentication backends while listing storage | Robin Appelman | 2016-06-30 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22447 | ||||
| | * | | | | | | | hide hidden parameters from list backend/auth parameters | Robin Appelman | 2016-06-30 | 1 | -3/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | Change nickvergessen mailmap entry (#25349) | Joas Schilling | 2016-07-04 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Cap LDAP user cache (#25323) | Jörn Friedrich Dreyer | 2016-07-04 | 1 | -13/+15 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-04 | 38 | -22/+278 |
| | | | | | | | |