summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Backport guzzlehttp fix from 5.3.1Vincent Petry2016-07-181-0/+0
|
* ownCloud Server 9.0.4 RC1v9.0.4RC1Daniel Molkentin2016-07-131-2/+2
|
* [stable9] Adding certificate revocation list and validate if the app ↵Vincent Petry2016-07-134-11/+108
| | | | | | | | certificate is revoked (#25469) * Adding certificate revocation list and validate if the app certificate is revoked * Check integrity of a signed app in any case on installation
* Cast share id to string (#25402) (#25431)Thomas Müller2016-07-131-1/+1
|
* [stable9] Workaround to check htaccess in case of redirects (#25435)Vincent Petry2016-07-133-3/+16
| | | | | | | | | | | | | | | * Workaround to check htaccess in case of redirects In some setups, the web server will redirect any call to "data/" to the main page. This causes the XHR to return the 200 HTTP status code and the body contains the HTML page of the main page / files app. This fix improves the htaccess failure detection by adding a known string inside the test file "htaccesstest.txt". If we are able to find this string, it means that the web server didn't block access to that file. * Fix setup check unit test (#25439)
* Merge pull request #25449 from owncloud/stable9-webdav-copypermissionsVincent Petry2016-07-124-6/+218
|\ | | | | [stable9] Additional perm check in Webdav
| * Modified integration testsSergio Bertolín2016-07-121-18/+12
| |
| * Additional perm check in WebdavVincent Petry2016-07-124-4/+222
|/
* Hide revert button when no permission to revert (#25327)Vincent Petry2016-07-074-2/+78
|
* [stable9] Contacts API: replace raw image data with url (#25219)Georg Ehrke2016-07-0711-39/+391
| | | | | | * [stable9] Contacts API: replace raw image data with url * fix a ImageExportPlugin Test
* Cap LDAP user cache (#25324)Jörn Friedrich Dreyer2016-07-071-13/+15
|
* [stable9] Filelist change dir auto-prepend slash (#25378)Vincent Petry2016-07-072-4/+13
| | | | | | | | | * Filelist change dir auto-prepend slash Prepend a slash to directories in case it was missing since many places assume that it's there. * Fix js unit test in filelist spec
* [stable9] Set content type when downloading log file to force download in ↵Thomas Müller2016-07-072-0/+4
| | | | some browsers (#25382) (#25398)
* fix swift primary object store test (#25281) (#25391)Thomas Müller2016-07-073-2/+56
| | | | | | | | | | | | * 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.
* [stable9] Use named parameter instead of direct value for system tags search ↵Thomas Müller2016-07-071-1/+1
| | | | param (#25380) (#25396)
* Backport 25367 to Stable 9.0 (#25384)Carlos Damken2016-07-061-3/+3
|
* Bypass upgrade page when occ controller is requested (#25363)VicDeo2016-07-061-3/+15
|
* Merge pull request #25375 from ↵Vincent Petry2016-07-062-0/+39
|\ | | | | | | | | owncloud/stable9-147c672f5866002d45ec68e99e379449792eeaf8 [stable9] Ignore invalid paths in the JS file list
| * Ignore invalid paths in the JS file list (#25368)Vincent Petry2016-07-062-0/+39
| |
* | Merge pull request #25343 from owncloud/stable9-revertrepairrevertVincent Petry2016-07-062-0/+112
|\ \ | | | | | | Revert "Remove repair steps for broken updater repair"
| * | Revert "Remove repair steps for broken updater repair"Vincent Petry2016-07-042-0/+112
| | | | | | | | | | | | This reverts commit 58ed5b9328e9e12dd4319c0730202f385ca0dc5d.
* | | Merge pull request #25360 from owncloud/stable9-backportshareownerfixVincent Petry2016-07-062-18/+33
|\ \ \ | |_|/ |/| | [stable9] Change order of share creation validation
| * | 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.
| * | Change order of share creation validationVincent Petry2016-07-051-18/+18
| | | | | | | | | | | | | | | | | | | | | Makes sure that the share owner is set before entering the checks that need it. Partial backport of afa37d3
* | | Merge pull request #25298 from owncloud/schiessle-fix-get-contact-stable9Vincent Petry2016-07-062-1/+5
|\ \ \ | | | | | | | | [stable9] get only vcards which match both the address book id and the vcard uri
| * | | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
| | | |
* | | | Merge pull request #25222 from owncloud/web-executor-stable9Vincent Petry2016-07-057-6/+324
|\ \ \ \ | |_|/ / |/| | | [stable9] occ web executor
| * | | occ web executor (#24957)VicDeo2016-07-017-6/+324
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
* / | check if renamed user is still valid by reapplying the ldap filter (#25338)felixboehm2016-07-041-0/+5
|/ /
* | Fix OC_Helper::rmdirr for nested symlinks (#25255)VicDeo2016-07-011-1/+3
| |
* | [stable9] Fix decrypt message stable9 (#25188)Thomas Müller2016-07-013-24/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix Decrypt message via occ * Comments fixed * Fixed reviews * Originally: commit 2304e4bda027e61ff1302c55c2f70f8e4c8f47d0 Author: Joas Schilling <nickvergessen@owncloud.com> Date: Tue Jun 7 09:13:11 2016 +0200 Allow to decrypt user '0' files only * Fix uid comparison
* | Suppress warnings from DAV migration if there's nothing to do (#25279)Thomas Müller2016-07-014-2/+34
| |
* | Merge pull request #25264 from ↵Vincent Petry2016-07-011-2/+9
|\ \ | | | | | | | | | | | | owncloud/stable9-search-fixsearchfromotherfilelists [stable9] Fix search result link for file results outside default list
| * | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | | | | | | | | | | | | | When clicking on a folder result in the search result list, the result box for "results in another folder" must disappear.
| * | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | | | | | | | | | | | | | | When outside the "All files" list, the search result link must properly redirect to the "All files" list.
* | | Merge pull request #25234 from owncloud/stable9-iedavclient-nullheadersVincent Petry2016-07-011-0/+1
|\ \ \ | |_|/ |/| | [stable9] Init the headers in iedavclient.js
| * | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| | |
* | | ownCloud 9.0.3v9.0.3Daniel Molkentin2016-06-291-2/+2
| |/ |/|
* | Merge pull request #25256 from owncloud/stable9-setupchecks-preventreloadChristoph Wurst2016-06-241-2/+4
|\ \ | | | | | | [stable9] Don't reload page in case of auth errors during setup checks
| * | Don't reload page in case of auth errors during setup checksVincent Petry2016-06-241-2/+4
|/ / | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page.
* | Merge pull request #25248 from owncloud/stable9-unique_targetsVincent Petry2016-06-233-15/+62
|\ \ | | | | | | [stable9] On mount make sure multiple shares with same target map to unique one…
| * | On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-06-233-15/+62
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Scenario: user0 shares a folder 'foo' with user2 user1 shares a folder 'foo' with user2 user2 logs in Before: show only the 'foo' from user1 After: show both. * Added intergration tests
* | Merge pull request #25228 from owncloud/stable9-enc-revertversionsizeVincent Petry2016-06-221-1/+8
|\ \ | |/ |/| [stable9] Rollback version must also adjust cached size
| * Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8
|/
* Merge pull request #25197 from owncloud/fix-npe-in-user-ldap-stable9Vincent Petry2016-06-211-1/+8
|\ | | | | [stable9] Fix null pointer exception in user_ldap
| * Fix null pointer exception in user_ldapJörn Friedrich Dreyer2016-06-211-1/+8
| |
* | Merge pull request #25199 from owncloud/shared-mount-catch-9Vincent Petry2016-06-212-11/+25
|\ \ | | | | | | [9.0] Catch exceptions while creating shared mounts
| * | Catch exceptions while creating shared mountsRobin Appelman2016-06-212-11/+25
| |/
* / dd support to know where the storage test comes from (#25166)Juan Pablo Villafañez2016-06-218-18/+33
|/
* Merge pull request #25165 from owncloud/stable9-capped-user-cacheVincent Petry2016-06-201-2/+4
|\ | | | | [stable9] Capped cache for user config
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-23 08:03:39 +0000