summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add positive tests for operator in code checkerMorris Jobke2015-05-052-0/+30
| * | | | Check usage of != and == - refs #16054Thomas Müller2015-05-055-2/+46
|/ / / /
* | | | Merge pull request #16045 from owncloud/reduce-autotest-hhvmThomas Müller2015-05-052-219/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Combine autotest-hhvm.sh with autotest.shAndreas Fischer2015-05-042-219/+23
* | | | Merge pull request #16058 from owncloud/fix-app-check-code-parameter-descriptionMorris Jobke2015-05-051-1/+1
|\ \ \ \
| * | | | Fix the "app-id" parameter description of app:check-codeJoas Schilling2015-05-051-1/+1
* | | | | Merge pull request #16052 from owncloud/fix-phpdoc-sharecontrollerJoas Schilling2015-05-051-0/+1
|\ \ \ \ \
| * | | | | Fix PHPDoc for the ext. share controllerLukas Reschke2015-05-041-0/+1
* | | | | | Merge pull request #15938 from owncloud/enc_update_recovery_share_keyBjörn Schießle2015-05-058-44/+92
|\ \ \ \ \ \
| * | | | | | Allow setting protected propertiesJoas Schilling2015-04-301-0/+4
| * | | | | | check recovery setting for the right userBjoern Schiessle2015-04-308-44/+92
* | | | | | | Merge pull request #16031 from owncloud/fix-15953-masterJan-Christoph Borchardt2015-05-051-9/+9
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix l10n stringsThomas Müller2015-05-041-8/+2
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 15:48:11 +0000