Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-27 | 68 | -44/+90 |
* | Merge pull request #22669 from owncloud/fix-email-form | Thomas Müller | 2016-02-26 | 1 | -3/+3 |
|\ | |||||
| * | Email endpoint is controlled by the username setting, not password | Joas Schilling | 2016-02-26 | 1 | -1/+1 |
| * | Correctly indent uneditable email/display name fields | Joas Schilling | 2016-02-26 | 1 | -2/+2 |
* | | Merge pull request #22660 from owncloud/fix_22656 | Thomas Müller | 2016-02-26 | 3 | -0/+42 |
|\ \ | |||||
| * | | Do not allow sharing of the root folder | Roeland Jago Douma | 2016-02-25 | 3 | -0/+42 |
* | | | Merge pull request #22671 from owncloud/issue-22670 | Thomas Müller | 2016-02-26 | 2 | -26/+26 |
|\ \ \ | |||||
| * | | | Move the tag filter at the end for now | Joas Schilling | 2016-02-26 | 2 | -26/+26 |
| | |/ | |/| | |||||
* | | | Merge pull request #22646 from owncloud/fix_22642 | Thomas Müller | 2016-02-26 | 2 | -22/+43 |
|\ \ \ | |||||
| * | | | Set default expiration date if none given on share creation | Roeland Jago Douma | 2016-02-25 | 2 | -22/+43 |
* | | | | Merge pull request #22640 from owncloud/fix_22587 | Thomas Müller | 2016-02-26 | 2 | -0/+129 |
|\ \ \ \ | |||||
| * | | | | Remove delete permissions for read-only federated reshares | Roeland Jago Douma | 2016-02-25 | 2 | -0/+129 |
| |/ / / | |||||
* | | | | Merge pull request #22608 from owncloud/collaborative-tags | Thomas Müller | 2016-02-26 | 3 | -4/+5 |
|\ \ \ \ | |||||
| * | | | | Rename system tags app to collaborative tags | Joas Schilling | 2016-02-26 | 3 | -4/+5 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22461 from owncloud/fix_6773 | Thomas Müller | 2016-02-26 | 16 | -77/+166 |
|\ \ \ \ | |||||
| * | | | | Fix favorite icon unit test for icon image | Vincent Petry | 2016-02-25 | 1 | -2/+4 |
| * | | | | Make more action icons themable + style fixes | Vincent Petry | 2016-02-25 | 6 | -24/+25 |
| * | | | | Close class | Roeland Jago Douma | 2016-02-25 | 1 | -1/+1 |
| * | | | | Make file actions use icon CSS classes | Roeland Jago Douma | 2016-02-25 | 10 | -54/+140 |
* | | | | | Merge pull request #22650 from owncloud/fix_hook | Thomas Müller | 2016-02-26 | 2 | -3/+4 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix verifyExpirationDate passwordSet argument | Roeland Jago Douma | 2016-02-25 | 2 | -3/+4 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-26 | 56 | -34/+210 |
| |/ / |/| | | |||||
* | | | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 | Thomas Müller | 2016-02-25 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Fix PHPDoc of OC_App::loadApps() | Thomas Müller | 2016-02-23 | 1 | -1/+1 |
| * | | | Install new shipped apps after upgrading all existing apps | Thomas Müller | 2016-02-23 | 1 | -4/+4 |
| * | | | Before installing new shipped apps we need to load authentication apps - fixe... | Thomas Müller | 2016-02-23 | 1 | -1/+1 |
* | | | | Merge pull request #22653 from owncloud/integration-tests-for-dav-csrf | Thomas Müller | 2016-02-25 | 2 | -2/+127 |
|\ \ \ \ | |||||
| * | | | | Fix typo | Lukas Reschke | 2016-02-25 | 1 | -1/+1 |
| * | | | | Add integration test for CSRF protection on DAV | Lukas Reschke | 2016-02-25 | 2 | -2/+127 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #22654 from owncloud/icon-fixes | Thomas Müller | 2016-02-25 | 3 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | add download icon for image detail view, ref gallery issue 51 | Jan-Christoph Borchardt | 2016-02-25 | 3 | -0/+17 |
* | | | | | Merge pull request #22659 from owncloud/fix-formatting | Thomas Müller | 2016-02-25 | 2 | -54/+62 |
|\ \ \ \ \ | |||||
| * | | | | | Fix formatting of response | Lukas Reschke | 2016-02-25 | 2 | -54/+62 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rules | Thomas Müller | 2016-02-25 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Exclude ocs-provider from rewrite rule | Lukas Reschke | 2016-02-25 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #22644 from owncloud/external-share-manager | Thomas Müller | 2016-02-25 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | inject the correct external share manager into the storage | Robin Appelman | 2016-02-25 | 1 | -3/+4 |
* | | | | | Merge pull request #21854 from owncloud/fix-share-hook-group-add | Thomas Müller | 2016-02-25 | 1 | -0/+17 |
|\ \ \ \ \ | |||||
| * | | | | | Fix addUserToGroup hook of the share code | Morris Jobke | 2016-01-22 | 1 | -0/+17 |
* | | | | | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjob | Thomas Müller | 2016-02-25 | 1 | -0/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Skip users with no trashbin | Victor Dubiniuk | 2016-02-24 | 1 | -0/+6 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22611 from owncloud/add-uid-on-hover | Thomas Müller | 2016-02-25 | 2 | -3/+12 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Tweak tooltip style for recipients | Vincent Petry | 2016-02-25 | 2 | -2/+10 |
| * | | | | | Add the uid on hover for sharing autocomplete | Joas Schilling | 2016-02-24 | 1 | -1/+2 |
* | | | | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storages | Thomas Müller | 2016-02-25 | 4 | -12/+45 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly cast type | Lukas Reschke | 2016-02-24 | 3 | -11/+40 |
| * | | | | | | Add proxy support to external storage | Lukas Reschke | 2016-02-24 | 1 | -1/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22604 from owncloud/fix-google-drive-encryption | Thomas Müller | 2016-02-25 | 1 | -5/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | More error handling | Lukas Reschke | 2016-02-25 | 1 | -2/+6 |
| * | | | | | | Copy into local file | Lukas Reschke | 2016-02-25 | 1 | -3/+5 |
| | |_|_|_|/ | |/| | | | |