Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| * | | | | Dont show the delete button for selected files if one of the selected files i... | Robin Appelman | 2014-11-26 | 1 | -2/+12 |
| * | | | | Check if files are deletable before trying to delete them | Robin Appelman | 2014-11-26 | 1 | -1/+3 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-30 | 4 | -0/+4 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-29 | 4 | -6/+8 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-28 | 8 | -6/+20 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-27 | 6 | -0/+6 |
* | | | | | Merge pull request #12448 from owncloud/no503forRoot | Morris Jobke | 2014-11-26 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Don't show favicon to prevent iteration through subfolders | Lukas Reschke | 2014-11-26 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #6989 from AdamWill/google-1 | Robin Appelman | 2014-11-26 | 57 | -6250/+11212 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | google: disable compression when curl is not available | Adam Williamson | 2014-11-07 | 1 | -0/+6 |
| * | | | | update google-api-php-client to 1.0.6-beta | Adam Williamson | 2014-11-07 | 21 | -264/+1179 |
| * | | | | scrutinizer fix: explicitly declare Google class property $client | Adam Williamson | 2014-11-06 | 1 | -0/+1 |
| * | | | | scrutinizer fix: correct @return for getDriveFile() | Adam Williamson | 2014-11-06 | 1 | -2/+3 |
| * | | | | bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix) | Adam Williamson | 2014-11-06 | 4 | -11/+38 |
| * | | | | google drive: set access type to 'offline' when requesting token | Adam Williamson | 2014-11-06 | 1 | -0/+1 |
| * | | | | fix a bug in google-api-php-client: generates an auth url that doesn't work | Adam Williamson | 2014-11-06 | 1 | -1/+1 |
| * | | | | files_external/3rdparty: update google-api-php-client to 1.0.2-beta | Adam Williamson | 2014-11-06 | 53 | -6160/+10171 |