summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* [stable9.1] Added integration test (#25675)Thomas Müller2016-08-022-0/+28
| | | | | | * [stable9.1] Added integration test * A shared storage is never a home storage - fixes #25582
* [stable9.1] Load the app before executing it's repair steps (#25650) (#25674)Thomas Müller2016-08-021-0/+1
|
* Add integration test for sharing with group, then user in group (#25672)Sergio Bertolín2016-08-011-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.
* [stable9.1] Adding quota plugin to new dav endpoint (#25615) (#25648)Thomas Müller2016-08-013-1/+41
| | | | | | | * Adding quota plugin to new dav endpoint * Added integrated test failing in old endpoint * Added 0B quota test
* Prevent setting email and triggering events at login time (#25554)Vincent Petry2016-07-261-1/+4
| | | | | | | | | | | | Whenever an LDAP user also has an email address defined in LDAP, the LDAP code will try and update the email address of the locally known user. This happens at login time or every time the user's LDAP attributes are processed. There is code listening to the email setting hook which updates the system address book, which also will trigger FS setup due to avatars and other things. This fix only sets the email address when really necessary.
* [stable9.1] Group shares with same source and target (#25534)Vincent Petry2016-07-2613-128/+1447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Group shares with same source and target Fixes #24575 Note that this is a very limited solution and eventually we want smarter merging! * Add integration tests for merging received shares * Improved share grouping readability + fixed test * Add repair step for unmerged shares (WIP) * Added more tests for sharing's MountProvider * Group incoming shares for resharing in JS * Adjust repair version check for unmerged shares * Fix RepairUnmergedShares to not skip valid repair cases The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share. * Add integration tests for double shares with rename in between * Make share target consistent when grouping group share with user share In some situations, a group share is created before a user share, and the recipient renamed the received share before the latter is created. In this situation, the "file_target" was already modified and the second created share must align to the already renamed share. To achieve this, the MountProvider now groups only by "item_source" value and sorts by share time. This makes it so that the least recent share is selected as super-share and its "file_target" value is then adjusted in all grouped shares. This fixes the issue where this situation would have different "file_target" values resulting in two shared folders appearing instead of one.
* [stable9.1] Simplify testPermissionMovedGroupShare (#25573) (#25607)Thomas Müller2016-07-261-55/+20
| | | | Reduces significantly the testing time but still cover the permission change
* [stable9.1] Redirect to default page after login - fixes #25562 (#25600) ↵Thomas Müller2016-07-261-1/+2
| | | | (#25609)
* [stable9.1] Fixes undefined two-factor-providers (#25605) (#25606)Thomas Müller2016-07-251-9/+11
|
* [stable9.1] Especially with coverage enabled execution times are pretty high ↵Thomas Müller2016-07-251-0/+3
| | | | (#25517) (#25595)
* [stable9.1] Use explode() instead of split() - fixes #25483 (#25488) (#25499)Thomas Müller2016-07-241-1/+1
|
* Add all properties while creating a subscription (#25318) (#25335)Thomas Müller2016-07-212-10/+21
| | | Fixes #24469
* [stable9.1] Test jenkins pipeline (#25401) (#25501)Thomas Müller2016-07-212-1/+71
|
* [stable9.1] Filelist change dir auto-prepend slash (#25377)Vincent Petry2016-07-212-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
* ownCloud Server 9.1.0 finalv9.1.0Daniel Molkentin2016-07-201-2/+2
|
* ownCloud Server 9.1.0 RC4v9.1.0RC4Daniel Molkentin2016-07-181-2/+2
|
* Backport guzzlehttp fix from 5.3.1Vincent Petry2016-07-181-0/+0
|
* ownCloud Server 9.1.0 RC3v9.1.0RC3Daniel Molkentin2016-07-181-2/+2
|
* [stable9.1] Added custom exception as non fatal (#25486) (#25489)Thomas Müller2016-07-161-0/+2
|
* Change load order of auth backends so that we can throw an exception in ↵Vincent Petry2016-07-141-1/+4
| | | | OCA\DAV\Connector\Sabre\Auth - fixes #25362 (#25478)
* ownCloud Server 9.1.0 RC2v9.1.0RC2Daniel Molkentin2016-07-131-2/+2
|
* [stable9.1] Adding certificate revocation list and validate if the app ↵Vincent Petry2016-07-134-11/+108
| | | | | | | | certificate is revoked (#25468) * Adding certificate revocation list and validate if the app certificate is revoked * Check integrity of a signed app in any case on installation
* [stable9.1] Cast share id to string (#25402) (#25432)Thomas Müller2016-07-131-1/+1
|
* [stable9.1] Workaround to check htaccess in case of redirects (#25434)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 #25448 from owncloud/stable9.1-webdav-copypermissionsVincent Petry2016-07-124-6/+218
|\ | | | | [stable9.1] Additional perm check in Webdav
| * Modified integration testsSergio Bertolín2016-07-121-18/+12
| |
| * Additional perm check in WebdavVincent Petry2016-07-124-4/+222
|/
* [stable9.1] Revert invalid commits from master->stable9.1 merge (#25420)Vincent Petry2016-07-08133-274/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Merge pull request #25240 from owncloud/remove-svg" This reverts commit 8b8d2b679a12f703141de9da71340f1f02151f3d, reversing changes made to a35747b6fa8f7704bf7333f16a2b867b76acb187. * Revert "Merge pull request #25253 from owncloud/users-fixotherquotadropdown" This reverts commit a35747b6fa8f7704bf7333f16a2b867b76acb187, reversing changes made to a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059. * Revert "Merge pull request #25314 from owncloud/files_external-backends-config" This reverts commit a573b6863cbb4eb21feb7fe5a17a9b8fc60cf059, reversing changes made to 8147eefaeba3822c9331283e973006ad3aeac1f5. * Revert "Add all properties while creating a subscription (#25318)" This reverts commit aaf4c3073af2511ab895e982cadae8dc6a143e55. * Revert "Merge pull request #25276 from owncloud/delete-own-session-token" This reverts commit e42ce62ce2855c95861eeae669508e5c20f99be4, reversing changes made to aaf4c3073af2511ab895e982cadae8dc6a143e55. * Revert "Merge pull request #25262 from owncloud/fed-sharing-error" This reverts commit 027715f9acba4dc314a7e4c63ac41a58d4e33f22, reversing changes made to e42ce62ce2855c95861eeae669508e5c20f99be4.
* [stable9.1] Set content type when downloading log file to force download in ↵Thomas Müller2016-07-082-0/+4
| | | | some browsers (#25382) (#25397)
* [stable9.1] Use named parameter instead of direct value for system tags ↵Thomas Müller2016-07-071-1/+1
| | | | search param (#25380) (#25395)
* Bypass upgrade page when occ controller is requested (#25366)VicDeo2016-07-060-0/+0
|
* Cap LDAP user cache (#25326)Jörn Friedrich Dreyer2016-07-060-0/+0
|
* Merge pull request #25374 from ↵Vincent Petry2016-07-062-0/+39
|\ | | | | | | | | owncloud/stable9.1-147c672f5866002d45ec68e99e379449792eeaf8 [stable9.1] Ignore invalid paths in the JS file list
| * Ignore invalid paths in the JS file list (#25368)Vincent Petry2016-07-062-0/+39
|/
* Files_Versions don't show when the files are erasedCarlos Damken2016-07-051-3/+3
|
* Merge branch 'stable9.1' of https://github.com/owncloud/coreCarlos Damken2016-07-050-0/+0
|\
| * Merge pull request #25347 from owncloud/fix-ldap-check-user-stable9.1Vincent Petry2016-07-051-0/+4
| |\ | | | | | | [stable9.1] 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
| |/
| * Merge pull request #25315 from owncloud/stable9.1-search-preventinfiniteloopVincent Petry2016-07-011-2/+5
| |\ | | | | | | [stable9.1] Prevent infinite loop in search auto-nextpage
| | * Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
| |/ | | | | | | | | | | | | | | | | | | When loading the next page of search results, make sure that the loop can end if there are no more elements in case the total doesn't match. Also added a check to avoid recomputing the search results whenever the setFilter() is called with the same value. This happens when navigating away to another folder, the search field gets cleared automatically and it calls FileList.setFilter('').
* | 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
| | | |