Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #19508 from owncloud/setting-to-skip-migration-tests | Thomas Müller | 2015-10-02 | 3 | -2/+26 |
|\ | |||||
| * | setting to skip migration tests by default | Morris Jobke | 2015-10-01 | 3 | -2/+26 |
* | | Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude | Thomas Müller | 2015-10-02 | 4 | -8/+9 |
|\ \ | |||||
| * | | save excluded groups in json format - fixes #10983 | Thomas Müller | 2015-10-01 | 4 | -8/+9 |
| |/ | |||||
* | | Merge pull request #19522 from owncloud/activity-395-less-sidebar-text | Thomas Müller | 2015-10-02 | 6 | -37/+176 |
|\ \ | |||||
| * | | Fix intendation | Joas Schilling | 2015-10-02 | 1 | -34/+34 |
| * | | Use shorter text on the sidebar for files_sharing activities | Joas Schilling | 2015-10-02 | 3 | -5/+69 |
| * | | Use shorter text on the sidebar for files activities | Joas Schilling | 2015-10-02 | 1 | -0/+38 |
| * | | Allow identifying whether the current item is the filtered one | Joas Schilling | 2015-10-02 | 2 | -0/+37 |
* | | | Merge pull request #19386 from owncloud/ocs_shareapi_extenstion | Thomas Müller | 2015-10-02 | 3 | -7/+131 |
|\ \ \ | |||||
| * | | | Do not return unneeded info | Roeland Jago Douma | 2015-10-02 | 1 | -2/+4 |
| * | | | Extend share info | Roeland Jago Douma | 2015-10-02 | 1 | -1/+23 |
| * | | | Made routes remote_shares only again | Roeland Jago Douma | 2015-10-02 | 1 | -8/+8 |
| * | | | Added '../remote_shares' endpoint | Roeland Jago Douma | 2015-10-02 | 3 | -4/+104 |
| * | | | Move OCS endpoint ../remote_share to ../pending_shares | Roeland Jago Douma | 2015-10-02 | 1 | -3/+3 |
* | | | | Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-c... | Jörn Friedrich Dreyer | 2015-10-02 | 2 | -4/+17 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Modify the group user count when changing membership of a user | Joas Schilling | 2015-10-02 | 2 | -4/+17 |
* | | | | Merge pull request #19484 from owncloud/ie8-checkbox-rage | Jörn Friedrich Dreyer | 2015-10-02 | 2 | -6/+34 |
|\ \ \ \ | |||||
| * | | | | [IE8] Fix file list checkboxes | Vincent Petry | 2015-09-30 | 1 | -5/+23 |
| * | | | | [IE8] Make checkbox on login page look less out of place | Vincent Petry | 2015-09-30 | 1 | -1/+11 |
* | | | | | Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness | Jörn Friedrich Dreyer | 2015-10-02 | 2 | -11/+4 |
|\ \ \ \ \ | |||||
| * | | | | | [IE8] Remove non-working ellipsis support | Vincent Petry | 2015-10-01 | 2 | -11/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #19505 from owncloud/returnfloatforquota | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | always return float, update doc | Jörn Friedrich Dreyer | 2015-10-01 | 1 | -2/+2 |
* | | | | | | Merge pull request #19480 from owncloud/fix-l10n | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -14/+5 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix l10n on master | Morris Jobke | 2015-09-30 | 1 | -14/+5 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-02 | 20 | -168/+214 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #19518 from owncloud/checkboxes-file-restore | VicDeo | 2015-10-02 | 2 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | display checkboxes properly after file restore | Hendrik Leppelsack | 2015-10-01 | 2 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #19463 from owncloud/fix_18132 | Thomas Müller | 2015-10-01 | 2 | -2/+47 |
|\ \ \ \ \ | |||||
| * | | | | | versions should always use the keys of the original file, no need to create n... | Bjoern Schiessle | 2015-10-01 | 2 | -2/+47 |
* | | | | | | Merge pull request #17703 from owncloud/preview-better-cache-use | Robin Appelman | 2015-10-01 | 3 | -23/+80 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add tests | Robin Appelman | 2015-10-01 | 2 | -19/+57 |
| * | | | | | stricter check if thumbnail is cached | Robin Appelman | 2015-10-01 | 1 | -7/+4 |
| * | | | | | to much copy paste | Robin Appelman | 2015-10-01 | 1 | -5/+3 |
| * | | | | | use cache data we already have to check if a thumbnail of specific size is ca... | Robin Appelman | 2015-10-01 | 1 | -1/+24 |
| * | | | | | use the fileinfo to check if we have a valid file | Robin Appelman | 2015-10-01 | 1 | -1/+1 |
| * | | | | | allow passing the fileinfo to the preview manager | Robin Appelman | 2015-10-01 | 2 | -3/+4 |
|/ / / / / | |||||
* | | | | | Merge pull request #19132 from owncloud/sharing-removebogusexpirationdate | Vincent Petry | 2015-10-01 | 4 | -1/+205 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Also delete all shares before the test, so the count matches | Joas Schilling | 2015-10-01 | 1 | -6/+18 |
| * | | | | add more precise version to also repair git master instances | Morris Jobke | 2015-10-01 | 2 | -2/+2 |
| * | | | | Repair step to remove bogus expiration dates from non-link shares | Vincent Petry | 2015-10-01 | 3 | -0/+192 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-01 | 16 | -0/+50 |
* | | | | Merge pull request #19421 from owncloud/fix_19382 | Thomas Müller | 2015-09-30 | 3 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | adjust style of disabled button | Morris Jobke | 2015-09-30 | 2 | -1/+11 |
| * | | | | Do noy allow empty urls to be submitted in "add to your owncloud" | Roeland Jago Douma | 2015-09-30 | 2 | -1/+9 |
* | | | | | Merge pull request #19299 from owncloud/fixgetRawPathInfo | Thomas Müller | 2015-09-30 | 2 | -44/+45 |
|\ \ \ \ \ | |||||
| * | | | | | return '' instead of false | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| * | | | | | use assertSame, add failing case | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -43/+44 |
* | | | | | | Merge pull request #19478 from owncloud/cache-found-l10n-per-app | Robin Appelman | 2015-09-30 | 1 | -3/+4 |
|\ \ \ \ \ \ |