summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-0814-32/+94
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-0742-24/+386
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-066-10/+10
|
* Add owner to the storage stats to enable better notificationsMorris Jobke2015-06-054-2/+22
| | | | | * getstoragestats.php returns now the owner and it's display name * show proper storage stats notifications for shared folders
* Merge pull request #16753 from ↵Thomas Müller2015-06-054-0/+80
|\ | | | | | | | | owncloud/issue-16752-check-for-existing-user-in-expire-tasks Check whether the user exists before trying to set up his file system
| * Add unit tests for non existing usersJoas Schilling2015-06-052-0/+68
| |
| * Check whether the user exists before trying to set up his file systemJoas Schilling2015-06-052-0/+12
| |
* | Merge pull request #16718 from owncloud/files-catchajaxexceptionsThomas Müller2015-06-054-21/+59
|\ \ | | | | | | Catch exceptions in files ajax calls
| * | Catch exceptions in files ajax callsVincent Petry2015-06-034-21/+59
| | |
* | | Merge pull request #16748 from owncloud/fix-ldap-port-detection-regressionMorris Jobke2015-06-051-13/+21
|\ \ \ | | | | | | | | port detection needs to take care of now thrown exceptions when LDAP …
| * | | port detection needs to take care of now thrown exceptions when LDAP server ↵Arthur Schiwon2015-06-041-13/+21
| | | | | | | | | | | | | | | | is not available
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-058-6/+48
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0440-16/+138
| | |
* | | Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversionsMorris Jobke2015-06-032-9/+125
|\ \ \ | |_|/ |/| | Keep versions when deleting as recipient
| * | Keep versions when deleting as recipientVincent Petry2015-06-022-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.
* | | Move the helpful method to the TestCase classJoas Schilling2015-06-038-35/+35
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0348-48/+314
| |
* | Merge pull request #16686 from owncloud/show_cloud_idLukas Reschke2015-06-024-0/+61
|\ \ | |/ |/| show federated cloud id in the personal settings
| * L10n for federated cloud ID and rtrim '/' on IDMorris Jobke2015-06-022-2/+2
| |
| * show federated cloud id in the personal settingsBjoern Schiessle2015-06-024-0/+61
| |
* | Merge pull request #16200 from owncloud/kill-globalfilecacheMorris Jobke2015-06-021-2/+17
|\ \ | | | | | | Drop file caching
| * | only use memcache, if availableArthur Schiwon2015-05-081-2/+17
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-0230-16/+150
| | |
* | | Bump Dropbox library to newest upstream versionLukas Reschke2015-06-0110-187/+4720
| | |
* | | add changeLock to the storage apiRobin Appelman2015-06-011-0/+11
| | |
* | | add locking to the storage apiRobin Appelman2015-06-011-0/+26
| | |
* | | Merge pull request #16629 from owncloud/files-renametoreservednameVincent Petry2015-06-012-24/+16
|\ \ \ | | | | | | | | Check target name on rename with web UI
| * | | Check target name on rename with web UIVincent Petry2015-05-292-24/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | When renaming over the web UI, check early that the target name is valid. This prevents nonsensical error messages when renaming to a name with a trailing backslash.
* | | Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-callsLukas Reschke2015-06-011-0/+10
|\ \ \ | | | | | | | | Fix files_external l10n
| * | | Fix files_external l10nMorris Jobke2015-05-301-0/+10
| | | | | | | | | | | | | | | | | | | | * current l10n..pl script can't extract JS functions that are within a handlebars template - therefore they are duplicated until the script is fixed
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-014-0/+12
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-3140-18/+100
|/ / /
* / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-3022-2/+50
|/ /
* | Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfilesBjörn Schießle2015-05-292-1/+15
|\ \ | | | | | | Abort expiration when file is gone
| * | Abort expiration when file is goneVincent Petry2015-05-292-1/+15
| | | | | | | | | | | | | | | | | | | | | Sometimes a background job for versions expiration was scheduled for a file that has been moved or deleted since. This prevents showing useless warnings in the log and simply bail out.
* | | Merge pull request #16517 from owncloud/remove-logo-wideThomas Müller2015-05-291-4/+14
|\ \ \ | | | | | | | | replace logo-wide on share page as well with better icon + text
| * | | replace logo-wide on share page as well with better icon + textJan-Christoph Borchardt2015-05-221-4/+14
| | | |
* | | | Missing translation in ldap part.wizard-server.phpMartin2015-05-291-3/+3
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-298-2/+12
| | | |
* | | | Merge pull request #16607 from owncloud/ie9-textpreviewfallbackThomas Müller2015-05-281-1/+1
|\ \ \ \ | | | | | | | | | | Fallback to picture preview for IE <= 9
| * | | | Fallback to picture preview for IE <= 9Vincent Petry2015-05-281-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | IE 9 and below do not provide window.btoa and there is currently no way to generate base64 strings without introducting further dependencies. So for now the solution is to fall back to the ugly picture mode for text files whenever IE <= 9 is used.
* | | | Merge pull request #16585 from ↵Thomas Müller2015-05-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | mmattel/Missing_translation_in_External_storage_back_end Make string 'SFTP with secret key login' translateable
| * | | | Make string 'SFTP with secret key login' translatableMartin2015-05-271-1/+1
| | | | |
* | | | | Return 404 in shareinfo.php when outgoing s2s disabledVincent Petry2015-05-281-0/+5
| |/ / / |/| | |
* | | | Merge pull request #16591 from owncloud/enc_improved_error_messageBjörn Schießle2015-05-287-8/+116
|\ \ \ \ | | | | | | | | | | improved error message for various states
| * | | | detect migration statusBjoern Schiessle2015-05-276-7/+115
| | | | |
| * | | | improve error messages displayed to the userBjoern Schiessle2015-05-271-1/+1
| |/ / /
* / / / [tx-robot] updated from transifexJenkins for ownCloud2015-05-2810-58/+90
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-272-2/+2
| | |
* | | Merge pull request #15985 from owncloud/hotfix/fix-encryption-referencesBjörn Schießle2015-05-263-30/+1
|\ \ \ | | | | | | | | [enc2] fix references to legacy encryption app name