Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15055 from owncloud/share-activity-grouping | Morris Jobke | 2015-03-24 | 1 | -0/+14 |
|\ | |||||
| * | Group sharing activities by user/group and file respectively | Joas Schilling | 2015-03-20 | 1 | -0/+14 |
* | | Merge pull request #15160 from owncloud/deduplicate-external-manager-tests | Morris Jobke | 2015-03-24 | 2 | -154/+67 |
|\ \ | |||||
| * | | Merge the two tests into one | Joas Schilling | 2015-03-24 | 2 | -154/+67 |
* | | | No longer directly output OC_Image for thumbnails | Roeland Jago Douma | 2015-03-24 | 3 | -15/+53 |
* | | | Merge pull request #15158 from owncloud/fix-failing-master | Robin Appelman | 2015-03-24 | 2 | -5/+14 |
|\| | | |||||
| * | | *cough* | Joas Schilling | 2015-03-24 | 2 | -5/+14 |
* | | | Merge pull request #14998 from rullzer/ocs_api_new_url | Morris Jobke | 2015-03-24 | 2 | -2/+6 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added extra unit test | Roeland Jago Douma | 2015-03-21 | 1 | -0/+5 |
| * | | OCS API should return fancy OC url | Roeland Jago Douma | 2015-03-21 | 1 | -2/+1 |
* | | | correctly align file list summary when the list has the favorite feature | Jan-Christoph Borchardt | 2015-03-24 | 1 | -0/+3 |
* | | | Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share | Morris Jobke | 2015-03-24 | 4 | -26/+209 |
|\ \ \ | |||||
| * | | | Add a unit test for the naming conflict on the mountpoint name | Joas Schilling | 2015-03-17 | 2 | -6/+155 |
| * | | | Use insertIfNotExists() instead of manual logic | Joas Schilling | 2015-03-17 | 1 | -24/+31 |
| * | | | Correctly get the unique mountpoint name when mounting the share | Joas Schilling | 2015-03-17 | 3 | -10/+37 |
* | | | | Merge pull request #15145 from owncloud/fix-15097-master | Vincent Petry | 2015-03-24 | 4 | -23/+87 |
|\ \ \ \ | |||||
| * | | | | when the path doesnt exist show a proper error page | Robin Appelman | 2015-03-24 | 1 | -0/+2 |
| * | | | | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-24 | 4 | -23/+85 |
* | | | | | Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list | Vincent Petry | 2015-03-24 | 1 | -14/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Do not walk over the users directory, but over the list of tagged objects | Joas Schilling | 2015-03-23 | 1 | -14/+11 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Do not duplicate the empty content css | Joas Schilling | 2015-03-24 | 2 | -24/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-24 | 8 | -0/+32 |
* | | | | | Merge pull request #15123 from owncloud/fix_14098 | blizzz | 2015-03-23 | 2 | -1/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | offset needs to be considered in computed limit | Arthur Schiwon | 2015-03-23 | 2 | -1/+15 |
* | | | | | Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox | Lukas Reschke | 2015-03-23 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Show message if upload of folder isn't allowed | Morris Jobke | 2015-02-06 | 1 | -0/+9 |
* | | | | | | Merge pull request #15120 from owncloud/ldap-occ-fix-warnings | Morris Jobke | 2015-03-23 | 4 | -10/+37 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | fix PHP warnings when using occ with some LDAP commands | Arthur Schiwon | 2015-03-23 | 4 | -10/+37 |
* | | | | | | Merge pull request #14383 from jknockaert/newbranch | Clark Tomlinson | 2015-03-23 | 1 | -130/+160 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | again | jknockaert | 2015-02-19 | 1 | -36/+0 |
| * | | | | | try again | jknockaert | 2015-02-19 | 1 | -0/+36 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' | jknockaert | 2015-02-19 | 5 | -4/+21 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | OC8 version | jknockaert | 2015-02-19 | 1 | -196/+170 |
| | | * | | | | | update enc stream | jknockaert | 2014-12-17 | 1 | -136/+161 |
| | * | | | | | | back | jknockaert | 2015-02-19 | 1 | -35/+34 |
| * | | | | | | | new try | jknockaert | 2015-02-19 | 1 | -130/+160 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-23 | 8 | -2/+18 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-22 | 22 | -0/+52 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-21 | 4 | -0/+4 |
* | | | | | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 3 | -4/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix controller test | Joas Schilling | 2015-03-16 | 1 | -0/+1 |
| * | | | | | | | | Move mimetype check from template to controller | Joas Schilling | 2015-03-16 | 2 | -4/+4 |
| * | | | | | | | | Use the PreviewManager where possible | Joas Schilling | 2015-03-16 | 1 | -2/+2 |
* | | | | | | | | | Merge pull request #11884 from owncloud/ext-appframework | Vincent Petry | 2015-03-20 | 30 | -488/+4309 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Introduce async status checking | Robin McCorkell | 2015-03-20 | 3 | -10/+9 |
| * | | | | | | | | | Fix PHPDoc in files_external, add missing tag | Vincent Petry | 2015-03-17 | 8 | -25/+77 |
| * | | | | | | | | | Fix storage priority in JS unit test | Vincent Petry | 2015-03-16 | 1 | -3/+6 |
| * | | | | | | | | | Fix PHPDoc for StoragesController | Vincent Petry | 2015-03-16 | 1 | -6/+9 |
| * | | | | | | | | | Generate storage config ids when missing | Vincent Petry | 2015-03-16 | 8 | -43/+317 |
| * | | | | | | | | | Fix mount config unit tests | Vincent Petry | 2015-03-13 | 2 | -26/+56 |