Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-09 | 170 | -262/+34 |
* | Merge pull request #12577 from owncloud/public-mount-api | Lukas Reschke | 2014-12-08 | 7 | -25/+56 |
|\ | |||||
| * | Use the mount config api for files_external | Robin Appelman | 2014-12-04 | 4 | -18/+48 |
| * | Add public api for mount configurations | Robin Appelman | 2014-12-04 | 3 | -7/+8 |
* | | Merge pull request #12704 from owncloud/fix-12647-2 | Lukas Reschke | 2014-12-08 | 2 | -3/+9 |
|\ \ | |||||
| * | | add doc | Arthur Schiwon | 2014-12-08 | 1 | -0/+1 |
| * | | preserve an asterisk at the start when escaping a search term | Arthur Schiwon | 2014-12-08 | 2 | -3/+8 |
* | | | Merge pull request #12696 from owncloud/trashbin-selected-delete | Robin Appelman | 2014-12-08 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix deleting selected files in the trashbin | Robin Appelman | 2014-12-08 | 1 | -0/+4 |
* | | | Merge pull request #12452 from owncloud/server2server-ng-ocs | Morris Jobke | 2014-12-08 | 11 | -50/+575 |
|\ \ \ | |||||
| * | | | OCS API for server-to-server sharing | Bjoern Schiessle | 2014-12-04 | 11 | -50/+575 |
* | | | | 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 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-08 | 74 | -68/+6 |
* | | | | 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 | 12 | -4/+12 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 14 | -0/+14 |
* | | | | 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 | 2335 | -31221/+61241 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix timestamp comparator return value | brumsoel | 2014-10-08 | 1 | -1/+1 |
* | | | | | | | 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 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 80 | -84/+30 |
* | | | | | | | | cache total user count | Arthur Schiwon | 2014-12-04 | 1 | -0/+5 |
* | | | | | | | | Forward port of #12493 | Arthur Schiwon | 2014-12-04 | 3 | -1/+152 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #12596 from owncloud/remove-travis-traces | Morris Jobke | 2014-12-04 | 1 | -40/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove last traces of travis integration | Morris Jobke | 2014-12-04 | 1 | -40/+0 |
* | | | | | | | | update error message | Bjoern Schiessle | 2014-12-04 | 1 | -1/+1 |
* | | | | | | | | OC8 and later requires PHP >= 5.4, so we can remove the check from the encryp... | Bjoern Schiessle | 2014-12-04 | 1 | -5/+1 |
|/ / / / / / / | |||||
* | | / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-04 | 4 | -2/+12 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | fix typo | Bjoern Schiessle | 2014-12-03 | 1 | -1/+1 |
* | | | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2 | Morris Jobke | 2014-12-03 | 25 | -1674/+1172 |
|\ \ \ \ \ \ | |||||
| * | | | | | | small fixes | Bjoern Schiessle | 2014-12-02 | 1 | -2/+2 |
| * | | | | | | delete old keys if file was moved to a different mount point | Bjoern Schiessle | 2014-12-02 | 1 | -4/+10 |
| * | | | | | | upgrade to new folder structure | Bjoern Schiessle | 2014-12-02 | 18 | -341/+483 |
| * | | | | | | change private/public key names for consistency reasons | Bjoern Schiessle | 2014-11-26 | 11 | -226/+202 |
| * | | | | | | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 7 | -18/+28 |
| * | | | | | | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 15 | -1162/+526 |
* | | | | | | | Merge pull request #12556 from owncloud/add-route-for-versions | Thomas Müller | 2014-12-03 | 2 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add route for download of versions | Lukas Reschke | 2014-12-02 | 2 | -1/+3 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #12554 from owncloud/versions-app-autoload | Lukas Reschke | 2014-12-03 | 5 | -8/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Autoload exception from files_trashbin | Joas Schilling | 2014-12-02 | 2 | -2/+0 |
| * | | | | | | | Autoload lib files of versions app | Joas Schilling | 2014-12-02 | 3 | -6/+0 |
| |/ / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-03 | 2 | -2/+2 |
* | | | | | | | Merge pull request #12333 from owncloud/delete-selected-files | Morris Jobke | 2014-12-02 | 3 | -10/+42 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add js unit test | Robin Appelman | 2014-11-26 | 1 | -7/+27 |