Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | skip user if we don't have a public key | Bjoern Schiessle | 2015-04-30 | 3 | -1/+87 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #16020 from owncloud/set-charset-via-ini-set | Thomas Müller | 2015-05-04 | 1 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Try to set required ini values in base.php | Lukas Reschke | 2015-05-03 | 1 | -0/+7 | |
* | | | | | | Merge pull request #15958 from owncloud/usage-of-public-log-interface | Thomas Müller | 2015-05-04 | 8 | -17/+24 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use internally \OCP\ILogger instead of \OC\Log | Morris Jobke | 2015-04-30 | 8 | -17/+24 | |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-04 | 16 | -2/+154 | |
* | | | | | | | 8.1 alpha 3 | Frank Karlitschek | 2015-05-03 | 1 | -2/+2 | |
| |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #15486 from owncloud/versions-rollbackkeepfileid | Morris Jobke | 2015-05-03 | 2 | -4/+121 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Use moveFromStorage instead of streamCopy when restoring version | Vincent Petry | 2015-04-30 | 1 | -14/+1 | |
| * | | | | | | Fix version rollback to keep fileid | Vincent Petry | 2015-04-30 | 2 | -4/+134 | |
* | | | | | | | Merge pull request #16009 from owncloud/fix-searchresults | Morris Jobke | 2015-05-03 | 1 | -4/+6 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix search results from other places, account for margin-bottom in files list | Jan-Christoph Borchardt | 2015-05-02 | 1 | -4/+6 | |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-03 | 78 | -112/+34 | |
* | | | | | | | | Merge pull request #16001 from owncloud/add-multiselect-new-title | Morris Jobke | 2015-05-02 | 2 | -2/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | force minimum multiselect width to properly show longer groups | Jan-Christoph Borchardt | 2015-05-01 | 1 | -1/+1 | |
| * | | | | | | | | also add title to multiselect create new element, fix #15954 | Jan-Christoph Borchardt | 2015-05-01 | 1 | -1/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #16015 from owncloud/add-proper-versioning | Morris Jobke | 2015-05-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add proper versioning for doc URL | Lukas Reschke | 2015-05-02 | 1 | -1/+1 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #16005 from owncloud/remove-more-apps | Lukas Reschke | 2015-05-02 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | remove 'More apps' link from apps mgmt now that we have support for experimen... | Jan-Christoph Borchardt | 2015-05-01 | 1 | -3/+0 | |
| |/ / / / / / / | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-02 | 28 | -56/+62 | |
* | | | | | | | | Merge pull request #15937 from owncloud/file-locking | Thomas Müller | 2015-05-01 | 14 | -23/+891 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | allow getting the path from the lockedexception | Robin Appelman | 2015-04-30 | 3 | -2/+42 | |
| * | | | | | | | add tests for castrait | Robin Appelman | 2015-04-30 | 1 | -0/+73 | |
| * | | | | | | | use trait for cas polyfill for xcache | Robin Appelman | 2015-04-30 | 1 | -24/+2 | |
| * | | | | | | | add memcache based shared/exclusive locking | Robin Appelman | 2015-04-30 | 5 | -0/+321 | |
| * | | | | | | | add compare and swap to memcache | Robin Appelman | 2015-04-30 | 8 | -2/+144 | |
| * | | | | | | | extends memcache with add, inc and dec | Robin Appelman | 2015-04-30 | 7 | -22/+336 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-01 | 24 | -14/+238 | |
* | | | | | | | Merge pull request #15993 from owncloud/admin-documentation | Morris Jobke | 2015-05-01 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix layout for documentation link hints | Jan-Christoph Borchardt | 2015-04-30 | 1 | -0/+7 | |
| * | | | | | | | add admin documentation links for Sharing, Encryption and Email server | Jan-Christoph Borchardt | 2015-04-30 | 1 | -1/+10 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #15955 from owncloud/move-dummy-encryption | Thomas Müller | 2015-04-30 | 5 | -218/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Moving encryption_dummy to the apps repo - fixes #15950 | Thomas Müller | 2015-04-30 | 5 | -218/+0 | |
* | | | | | | | | Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage | Thomas Müller | 2015-04-30 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Enable code coverage on scrutinizer | Thomas Müller | 2015-04-30 | 1 | -0/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15964 from owncloud/fix-l10n-string-warn | Thomas Müller | 2015-04-30 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix #15962 | Bernhard Posselt | 2015-04-30 | 1 | -2/+0 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #15968 from owncloud/enc-wrapper-presetup | Thomas Müller | 2015-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | use the preSetup hook to ensure the encryption wrapper is applied correctly | Robin Appelman | 2015-04-30 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #15949 from owncloud/l10n-string-json | Thomas Müller | 2015-04-30 | 1 | -1/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | implement json serialize for l10n string | Bernhard Posselt | 2015-04-29 | 1 | -1/+9 | |
* | | | | | | | Merge pull request #15951 from owncloud/fix-install-again | Morris Jobke | 2015-04-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | make command optional | Bernhard Posselt | 2015-04-29 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #15946 from owncloud/auto-controller-resolve | Thomas Müller | 2015-04-30 | 1 | -0/+11 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | add aliases to pascal case constructor paramters to make it possible to auto ... | Bernhard Posselt | 2015-04-29 | 1 | -0/+11 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #15947 from owncloud/add-title-to-multiselect | Morris Jobke | 2015-04-30 | 1 | -5/+6 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | add title to multiselect list items so longer group names are visible, fix #1... | Jan-Christoph Borchardt | 2015-04-29 | 1 | -5/+6 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-30 | 50 | -108/+116 | |
* | | | | | | Merge pull request #15942 from owncloud/revert-15875-multiline-buttons | Joas Schilling | 2015-04-30 | 1 | -4/+1 | |
|\ \ \ \ \ \ |