summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #15584 from owncloud/enc_fix_upload_shared_folderThomas Müller2015-05-045-3/+87
|\
| * Simplify the testJoas Schilling2015-04-303-14/+8
| * Allow setting protected propertiesJoas Schilling2015-04-301-0/+4
| * skip user if we don't have a public keyBjoern Schiessle2015-04-303-1/+87
* | Merge pull request #16020 from owncloud/set-charset-via-ini-setThomas Müller2015-05-041-0/+7
|\ \
| * | Try to set required ini values in base.phpLukas Reschke2015-05-031-0/+7
* | | Merge pull request #15958 from owncloud/usage-of-public-log-interfaceThomas Müller2015-05-048-17/+24
|\ \ \
| * | | Use internally \OCP\ILogger instead of \OC\LogMorris Jobke2015-04-308-17/+24
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0416-2/+154
* | | | 8.1 alpha 3Frank Karlitschek2015-05-031-2/+2
| |/ / |/| |
* | | Merge pull request #15486 from owncloud/versions-rollbackkeepfileidMorris Jobke2015-05-032-4/+121
|\ \ \
| * | | Use moveFromStorage instead of streamCopy when restoring versionVincent Petry2015-04-301-14/+1
| * | | Fix version rollback to keep fileidVincent Petry2015-04-302-4/+134
* | | | Merge pull request #16009 from owncloud/fix-searchresultsMorris Jobke2015-05-031-4/+6
|\ \ \ \
| * | | | fix search results from other places, account for margin-bottom in files listJan-Christoph Borchardt2015-05-021-4/+6
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0378-112/+34
* | | | | Merge pull request #16001 from owncloud/add-multiselect-new-titleMorris Jobke2015-05-022-2/+3
|\ \ \ \ \
| * | | | | force minimum multiselect width to properly show longer groupsJan-Christoph Borchardt2015-05-011-1/+1
| * | | | | also add title to multiselect create new element, fix #15954Jan-Christoph Borchardt2015-05-011-1/+2
| |/ / / /
* | | | | Merge pull request #16015 from owncloud/add-proper-versioningMorris Jobke2015-05-021-1/+1
|\ \ \ \ \
| * | | | | Add proper versioning for doc URLLukas Reschke2015-05-021-1/+1
|/ / / / /
* | | | | Merge pull request #16005 from owncloud/remove-more-appsLukas Reschke2015-05-021-3/+0
|\ \ \ \ \
| * | | | | remove 'More apps' link from apps mgmt now that we have support for experimen...Jan-Christoph Borchardt2015-05-011-3/+0
| |/ / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0228-56/+62
* | | | | Merge pull request #15937 from owncloud/file-lockingThomas Müller2015-05-0114-23/+891
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | allow getting the path from the lockedexceptionRobin Appelman2015-04-303-2/+42
| * | | | add tests for castraitRobin Appelman2015-04-301-0/+73
| * | | | use trait for cas polyfill for xcacheRobin Appelman2015-04-301-24/+2
| * | | | add memcache based shared/exclusive lockingRobin Appelman2015-04-305-0/+321
| * | | | add compare and swap to memcacheRobin Appelman2015-04-308-2/+144
| * | | | extends memcache with add, inc and decRobin Appelman2015-04-307-22/+336
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0124-14/+238
* | | | Merge pull request #15993 from owncloud/admin-documentationMorris Jobke2015-05-012-1/+17
|\ \ \ \
| * | | | fix layout for documentation link hintsJan-Christoph Borchardt2015-04-301-0/+7
| * | | | add admin documentation links for Sharing, Encryption and Email serverJan-Christoph Borchardt2015-04-301-1/+10
|/ / / /
* | | | Merge pull request #15955 from owncloud/move-dummy-encryptionThomas Müller2015-04-305-218/+0
|\ \ \ \
| * | | | Moving encryption_dummy to the apps repo - fixes #15950Thomas Müller2015-04-305-218/+0
* | | | | Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverageThomas Müller2015-04-301-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Enable code coverage on scrutinizerThomas Müller2015-04-301-0/+4
| |/ / /
* | | | Merge pull request #15964 from owncloud/fix-l10n-string-warnThomas Müller2015-04-301-2/+0
|\ \ \ \
| * | | | fix #15962Bernhard Posselt2015-04-301-2/+0
| | |/ / | |/| |
* | | | Merge pull request #15968 from owncloud/enc-wrapper-presetupThomas Müller2015-04-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | use the preSetup hook to ensure the encryption wrapper is applied correctlyRobin Appelman2015-04-301-1/+1
|/ / /
* | | Merge pull request #15949 from owncloud/l10n-string-jsonThomas Müller2015-04-301-1/+9
|\ \ \
| * | | implement json serialize for l10n stringBernhard Posselt2015-04-291-1/+9
* | | | Merge pull request #15951 from owncloud/fix-install-againMorris Jobke2015-04-301-1/+1
|\ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 17:06:57 +0000