summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10922 from owncloud/explicit-scan-transactionsLukas Reschke2014-09-092-2/+2
|\ | | | | Use bigger transactions when doing explicit file system scans
| * Use bigger transactions when doing explicit file system scansRobin Appelman2014-09-082-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-0939-40/+115
| |
* | Merge pull request #10739 from owncloud/eventsource-publicLukas Reschke2014-09-082-4/+4
|\ \ | | | | | | Add EventSource to the public API
| * | Better phpdoc and method namingRobin Appelman2014-09-042-2/+2
| | |
| * | Use the public api to get event sourcesRobin Appelman2014-09-032-4/+4
| | |
* | | Merge pull request #10885 from owncloud/swift-hasupdatedLukas Reschke2014-09-082-20/+52
|\ \ \ | | | | | | | | Fix hasUpdated for folders in openstack swift
| * | | Fix hasUpdated for folders in swift backendRobin Appelman2014-09-051-0/+22
| | | |
| * | | Fix configuration of rackspaceRobin Appelman2014-09-052-20/+30
| | | |
* | | | Merge pull request #10755 from owncloud/shorter_sharing_linksLukas Reschke2014-09-081-0/+4
|\ \ \ \ | | | | | | | | | | Shorter sharing links
| * | | | Use a route instead of s.php and convert tokens asapkondou2014-09-041-0/+4
| | | | |
* | | | | Merge pull request #10938 from owncloud/useSecureMimetypeLukas Reschke2014-09-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use secure mimetype for content delivery
| * | | | | Use secure mimetype for content deliveryLukas Reschke2014-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adds some hardening against potential CSP bypassed.
* | | | | | Merge pull request #10890 from owncloud/fix-10888Lukas Reschke2014-09-081-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 Schiwon2014-09-051-1/+1
| | |/ / / | |/| | | | | | | | | | | | | of attribute name. fixes #10888
* | | | | Merge pull request #10891 from owncloud/files-moveoperationcatchexceptionVincent Petry2014-09-081-4/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | Catch exceptions when moving files
| * | | | Catch exceptions when moving filesVincent Petry2014-09-051-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 transifexJenkins for ownCloud2014-09-075-4/+38
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-064-10/+14
| | | |
* | | | Merge pull request #10860 from owncloud/scrolltofixClark Tomlinson2014-09-053-27/+46
|\ \ \ \ | |_|/ / |/| | | Scroll to file on search or add
| * | | Scroll to new file/folder after addingVincent Petry2014-09-042-5/+10
| | | | | | | | | | | | | | | | | | | | When creating a new file from the menu, the list now scrolls to that file.
| * | | Fixed scrollto for search resultsVincent Petry2014-09-042-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-droponreadonlyfolderfixVincent Petry2014-09-053-2/+35
|\ \ \ | | | | | | | | Added permission check for drag and drop
| * | | Added permission check for drag and dropVincent Petry2014-09-043-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 transifexJenkins for ownCloud2014-09-052-0/+2
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-09-043-0/+7
| |
* | Merge pull request #9195 from owncloud/fix-733pdessauw2014-09-033-0/+82
|\ \ | | | | | | Scroll to uploaded file in file list
| * | Highlight every uploaded files and scroll down to the last onepdessauw2014-09-033-0/+82
| |/
* / Hiding add to your own cloud if server2server sharing is not enabledClark Tomlinson2014-09-032-1/+9
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-035-3/+15
|
* Remove unneeded file initialization in encryption, already handled in a hookRobin Appelman2014-09-021-16/+0
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-0210-0/+23
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-0168-153/+198
|
* Merge pull request #10420 from owncloud/external-share-self-signedLukas Reschke2014-08-318-135/+16
|\ | | | | Make external shares work with imported self signed certificates
| * fix testRobin Appelman2014-08-311-1/+3
| |
| * Move certificate management interface from files_external to coreRobin Appelman2014-08-314-63/+0
| |
| * fix indentionRobin Appelman2014-08-311-1/+1
| |
| * Verify names of certificatesRobin Appelman2014-08-311-3/+1
| |
| * Make external shares work with imported self-signed certificatesRobin Appelman2014-08-312-2/+14
| |
| * Move certificate management code to coreRobin Appelman2014-08-314-81/+13
| |
* | Use public api for getting l10nRobin Appelman2014-08-3127-27/+27
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-08-3136-184/+15
|
* Merge pull request #10428 from owncloud/files_external_better_configRobin McCorkell2014-08-303-28/+53
|\ | | | | Improve external storage configuration UI
| * Improve UI of external storage configurationRobin McCorkell2014-08-303-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 transifexJenkins for ownCloud2014-08-3015-2/+36
| |
* | Merge pull request #9214 from owncloud/wizard_email_detectionMorris Jobke2014-08-295-41/+273
|\ \ | |/ |/| LDAP: Wizard email attribute detection
| * adjust static method vars as wellArthur Schiwon2014-08-291-2/+4
| |
| * trigger email detection by Wizard upon any user filter filter change. before ↵Arthur Schiwon2014-08-295-13/+30
| | | | | | | | it happenend only upon user automatic list filter creation, but not on manual editing
| * write log message, if original value was changedArthur Schiwon2014-08-291-0/+8
| |
| * add unit test for mail detectionArthur Schiwon2014-08-292-2/+139
| |