summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Users page lazy multiselect group dropdownsVincent Petry2016-08-241-23/+29
| | | | | | | | | | Instead of pre-rendering all multiselects with lots of group entries, the current groups are now displayed as simple labels. Behind the labels there is a pencil icon like for other fields. When clicking the pencil icon, the dropdown will be spawned and will open itself. Upon closing of the dropdown, the label comes back with the updated selection and the dropdown is destroyed.
* [stable9.1] In cases where the server dictates the link share expiration the ↵Thomas Müller2016-08-191-1/+4
| | | | date is not updated on consequitive changes and enable/disable actions
* [stable9.1] Add missing array element - fixes #25714 (#25732)Thomas Müller2016-08-101-1/+1
|
* [stable9.1] Load the app before executing it's repair steps (#25650) (#25674)Thomas Müller2016-08-021-0/+1
|
* [stable9.1] Group shares with same source and target (#25534)Vincent Petry2016-07-262-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Redirect to default page after login - fixes #25562 (#25600) ↵Thomas Müller2016-07-261-1/+2
| | | | (#25609)
* [stable9.1] Workaround to check htaccess in case of redirects (#25434)Vincent Petry2016-07-132-2/+14
| | | | | | | | | | | | | | | * 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)
* [stable9.1] Revert invalid commits from master->stable9.1 merge (#25420)Vincent Petry2016-07-08117-35/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* [tx-robot] updated from transifexJenkins for ownCloud2016-07-052-2/+116
|
* Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04116-163/+34
|\ | | | | Remove SVG fallback
| * adjusts tests to removal of svg fallbackHendrik Leppelsack2016-07-011-38/+1
| |
| * remove svg classesHendrik Leppelsack2016-07-019-20/+20
| |
| * remove png references in coreHendrik Leppelsack2016-07-011-11/+4
| |
| * remove png actions, fileicons, etcHendrik Leppelsack2016-07-01105-0/+0
| |
| * remove javascript png fallback for svgHendrik Leppelsack2016-07-011-94/+9
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-07-044-0/+76
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-07-032-6/+12
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-07-024-0/+16
|/
* Merge pull request #25262 from owncloud/fed-sharing-errorVincent Petry2016-07-011-1/+1
|\ | | | | Only save federated share after remote server is notified
| * better detect errors in fed sharing responseRobin Appelman2016-06-241-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-07-014-0/+122
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-302-2/+12
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-298-8/+356
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-282-0/+24
| |
* | Merge pull request #25263 from ↵Christoph Wurst2016-06-271-0/+3
|\ \ | | | | | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user
| * | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| |/ | | | | | | | | | | | | | | When decrypting all files of a single user, the admin usually does not intend encryption to be suddenly disabled for everyone. This fix reenables encryption after decrypting for a single user. Decrypting for all users will still disable encryption globally.
* | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-271-1/+1
|\ \ | | | | | | Add explicit delete permission to link shares
| * | Add explicit delete permission to link sharesVincent Petry2016-06-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
* | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-278-181/+9
|\ \ | | | | | | Remove ie8+9 support
| * | remove ie8+9 supportHendrik Leppelsack2016-06-238-181/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-272-0/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-262-2/+30
| |/ |/|
* | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-2/+4
|\ \ | |/ |/| 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-231-2/+4
| | | | | | | | | | If an error occurs during setup checks, do not let the global ajax error handler reload the page.
* | Init the headers in iedavclient.jsVincent Petry2016-06-221-0/+1
| |
* | occ web executor (#24957)VicDeo2016-06-223-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | * Initial web executor * Fix PHPDoc Fix broken integration test OccControllerTests do not require database access - moch them all! Kill unused sprintf
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-224-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-202-0/+36
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-176-2/+26
|
* Prevent the advanced options toggle in the setup from acting as a linkRobin Appelman2016-06-161-1/+2
|
* fix grouped input fields, make sure they take precedenceJan-Christoph Borchardt2016-06-161-13/+13
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-154-0/+56
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-06-134-0/+4
|
* Allow empty host when installing on oracle via CLI (#25034)Jörn Friedrich Dreyer2016-06-101-1/+6
|
* Merge pull request #25048 from owncloud/email-login-leakVincent Petry2016-06-101-2/+3
|\ | | | | Do not leak the login name
| * Do not leak the login name - fixes #25047Thomas Müller2016-06-091-2/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1018-2/+128
|/
* Fix the FIXME (#25022)Joas Schilling2016-06-091-2/+1
|
* Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-092-3/+3
|\ | | | | Use temporary htaccesstest.txt for data dir security check
| * Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-072-3/+3
| |