Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10922 from owncloud/explicit-scan-transactions | Lukas Reschke | 2014-09-09 | 2 | -2/+2 |
|\ | | | | | Use bigger transactions when doing explicit file system scans | ||||
| * | Use bigger transactions when doing explicit file system scans | Robin Appelman | 2014-09-08 | 2 | -2/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-09 | 39 | -40/+115 |
| | | |||||
* | | Merge pull request #10739 from owncloud/eventsource-public | Lukas Reschke | 2014-09-08 | 2 | -4/+4 |
|\ \ | | | | | | | Add EventSource to the public API | ||||
| * | | Better phpdoc and method naming | Robin Appelman | 2014-09-04 | 2 | -2/+2 |
| | | | |||||
| * | | Use the public api to get event sources | Robin Appelman | 2014-09-03 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #10885 from owncloud/swift-hasupdated | Lukas Reschke | 2014-09-08 | 2 | -20/+52 |
|\ \ \ | | | | | | | | | Fix hasUpdated for folders in openstack swift | ||||
| * | | | Fix hasUpdated for folders in swift backend | Robin Appelman | 2014-09-05 | 1 | -0/+22 |
| | | | | |||||
| * | | | Fix configuration of rackspace | Robin Appelman | 2014-09-05 | 2 | -20/+30 |
| | | | | |||||
* | | | | Merge pull request #10755 from owncloud/shorter_sharing_links | Lukas Reschke | 2014-09-08 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Shorter sharing links | ||||
| * | | | | Use a route instead of s.php and convert tokens asap | kondou | 2014-09-04 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge pull request #10938 from owncloud/useSecureMimetype | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Use secure mimetype for content delivery | ||||
| * | | | | | Use secure mimetype for content delivery | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Adds some hardening against potential CSP bypassed. | ||||
* | | | | | | Merge pull request #10890 from owncloud/fix-10888 | Lukas Reschke | 2014-09-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | if only one attribute is requested, the returned array has 0 as key inst... | ||||
| * | | | | | if only one attribute is requested, the returned array has 0 as key instead ↵ | Arthur Schiwon | 2014-09-05 | 1 | -1/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | of attribute name. fixes #10888 | ||||
* | | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexception | Vincent Petry | 2014-09-08 | 1 | -4/+10 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Catch exceptions when moving files | ||||
| * | | | | Catch exceptions when moving files | Vincent Petry | 2014-09-05 | 1 | -4/+10 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | When moving files on storages that don't expose permissions, the storage itself might throw an exception when the permission is denied. This fix ensures that exceptions are caught and forwarded to the client instead of just hanging. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-07 | 5 | -4/+38 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-06 | 4 | -10/+14 |
| | | | | |||||
* | | | | Merge pull request #10860 from owncloud/scrolltofix | Clark Tomlinson | 2014-09-05 | 3 | -27/+46 |
|\ \ \ \ | |_|/ / |/| | | | Scroll to file on search or add | ||||
| * | | | Scroll to new file/folder after adding | Vincent Petry | 2014-09-04 | 2 | -5/+10 |
| | | | | | | | | | | | | | | | | | | | | When creating a new file from the menu, the list now scrolls to that file. | ||||
| * | | | Fixed scrollto for search results | Vincent Petry | 2014-09-04 | 2 | -22/+36 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | Now passing the "scrollto" URL argument to the file list class which will also automatically scroll and highlight the matching element. This code is triggered by the search box when in a different folder and also by the activity app. | ||||
* | | | Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfix | Vincent Petry | 2014-09-05 | 3 | -2/+35 |
|\ \ \ | | | | | | | | | Added permission check for drag and drop | ||||
| * | | | Added permission check for drag and drop | Vincent Petry | 2014-09-04 | 3 | -2/+35 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | When dropping files onto a read-only folder, a notification is now shown instead of attempting to upload. This for both the drag for upload and drag from inside the file list cases. | ||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-05 | 2 | -0/+2 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-04 | 3 | -0/+7 |
| | | |||||
* | | Merge pull request #9195 from owncloud/fix-733 | pdessauw | 2014-09-03 | 3 | -0/+82 |
|\ \ | | | | | | | Scroll to uploaded file in file list | ||||
| * | | Highlight every uploaded files and scroll down to the last one | pdessauw | 2014-09-03 | 3 | -0/+82 |
| |/ | |||||
* / | Hiding add to your own cloud if server2server sharing is not enabled | Clark Tomlinson | 2014-09-03 | 2 | -1/+9 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-03 | 5 | -3/+15 |
| | |||||
* | Remove unneeded file initialization in encryption, already handled in a hook | Robin Appelman | 2014-09-02 | 1 | -16/+0 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-02 | 10 | -0/+23 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-01 | 68 | -153/+198 |
| | |||||
* | Merge pull request #10420 from owncloud/external-share-self-signed | Lukas Reschke | 2014-08-31 | 8 | -135/+16 |
|\ | | | | | Make external shares work with imported self signed certificates | ||||
| * | fix test | Robin Appelman | 2014-08-31 | 1 | -1/+3 |
| | | |||||
| * | Move certificate management interface from files_external to core | Robin Appelman | 2014-08-31 | 4 | -63/+0 |
| | | |||||
| * | fix indention | Robin Appelman | 2014-08-31 | 1 | -1/+1 |
| | | |||||
| * | Verify names of certificates | Robin Appelman | 2014-08-31 | 1 | -3/+1 |
| | | |||||
| * | Make external shares work with imported self-signed certificates | Robin Appelman | 2014-08-31 | 2 | -2/+14 |
| | | |||||
| * | Move certificate management code to core | Robin Appelman | 2014-08-31 | 4 | -81/+13 |
| | | |||||
* | | Use public api for getting l10n | Robin Appelman | 2014-08-31 | 27 | -27/+27 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-31 | 36 | -184/+15 |
| | |||||
* | Merge pull request #10428 from owncloud/files_external_better_config | Robin McCorkell | 2014-08-30 | 3 | -28/+53 |
|\ | | | | | Improve external storage configuration UI | ||||
| * | Improve UI of external storage configuration | Robin McCorkell | 2014-08-30 | 3 | -28/+53 |
| | | | | | | | | | | | | | | | | | | * Highlight fields that need to be filled * Remove (required) and (optional) strings where possible * Focus first configuration field when creating new external storage * Add ability to force external storage re-check * Various jQuery improvements * Prevent wrapping of checkboxes in configuration | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-08-30 | 15 | -2/+36 |
| | | |||||
* | | Merge pull request #9214 from owncloud/wizard_email_detection | Morris Jobke | 2014-08-29 | 5 | -41/+273 |
|\ \ | |/ |/| | LDAP: Wizard email attribute detection | ||||
| * | adjust static method vars as well | Arthur Schiwon | 2014-08-29 | 1 | -2/+4 |
| | | |||||
| * | trigger email detection by Wizard upon any user filter filter change. before ↵ | Arthur Schiwon | 2014-08-29 | 5 | -13/+30 |
| | | | | | | | | it happenend only upon user automatic list filter creation, but not on manual editing | ||||
| * | write log message, if original value was changed | Arthur Schiwon | 2014-08-29 | 1 | -0/+8 |
| | | |||||
| * | add unit test for mail detection | Arthur Schiwon | 2014-08-29 | 2 | -2/+139 |
| | |