| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | force show the loading icon in list for deletion, not only on hover | Jan-Christoph Borchardt | 2014-09-22 | 1 | -0/+9 |
| | | |||||
| * | correct progress-icon to icon-loading-small | Jan-Christoph Borchardt | 2014-09-22 | 4 | -10/+10 |
| | | |||||
| * | correct delete-icon to icon-delete, fix #11128 | Jan-Christoph Borchardt | 2014-09-22 | 5 | -11/+11 |
| | | |||||
| * | Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition | Vincent Petry | 2014-09-22 | 1 | -0/+26 |
| |\ | | | | | Added extra check to avoid deleting key folders | ||||
| | * | Added extra check to avoid deleting key folders | Vincent Petry | 2014-09-19 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null. | ||||
| * | | Merge pull request #11167 from owncloud/env-movetomountreenableproxy | Morris Jobke | 2014-09-22 | 1 | -0/+1 |
| |\ \ | | | | | | | Reenable file proxy when renaming between mount points | ||||
| | * | | Reenable file proxy when renaming between mount points | Vincent Petry | 2014-09-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved. | ||||
| * | | | fix button text l10n | Volkan Gezer | 2014-09-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | files_sharing: add route for ajax/publicpreview | Georg Ehrke | 2014-09-21 | 1 | -0/+2 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-21 | 2 | -2/+12 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-20 | 5 | -12/+25 |
| | | | | |||||
| * | | | fix typo | Volkan Gezer | 2014-09-19 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #10968 from owncloud/admin-groupsselect2 | Lukas Reschke | 2014-09-19 | 59 | -5409/+2 |
| |\ \ | | | | | | | Use select2 for the groups excluded from sharing in admin page | ||||
| | * | | Move select2 from files_external to core | Vincent Petry | 2014-09-09 | 59 | -5409/+2 |
| | | | | |||||
| * | | | Merge pull request #11104 from owncloud/enc_create_backup_on_recovery | Lukas Reschke | 2014-09-19 | 4 | -1/+62 |
| |\ \ \ | | | | | | | | | [encryption] create backup from all keys before recovery | ||||
| | * | | | make sure that we really catch the files folder only | Bjoern Schiessle | 2014-09-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | create backup from all keys before recovery | Bjoern Schiessle | 2014-09-19 | 3 | -0/+61 |
| | | | | | |||||
| * | | | | Merge pull request #11171 from owncloud/fix-route | Lukas Reschke | 2014-09-19 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Match more URL fragments | ||||
| | * | | | | Match more URL fragments | Lukas Reschke | 2014-09-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341 | ||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-19 | 10 | -18/+56 |
| |/ / / / | |||||
| * | | | | Merge pull request #11141 from owncloud/update_encrytionlink | Morris Jobke | 2014-09-18 | 2 | -3/+3 |
| |\ \ \ \ | |_|_|/ |/| | | | update encryption doc link | ||||
| | * | | | update encryption doc link | Volkan Gezer | 2014-09-18 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | I don't know how we missed to update this :/ update ldap doc link | ||||
| * | | | | Merge pull request #9541 from owncloud/force_loading_of_encryption_app | Morris Jobke | 2014-09-18 | 1 | -0/+3 |
| |\ \ \ \ | | | | | | | | | | | force loading of encryption app to show correct error | ||||
| | * | | | | force loading of encryption app | Lukas Reschke | 2014-09-17 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-18 | 5 | -6/+23 |
| | |/ / / |/| | | | |||||
| * | | | | Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix | Lukas Reschke | 2014-09-17 | 2 | -0/+14 |
| |\ \ \ \ | |/ / / |/| | | | Tentative fix for legacy file actions unit test side effect | ||||
| | * | | | Tentative fix for legacy file actions unit test side effect | Vincent Petry | 2014-09-16 | 2 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the JS unit test with legacy file actions fail. This fix runs the legacy file actions tests on a dummy instead of the real one. | ||||
| * | | | | Also check if the file itself is updatable | Robin Appelman | 2014-09-17 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Check if a folder is deletable before we try to recursively delete it | Robin Appelman | 2014-09-17 | 3 | -2/+5 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-17 | 8 | -2/+16 |
| | | | | | |||||
| * | | | | Merge pull request #10745 from owncloud/fix-10708-doctrine | Lukas Reschke | 2014-09-16 | 2 | -9/+35 |
| |\ \ \ \ | | | | | | | | | | | Use Doctrine Platform to generate SQL query for table truncation. | ||||
| | * | | | | adding unit test to truncate the table | Thomas Müller | 2014-09-16 | 2 | -1/+32 |
| | | | | | | |||||
| | * | | | | Use Doctrine Platform to generate SQL query for table truncation. | Andreas Fischer | 2014-08-29 | 1 | -8/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #10902 from owncloud/fix-ellepsis | Lukas Reschke | 2014-09-16 | 1 | -0/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | Adding link to ellipsis and fixing styling | ||||
| | * | | | | | Adding link to ellipsis and fixing styling | Clark Tomlinson | 2014-09-16 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #11009 from owncloud/tobiasKaminsky-route | Lukas Reschke | 2014-09-16 | 3 | -2/+93 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | REST API for thumbnails | ||||
| | * | | | | | | Route for thumbnail generation | tobiasKaminsky | 2014-09-16 | 3 | -2/+93 |
| | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thumbnail generation Removed Log Added requested changes Added requested changes. - Fix code style - Add exception if file does not exist - Switch route styling Replaces https://github.com/owncloud/core/pull/10805 Fix codestyle Fix codestyle Migrate to appframework Fix typo | ||||
| * | | | | | | Merge pull request #7254 from owncloud/core-sortalgo | Lukas Reschke | 2014-09-16 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed JS sort comparator to be consistent between JS and PHP | ||||
| | * | | | | | | Fixed file list sorting | Vincent Petry | 2014-08-11 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now using a natural sort algorithm that is more consistent between JS and PHP (although not perfect in some corner cases) - added OC.Util.naturalSortComparator that uses the same algo that was used for the user list - changed user list and files list to use OC.Util.naturalSortComparator - removed toLowerCase() and changed the comparator to use String.localeCompare() - added unit tests - added OC_NaturalSort that is used by OCP\Util::naturalSortCompare() | ||||
| * | | | | | | | Merge pull request #10680 from helmutschneider/aws-2.6.15 | Lukas Reschke | 2014-09-16 | 264 | -9790/+5917 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Update AWS sdk to 2.6.15 | ||||
| | * | | | | | | Fix failing AmazonS3::touch on updated aws sdk | Johan Björk | 2014-09-03 | 1 | -1/+2 |
| | | | | | | | | |||||
| | * | | | | | | Update AWS sdk to 2.6.15 | Johan Björk | 2014-09-03 | 263 | -9789/+5915 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #11081 from owncloud/trash_fix_expire | Lukas Reschke | 2014-09-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | also expire file if timestamp = limit, happens if trashbin_retention_obl... | ||||
| | * | | | | | | | also expire file if timestamp = limit, happens if ↵ | Bjoern Schiessle | 2014-09-15 | 1 | -1/+1 |
| | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | trashbin_retention_obligation is set to zero | ||||
| * | | | | | | | Merge pull request #10663 from owncloud/files_trashbin_original_path | Morris Jobke | 2014-09-16 | 5 | -5/+68 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Show original path information in trashbin and for shares | ||||
| | * | | | | | | | Show original path information in trashbin and sharing views | Robin McCorkell | 2014-09-11 | 5 | -5/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Path will only be shown if in subdirectory, not in root. | ||||
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-16 | 6 | -0/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #11060 from owncloud/rmobslang | Lukas Reschke | 2014-09-15 | 6 | -39/+0 |
| |\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | remove obsolete language files | ||||
| | * | | | | | | | remove obsolete language files | Volkan Gezer | 2014-09-13 | 6 | -39/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #11021 from owncloud/do-not-double-decode | Andreas Fischer | 2014-09-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not double decode values * owncloud/do-not-double-decode: Do not double decode values | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |