summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | no link if there is no detailpage property set - fixes #15953Thomas Müller2015-05-041-1/+7
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-05196-474/+420
* | | | | Merge pull request #15544 from rullzer/fix_15263Jan-Christoph Borchardt2015-05-041-0/+9
|\ \ \ \ \
| * | | | | Only show SSL table header if there are certificatesRoeland Jago Douma2015-05-041-0/+9
| | |_|/ / | |/| | |
* | | | | Merge pull request #16048 from owncloud/fix-mb-stringLukas Reschke2015-05-041-7/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Check `mbstring.func_overload` only if the mb module is installed.Lukas Reschke2015-05-041-2/+17
| * | | | Remove PHP 5.4 warning in checkSetupLukas Reschke2015-05-041-9/+0
* | | | | Merge pull request #16026 from owncloud/enc_ux_improvementsBjörn Schießle2015-05-041-3/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | some small ux improvementsBjoern Schiessle2015-05-041-3/+7
| |/ / /
* | | | Merge pull request #16042 from owncloud/fix-output-bufferingThomas Müller2015-05-042-1/+2
|\ \ \ \
| * | | | Remove hard-dependency on disabled output_bufferingLukas Reschke2015-05-042-1/+2
| | |_|/ | |/| |
* | | | Merge pull request #16044 from owncloud/issue-15977-occ-encryption-statusThomas Müller2015-05-042-0/+57
|\ \ \ \
| * | | | Add an occ command to get the status of encryptionJoas Schilling2015-05-042-0/+57
* | | | | Merge pull request #16040 from owncloud/fix-orphaned-shares-jobLukas Reschke2015-05-041-3/+8
|\ \ \ \ \
| * | | | | Fix DeleteOrphanedSharesJobMorris Jobke2015-05-041-3/+8
| | |/ / / | |/| | |
* | | | | Merge pull request #16043 from owncloud/activity-288-log-entry-when-no-favoriteLukas Reschke2015-05-041-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix undefined variable $tagIdJoas Schilling2015-05-041-0/+1
| |/ / /
* | | | Merge pull request #15772 from owncloud/issue-15771-dont-restrict-permissions...Joas Schilling2015-05-044-8/+68
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore "parent" shares when the sharee is the owner of the reshare-sourceJoas Schilling2015-04-291-0/+2
| * | | Correctly select file cache values also when checking group sharesJoas Schilling2015-04-291-7/+7
| * | | Add a test to share a subfolder of a folder shared with the owner by groupJoas Schilling2015-04-291-0/+33
| * | | Added unit test for reshare by share ownerVincent Petry2015-04-291-0/+25
| * | | Do not restrict permissions for the original ownerJoas Schilling2015-04-291-1/+1
* | | | Merge pull request #15652 from oparoz/better-text-previewsLukas Reschke2015-05-042-13/+60
|\ \ \ \
| * | | | Remove overflow+watermarkOlivier Paroz2015-04-232-14/+6
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 16:23:48 +0000