Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20995 from owncloud/fix-18734 | Thomas Müller | 2015-12-09 | 1 | -1/+5 |
|\ | |||||
| * | ensure multiselect always receives an array when setting its value, fixes #18734 | Arthur Schiwon | 2015-12-07 | 1 | -1/+5 |
* | | Merge pull request #21003 from owncloud/personal-mount-mountid | Thomas Müller | 2015-12-09 | 2 | -4/+54 |
|\ \ | |||||
| * | | Add tests | Robin Appelman | 2015-12-08 | 1 | -0/+50 |
| * | | Dont set the string storage id to the numeric storage id for personal mounts | Robin Appelman | 2015-12-07 | 1 | -4/+4 |
* | | | Merge pull request #21038 from owncloud/share-computesharepermissions-notstore | Thomas Müller | 2015-12-09 | 4 | -22/+41 |
|\ \ \ | |||||
| * | | | Fix more unit tests to pass a mock storage instead of null to FileInfo | Vincent Petry | 2015-12-08 | 1 | -18/+26 |
| * | | | Add reshare permission checks | Vincent Petry | 2015-12-08 | 2 | -1/+9 |
| * | | | Compute share permissions in the view | Vincent Petry | 2015-12-08 | 1 | -3/+6 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-09 | 14 | -2/+128 |
* | | | | Merge pull request #21037 from owncloud/fix-irritating-ldap-log-entry | Thomas Müller | 2015-12-08 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | passing an empty base in this diagnosis call will not result in LDAP errors | Arthur Schiwon | 2015-12-08 | 1 | -1/+1 |
* | | | | | Merge pull request #21018 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-08 | 7 | -16/+66 |
|\ \ \ \ \ | |||||
| * | | | | | More fixes to the docs | Joas Schilling | 2015-12-08 | 3 | -6/+20 |
| * | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 7 | -10/+46 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #20786 from owncloud/systemtags-dav | Thomas Müller | 2015-12-08 | 15 | -0/+1876 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fixed system tags DAV and API and docs | Vincent Petry | 2015-12-04 | 7 | -40/+49 |
| * | | | | Unit test for system tags plugin | Vincent Petry | 2015-12-03 | 10 | -14/+988 |
| * | | | | Fix PHPDoc ... | Thomas Müller | 2015-12-03 | 7 | -16/+20 |
| * | | | | Added dav endpoints for system tags | Vincent Petry | 2015-12-03 | 9 | -0/+889 |
* | | | | | Use proper PHPDoc reference | Lukas Reschke | 2015-12-08 | 1 | -2/+2 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-08 | 8 | -4/+30 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #21006 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2015-12-07 | 2 | -2/+0 |
|\ \ \ \ | |||||
| * | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 2 | -2/+0 |
* | | | | | Merge pull request #18212 from ryno83/treat_LDAP_users_not_available_by_user_... | Thomas Müller | 2015-12-07 | 2 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Remove of useless code | Renaud Fortier | 2015-11-26 | 1 | -5/+1 |
| * | | | | | if define, check the userfilter if the user is still allowed | Renaud Fortier | 2015-08-11 | 2 | -2/+6 |
* | | | | | | Merge pull request #20980 from owncloud/UoM-ResPlat-DevOps-swift-improved-fopen | Thomas Müller | 2015-12-07 | 1 | -1/+10 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Improving fopen behaviour for Swift backend | Tim Dettrick | 2015-12-07 | 1 | -1/+10 |
* | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-12-07 | 10 | -9/+17 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #20569 from owncloud/issue_20427 | Thomas Müller | 2015-12-07 | 6 | -2/+730 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into issue_20427 | Jesus Macias Portela | 2015-12-03 | 740 | -7186/+15695 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Delete js unit test. Another issue has been created to create js test | Jesús Macias | 2015-12-01 | 1 | -205/+0 |
| * | | | | | Fix css selector and bug checking personal mounts status | Jesús Macias | 2015-11-24 | 2 | -5/+5 |
| * | | | | | Add css to manage row status color | Jesús Macias | 2015-11-24 | 3 | -4/+12 |
| * | | | | | Merge branch 'issue_20427' of github.com:owncloud/core into issue_20427 | Jesús Macias | 2015-11-24 | 1 | -0/+205 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added some unit tests for the status manager | Vincent Petry | 2015-11-20 | 1 | -0/+205 |
| * | | | | | | Fix code from PR comments | Jesús Macias | 2015-11-24 | 4 | -236/+208 |
| |/ / / / / | |||||
| * | | | | | Adding logic to show custom icon for current backends, waiting for icon files | Jesús Macias | 2015-11-20 | 1 | -0/+24 |
| * | | | | | Fix code from PR comments | Jesús Macias | 2015-11-18 | 2 | -615/+525 |
| * | | | | | Add method to show custom icon and icon-error for each storage backend | Jesús Macias | 2015-11-18 | 3 | -211/+200 |
| * | | | | | Add icon management capabilities (error icon) | Jesús Macias | 2015-11-13 | 2 | -17/+18 |
| * | | | | | First working approach to show mount status | Jesús Macias | 2015-11-12 | 6 | -50/+874 |
* | | | | | | Merge pull request #20796 from owncloud/cleanup-trashbin-code | Thomas Müller | 2015-12-07 | 1 | -15/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cleanup trashbin expire code | Morris Jobke | 2015-11-30 | 1 | -15/+6 |
* | | | | | | | Merge pull request #20581 from owncloud/public-page-preview-hidpi-scale | Thomas Müller | 2015-12-07 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix hidpi previews on public page | Robin Appelman | 2015-11-18 | 1 | -4/+8 |
* | | | | | | | | Merge pull request #11131 from owncloud/use-phpini-wrapper | Thomas Müller | 2015-12-07 | 2 | -4/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Replacing ini_get instances with inigetwrapper usages | Clark Tomlinson | 2015-11-23 | 2 | -4/+3 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-06 | 4 | -0/+6 |