Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12452 from owncloud/server2server-ng-ocs | Morris Jobke | 2014-12-08 | 14 | -55/+612 |
|\ | |||||
| * | OCS API for server-to-server sharing | Bjoern Schiessle | 2014-12-04 | 14 | -55/+612 |
* | | Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skills | Morris Jobke | 2014-12-08 | 1 | -1/+1 |
|\ \ | |||||
| * | | Remove unexisting `htAccessWorkinght` | Lukas Reschke | 2014-12-08 | 1 | -1/+1 |
* | | | Merge pull request #12394 from owncloud/files-fileactionsimprovements | Lukas Reschke | 2014-12-08 | 3 | -128/+314 |
|\ \ \ | |/ / |/| | | |||||
| * | | Improve FileActions JS to allow for custom rendering | Vincent Petry | 2014-11-24 | 3 | -128/+314 |
* | | | Merge pull request #12657 from owncloud/ajaxify-htaccess-check | Morris Jobke | 2014-12-08 | 4 | -20/+10 |
|\ \ \ | |||||
| * | | | Check for working .htaccess via AJAX | Lukas Reschke | 2014-12-06 | 4 | -20/+10 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-08 | 80 | -68/+18 |
* | | | | Remove changes which were inadvertently pushed to master | Olivier Paroz | 2014-12-08 | 1 | -78/+0 |
* | | | | Dump Arrays, Objects and Exceptions to the log | Olivier Paroz | 2014-12-08 | 1 | -0/+78 |
* | | | | Merge pull request #12644 from owncloud/add-hack-for-config | Lukas Reschke | 2014-12-07 | 1 | -1/+9 |
|\ \ \ \ | |||||
| * | | | | Create config if it does not exists | Lukas Reschke | 2014-12-06 | 1 | -1/+9 |
| |/ / / | |||||
* | | | | Merge pull request #12668 from owncloud/keepspace | Thomas Müller | 2014-12-07 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Keep spaces out of the string | Volkan Gezer | 2014-12-07 | 1 | -1/+1 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-07 | 32 | -4/+40 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 94 | -252/+62 |
* | | | Merge pull request #12636 from owncloud/fix-ie9-placeholder | Raghu Nayyar | 2014-12-06 | 1 | -1/+8 |
|\ \ \ | |||||
| * | | | fix placeholder fake in IE8 & 9 that brokes group listing in user management ... | Morris Jobke | 2014-12-05 | 1 | -1/+8 |
* | | | | Merge pull request #12646 from owncloud/remove-safe-magic-quotes | Robin Appelman | 2014-12-05 | 3 | -25/+1 |
|\ \ \ \ | |||||
| * | | | | Remove checks for safe mode and magic quotes | Lukas Reschke | 2014-12-05 | 3 | -25/+1 |
* | | | | | Merge pull request #12166 from helmutschneider/aws-2.7.5 | Lukas Reschke | 2014-12-05 | 51 | -254/+710 |
|\ \ \ \ \ | |||||
| * | | | | | Upgrade AWS sdk to 2.7.5 | Johan Björk | 2014-11-13 | 51 | -254/+710 |
* | | | | | | Merge pull request #11485 from brumsoel/master | Lukas Reschke | 2014-12-05 | 2 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Modified filesort test cases to test for large sizes & timestamps | brumsel | 2014-12-03 | 1 | -2/+2 |
| * | | | | | | Merge remote-tracking branch 'upstream/master' | brumsel | 2014-12-03 | 3887 | -91956/+151926 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix timestamp comparator return value | brumsoel | 2014-10-08 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #12477 from rjaeckel/master | Lukas Reschke | 2014-12-05 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | blocked 3rdparty instead of l10n | Robert Jäckel | 2014-11-27 | 1 | -1/+1 |
| * | | | | | | | | restrict access to public files only | Robert Jäckel | 2014-11-27 | 1 | -0/+2 |
* | | | | | | | | | Merge pull request #12523 from owncloud/port-11747 | Vincent Petry | 2014-12-05 | 1 | -3/+28 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Only store user credentials when SMB_OC storage is enabled | Lukas Reschke | 2014-12-01 | 1 | -3/+28 |
* | | | | | | | | | Merge pull request #12561 from oparoz/vectoricon | Morris Jobke | 2014-12-05 | 5 | -43/+28 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | PNG and SVG have been compressed | Olivier Paroz | 2014-12-05 | 2 | -167/+37 |
| * | | | | | | | | | Improve the bitmap and vector mime icons | Olivier Paroz | 2014-12-02 | 5 | -56/+171 |
* | | | | | | | | | | Merge pull request #12583 from owncloud/trim-port | Morris Jobke | 2014-12-05 | 3 | -10/+42 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add test for IPv6 without port | Lukas Reschke | 2014-12-04 | 1 | -1/+2 |
| * | | | | | | | | | | Add workaround for older instances | Lukas Reschke | 2014-12-03 | 1 | -3/+8 |
| * | | | | | | | | | | Trim port from domain | Lukas Reschke | 2014-12-03 | 3 | -8/+34 |
* | | | | | | | | | | | Merge pull request #12622 from owncloud/disable-for-all | Joas Schilling | 2014-12-05 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Disable when no sendmail is available | Lukas Reschke | 2014-12-04 | 1 | -3/+6 |
* | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 232 | -310/+124 |
* | | | | | | | | | | | | cache total user count | Arthur Schiwon | 2014-12-04 | 1 | -0/+5 |
* | | | | | | | | | | | | Forward port of #12493 | Arthur Schiwon | 2014-12-04 | 4 | -2/+153 |
* | | | | | | | | | | | | Merge pull request #12619 from owncloud/use-also-original-hea | Morris Jobke | 2014-12-04 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix unit test | Lukas Reschke | 2014-12-04 | 1 | -1/+2 |
| * | | | | | | | | | | | | Merge headers | Lukas Reschke | 2014-12-04 | 1 | -1/+1 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #12616 from owncloud/node-fileinfo | Morris Jobke | 2014-12-04 | 7 | -74/+133 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | make \OC\Files\Node\Node implement the FileInfo interface | Robin Appelman | 2014-12-04 | 7 | -74/+133 |
* | | | | | | | | | | | | | Merge pull request #12607 from owncloud/this-is-an-awesome-day | Clark Tomlinson | 2014-12-04 | 3 | -27/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |