summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use cross storage move when renaming the part file during webdav putRobin Appelman2015-05-071-10/+12
* Merge pull request #16035 from owncloud/issue-15975-occ-encryption-enable-war...Thomas Müller2015-05-075-20/+62
|\
| * Display a message when there is a problem with the default moduleJoas Schilling2015-05-045-20/+62
* | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-076-9/+21
|\ \
| * | Display the module settings in the list of the encryption modulesJoas Schilling2015-05-046-9/+21
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-07204-236/+110
* | Merge pull request #16119 from owncloud/fix-16056Thomas Müller2015-05-071-11/+14
|\ \
| * | Check return value of OC_App::getAppPath() and verify info.xml exists.Andreas Fischer2015-05-061-11/+14
* | | Merge pull request #16122 from owncloud/fix-15866Morris Jobke2015-05-061-5/+9
|\ \ \
| * | | fix filter index on selected groups is updated too earlyArthur Schiwon2015-05-061-2/+3
| * | | fix broken group presentation in selected groups listArthur Schiwon2015-05-061-3/+6
* | | | Merge pull request #15628 from owncloud/enc_fix_renameBjörn Schießle2015-05-063-17/+119
|\ \ \ \ | |/ / / |/| | |
| * | | Fix missing types on doc block and deduplicate the method nameJoas Schilling2015-05-062-5/+5
| * | | update 'encrypted'-flag in file cache according to the storage settingsBjoern Schiessle2015-05-062-6/+47
| * | | move/copy from storageBjoern Schiessle2015-05-062-16/+77
* | | | Merge pull request #16099 from labkode/prevent-preview-hooksJoas Schilling2015-05-061-1/+3
|\ \ \ \
| * | | | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-10/+10
| * | | | Do not trigger preview hooks if enable_previews is falseHugo Gonzalez Labrador2015-05-061-7/+9
* | | | | Merge pull request #16116 from owncloud/encryption-l10n-settingsMorris Jobke2015-05-061-9/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | kill new lines in l10n stringsMorris Jobke2015-05-061-6/+2
| * | | | Add l10n support to encryption settingsMorris Jobke2015-05-061-5/+5
| | |/ / | |/| |
* | | | Merge pull request #15880 from owncloud/check_if_encryption_is_enabledBjörn Schießle2015-05-063-75/+111
|\ \ \ \ | |/ / / |/| | |
| * | | unit testsBjoern Schiessle2015-05-062-42/+69
| * | | check if encryption is enbaled before we start moving keysBjoern Schiessle2015-05-062-34/+43
* | | | Merge pull request #16098 from owncloud/remove-phpmailerLukas Reschke2015-05-061-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove phpmailer from 3rdpartyJoas Schilling2015-05-061-0/+0
* | | | Merge pull request #16067 from owncloud/verbosity-in-app-code-checkLukas Reschke2015-05-062-7/+18
|\ \ \ \
| * | | | Add verbosity option to app:check-codeMorris Jobke2015-05-052-7/+18
* | | | | Merge pull request #16070 from owncloud/enc_update_file_cache_on_copyMorris Jobke2015-05-062-11/+45
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | make sure that we keep the correct encrypted-flag and the (unencrypted)size i...Bjoern Schiessle2015-05-052-11/+45
| |/ / /
* | | | Merge pull request #16072 from owncloud/phpdoc-cacheMorris Jobke2015-05-064-30/+139
|\ \ \ \
| * | | | improve phpdoc of cache classesRobin Appelman2015-05-054-30/+139
| |/ / /
* | | | Merge pull request #16017 from owncloud/proper-update-notificationMorris Jobke2015-05-063-4/+36
|\ \ \ \
| * | | | Use OC.Notification for update notificationsMorris Jobke2015-05-033-4/+36
* | | | | Merge pull request #16050 from owncloud/add-workaround-for-populate-raw-post-...Jörn Friedrich Dreyer2015-05-062-24/+3
|\ \ \ \ \
| * | | | | Don't depend on always_populate_raw_post_dataLukas Reschke2015-05-051-19/+0
| * | | | | Don't display errors and log themLukas Reschke2015-05-051-5/+3
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0642-38/+176
* | | | | Merge pull request #16037 from owncloud/enc_dont_disable_encryptionJan-Christoph Borchardt2015-05-054-16/+29
|\ \ \ \ \
| * | | | | Don't highlight disabled labels on hoverMorris Jobke2015-05-051-0/+4
| * | | | | fix label referenceMorris Jobke2015-05-051-1/+1
| * | | | | adjust wording and add button to confirm encryptionBjoern Schiessle2015-05-052-15/+15
| * | | | | don't let the the user disable encryption once it was activatedBjoern Schiessle2015-05-043-1/+10
* | | | | | Merge pull request #16069 from owncloud/fix-15933blizzz2015-05-053-2/+1
|\ \ \ \ \ \
| * | | | | | cleanupArthur Schiwon2015-05-052-2/+0
| * | | | | | not only send them back but also apply defaults to a new configuration. Fixes...Arthur Schiwon2015-05-051-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #16064 from owncloud/fix-empty-mail-addressJan-Christoph Borchardt2015-05-053-5/+81
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add test for setEmailAddressJoas Schilling2015-05-051-0/+70
| * | | | | Allow user to set an empty email addressMorris Jobke2015-05-052-5/+11
* | | | | | Merge pull request #16065 from owncloud/check-binaryops-in-code-checkerMorris Jobke2015-05-056-2/+76
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 07:01:40 +0000