Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15881 from owncloud/share-moveversionsproperly | Vincent Petry | 2015-05-11 | 2 | -31/+174 |
|\ | |||||
| * | Fix version rename with files and folders | Vincent Petry | 2015-04-27 | 2 | -31/+174 |
* | | Merge pull request #15815 from owncloud/unshare-etag-propagate | Morris Jobke | 2015-05-11 | 3 | -80/+51 |
|\ \ | |||||
| * | | Update etag of direct parent on unshare | Vincent Petry | 2015-04-28 | 3 | -80/+51 |
* | | | Merge pull request #16213 from cmeh/patch-5 | Morris Jobke | 2015-05-11 | 1 | -2/+1 |
|\ \ \ | |||||
| * | | | Grammar, removal of line break | Christian Hoffmann | 2015-05-09 | 1 | -2/+1 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-11 | 8 | -2/+32 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-10 | 30 | -18/+100 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-09 | 92 | -446/+98 |
* | | | improved admin settings | Bjoern Schiessle | 2015-05-08 | 3 | -63/+90 |
* | | | Merge pull request #16170 from owncloud/fix-15621 | Thomas Müller | 2015-05-08 | 1 | -6/+9 |
|\ \ \ | |||||
| * | | | drop global file cache support, fixes #15621 | Arthur Schiwon | 2015-05-07 | 1 | -6/+9 |
* | | | | Merge pull request #16183 from owncloud/fix-16147 | Thomas Müller | 2015-05-08 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | check optional parameter before using it, fixes #16147 | Arthur Schiwon | 2015-05-07 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pat... | Morris Jobke | 2015-05-08 | 2 | -1/+15 |
|\ \ \ \ | |||||
| * | | | | Add a test for getting the versions of an empty path | Joas Schilling | 2015-05-07 | 1 | -1/+12 |
| * | | | | Do not run method when the path is empty | Joas Schilling | 2015-05-07 | 1 | -0/+3 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-08 | 6 | -4/+18 |
|/ / / | |||||
* | | | Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page | Morris Jobke | 2015-05-07 | 3 | -7/+5 |
|\ \ \ | |||||
| * | | | Display the module settings in the list of the encryption modules | Joas Schilling | 2015-05-04 | 3 | -7/+5 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-07 | 22 | -22/+60 |
* | | | | fix filter index on selected groups is updated too early | Arthur Schiwon | 2015-05-06 | 1 | -2/+3 |
* | | | | fix broken group presentation in selected groups list | Arthur Schiwon | 2015-05-06 | 1 | -3/+6 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-06 | 22 | -10/+116 |
* | | | | cleanup | Arthur Schiwon | 2015-05-05 | 2 | -2/+0 |
* | | | | not only send them back but also apply defaults to a new configuration. Fixes... | Arthur Schiwon | 2015-05-05 | 1 | -0/+1 |
* | | | | Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller | Joas Schilling | 2015-05-05 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | Fix PHPDoc for the ext. share controller | Lukas Reschke | 2015-05-04 | 1 | -0/+1 |
* | | | | | Merge pull request #15938 from owncloud/enc_update_recovery_share_key | Björn Schießle | 2015-05-05 | 8 | -44/+92 |
|\ \ \ \ \ | |||||
| * | | | | | check recovery setting for the right user | Bjoern Schiessle | 2015-04-30 | 8 | -44/+92 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-05-05 | 118 | -388/+390 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #16026 from owncloud/enc_ux_improvements | Björn Schießle | 2015-05-04 | 1 | -3/+7 |
|\ \ \ \ \ | |||||
| * | | | | | some small ux improvements | Bjoern Schiessle | 2015-05-04 | 1 | -3/+7 |
* | | | | | | Merge pull request #16042 from owncloud/fix-output-buffering | Thomas Müller | 2015-05-04 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove hard-dependency on disabled output_buffering | Lukas Reschke | 2015-05-04 | 1 | -0/+2 |
| | |_|/ / / | |/| | | | | |||||
* / | | | | | Fix DeleteOrphanedSharesJob | Morris Jobke | 2015-05-04 | 1 | -3/+8 |
|/ / / / / | |||||
* | | | | | Merge pull request #15652 from oparoz/better-text-previews | Lukas Reschke | 2015-05-04 | 2 | -13/+60 |
|\ \ \ \ \ | |||||
| * | | | | | Remove overflow+watermark | Olivier Paroz | 2015-04-23 | 2 | -14/+6 |
| * | | | | | Use authorization headers for better compatibility | Olivier Paroz | 2015-04-23 | 1 | -22/+25 |
| * | | | | | An idea to suggest that this is just a sample of the full text | Olivier Paroz | 2015-04-23 | 2 | -1/+15 |
| * | | | | | Use webDAV to have access to HTTP byte ranges | Olivier Paroz | 2015-04-23 | 1 | -1/+4 |
| * | | | | | Cache the token value | Olivier Paroz | 2015-04-23 | 1 | -4/+3 |
| * | | | | | Show a text preview instead of a bitmap preview of text | Olivier Paroz | 2015-04-23 | 2 | -6/+42 |
* | | | | | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-values | Thomas Müller | 2015-05-04 | 4 | -93/+299 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | change error codes to 400 | Clark Tomlinson | 2015-04-24 | 2 | -20/+20 |
| * | | | | | fix messages from settings crontroller | Clark Tomlinson | 2015-04-22 | 2 | -14/+15 |
| * | | | | | remove status's and adjust js | Clark Tomlinson | 2015-04-22 | 3 | -67/+88 |
| * | | | | | destupify tests | Clark Tomlinson | 2015-04-22 | 2 | -104/+100 |
| * | | | | | fixing return values and adding tests | Clark Tomlinson | 2015-04-22 | 2 | -32/+220 |
* | | | | | | Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder | Thomas Müller | 2015-05-04 | 4 | -3/+83 |
|\ \ \ \ \ \ |