summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-264-29/+17
|\ | | | | Add wrapper for Guzzle
| * Add wrapper for GuzzleLukas Reschke2015-03-254-29/+17
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-268-4/+32
| |
* | Merge pull request #15170 from owncloud/middleclickbreadcrumbMorris Jobke2015-03-262-4/+4
|\ \ | | | | | | Fix middle click on breadcrumb
| * | Fix breadcrumb click JS unit testVincent Petry2015-03-251-2/+2
| | |
| * | Fix middle click on breadcrumbVincent Petry2015-03-241-2/+2
| | |
* | | Merge pull request #15185 from owncloud/fix-14775-masterVincent Petry2015-03-251-0/+1
|\ \ \ | | | | | | | | tearDown the file system before reinitializing
| * | | tearDown the file system before reinitializing - fixes #14775Thomas Müller2015-03-251-0/+1
| | | |
* | | | Merge pull request #15180 from owncloud/ext-tabbingMorris Jobke2015-03-251-30/+21
|\ \ \ \ | |_|_|/ |/| | | Use individual timers for separate config rows
| * | | Use individual timers for separate config rowsRobin McCorkell2015-03-241-30/+21
| | | |
* | | | Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldeleteVincent Petry2015-03-251-0/+2
|\ \ \ \ | | | | | | | | | | Recreate trashbin folder after full deletion
| * | | | Recreate trashbin folder after full deletionVincent Petry2015-03-241-0/+2
| | |_|/ | |/| |
* | | | Merge pull request #14970 from owncloud/sidebar-enhancementsJan-Christoph Borchardt2015-03-251-2/+8
|\ \ \ \ | |_|_|/ |/| | | sidebar fixes
| * | | double padding to account for Deleted files entry, issue with FirefoxJan-Christoph Borchardt2015-03-241-0/+4
| | | |
| * | | fix position of 'Deleted files' sidebar entry, fix #10815Jan-Christoph Borchardt2015-03-181-2/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-2514-2/+22
| |_|/ |/| |
* | | Merge pull request #15055 from owncloud/share-activity-groupingMorris Jobke2015-03-241-0/+14
|\ \ \ | | | | | | | | Group sharing activities by user/group and file respectively
| * | | Group sharing activities by user/group and file respectivelyJoas Schilling2015-03-201-0/+14
| | | |
* | | | Merge pull request #15160 from owncloud/deduplicate-external-manager-testsMorris Jobke2015-03-242-154/+67
|\ \ \ \ | | | | | | | | | | Deduplicate external manager tests
| * | | | Merge the two tests into oneJoas Schilling2015-03-242-154/+67
| | | | |
* | | | | No longer directly output OC_Image for thumbnailsRoeland Jago Douma2015-03-243-15/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only use public interfaces - Injected IPreview * Added unit tests
* | | | | Merge pull request #15158 from owncloud/fix-failing-masterRobin Appelman2015-03-242-5/+14
|\| | | | | | | | | | | | | | Fix failing master unit tests
| * | | | *cough*Joas Schilling2015-03-242-5/+14
| | | | |
* | | | | Merge pull request #14998 from rullzer/ocs_api_new_urlMorris Jobke2015-03-242-2/+6
|\ \ \ \ \ | |/ / / / |/| | | | OCS API should return fancy OC url
| * | | | Added extra unit testRoeland Jago Douma2015-03-211-0/+5
| | | | |
| * | | | OCS API should return fancy OC urlRoeland Jago Douma2015-03-211-2/+1
| | | | | | | | | | | | | | | | | | | | * Also use the URLGenerator
* | | | | correctly align file list summary when the list has the favorite featureJan-Christoph Borchardt2015-03-241-0/+3
| | | | |
* | | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-shareMorris Jobke2015-03-244-26/+209
|\ \ \ \ \ | |_|_|_|/ |/| | | | "Integrity constraint violation" when sharing the same item twice with the same user
| * | | | Add a unit test for the naming conflict on the mountpoint nameJoas Schilling2015-03-172-6/+155
| | | | |
| * | | | Use insertIfNotExists() instead of manual logicJoas Schilling2015-03-171-24/+31
| | | | |
| * | | | Correctly get the unique mountpoint name when mounting the shareJoas Schilling2015-03-173-10/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the mount name was checked for uniqueness prior to inserting the share. This caused problems, when two shares with the same name where done or folder, mount point, local share with the same name was done, between sending and accepting of the remote share
* | | | | Merge pull request #15145 from owncloud/fix-15097-masterVincent Petry2015-03-244-23/+87
|\ \ \ \ \ | | | | | | | | | | | | Properly catch whether a share is `null`
| * | | | | when the path doesnt exist show a proper error pageRobin Appelman2015-03-241-0/+2
| | | | | |
| * | | | | Properly catch whether a share is `null`Lukas Reschke2015-03-244-23/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097
* | | | | | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-listVincent Petry2015-03-241-14/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not walk over the users directory, but over the list of tagged objects
| * | | | | | Do not walk over the users directory, but over the list of tagged objectsJoas Schilling2015-03-231-14/+11
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Way quicker
* | | | | | Do not duplicate the empty content cssJoas Schilling2015-03-242-24/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-248-0/+32
| | | | | |
* | | | | | Merge pull request #15123 from owncloud/fix_14098blizzz2015-03-232-1/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | offset needs to be considered in computed limit
| * | | | | offset needs to be considered in computed limitArthur Schiwon2015-03-232-1/+15
| | | | | |
* | | | | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefoxLukas Reschke2015-03-231-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Show message if upload of folder isn't allowed
| * | | | | | Show message if upload of folder isn't allowedMorris Jobke2015-02-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * current firefox doesn't throw an exception anymore * it just reads 0 bytes -> folder or empty file * upload of folder or empty file isn't supported in every browser except Chrome * fixes #13940
* | | | | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warningsMorris Jobke2015-03-234-10/+37
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | fix PHP warnings when using occ with some LDAP commands
| * | | | | | fix PHP warnings when using occ with some LDAP commandsArthur Schiwon2015-03-234-10/+37
| | | | | | |
* | | | | | | Merge pull request #14383 from jknockaert/newbranchClark Tomlinson2015-03-231-130/+160
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | make encryption stream wrapper seekable
| * | | | | | againjknockaert2015-02-191-36/+0
| | | | | | |
| * | | | | | try againjknockaert2015-02-191-0/+36
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/master'jknockaert2015-02-195-4/+21
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/stream.php
| | | * | | | | | OC8 versionjknockaert2015-02-191-196/+170
| | | | | | | | |
| | | * | | | | | update enc streamjknockaert2014-12-171-136/+161
| | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 21:07:18 +0000