Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-10 | 12 | -0/+30 |
* | Merge pull request #18895 from owncloud/make-code-analyzers-happier | Morris Jobke | 2015-09-09 | 3 | -24/+100 |
|\ | |||||
| * | Add proper PHPDoc | Lukas Reschke | 2015-09-08 | 3 | -24/+100 |
* | | Merge pull request #18873 from owncloud/enc_use_master_password | Lukas Reschke | 2015-09-09 | 10 | -27/+472 |
|\ \ | |||||
| * | | occ command to enable master key | Bjoern Schiessle | 2015-09-08 | 3 | -0/+196 |
| * | | enable usage of a master key | Bjoern Schiessle | 2015-09-07 | 7 | -27/+276 |
* | | | Merge pull request #18931 from owncloud/fix-files_sharing-breakage | Lukas Reschke | 2015-09-09 | 1 | -9/+11 |
|\ \ \ | |||||
| * | | | Check if files_sharing is actually enabled before using it | Robin McCorkell | 2015-09-09 | 1 | -9/+11 |
* | | | | Merge pull request #18925 from owncloud/change-risky-test | Morris Jobke | 2015-09-09 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Rename data provider to avoid risky test warning | Lukas Reschke | 2015-09-09 | 1 | -2/+2 |
* | | | | Merge pull request #18913 from owncloud/put-in-single-field-for-speed | Lukas Reschke | 2015-09-09 | 4 | -35/+52 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Write to session in batch at the end of the request | Lukas Reschke | 2015-09-09 | 3 | -17/+22 |
| * | | | Write session data to single key | Lukas Reschke | 2015-09-09 | 2 | -20/+34 |
| * | | | Use md5 over the version file to prevent cyclyc dependency | Lukas Reschke | 2015-09-09 | 1 | -3/+1 |
|/ / / | |||||
* | | | Merge pull request #18684 from owncloud/explicit-upgrade-version | Morris Jobke | 2015-09-09 | 4 | -25/+94 |
|\ \ \ | |||||
| * | | | Improved update version detection logic | Vincent Petry | 2015-08-31 | 1 | -7/+1 |
| * | | | Simplify comparison algo | Vincent Petry | 2015-08-31 | 1 | -15/+1 |
| * | | | Throw exception on downgrade attempt | Vincent Petry | 2015-08-30 | 1 | -1/+5 |
| * | | | Restrict upgrades to explicit allowed version | Vincent Petry | 2015-08-30 | 3 | -20/+105 |
* | | | | Merge pull request #18908 from owncloud/allow-0-as-password | Björn Schießle | 2015-09-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Allow 0 and false as password | Lukas Reschke | 2015-09-08 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-09 | 30 | -0/+50 |
* | | | | | Merge pull request #18914 from owncloud/generate-requesttoken-only-once | Lukas Reschke | 2015-09-08 | 1 | -1/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Cache generated result | Lukas Reschke | 2015-09-08 | 1 | -1/+8 |
|/ / / / | |||||
* | | | | Merge pull request #18881 from owncloud/kill-sendfile | Morris Jobke | 2015-09-08 | 1 | -57/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Remove XSendFile support | Lukas Reschke | 2015-09-07 | 1 | -57/+1 |
* | | | | Merge pull request #18882 from owncloud/load-all-apps-tests | Lukas Reschke | 2015-09-08 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | Load all enabled apps in test bootstrap | Robin McCorkell | 2015-09-07 | 1 | -3/+2 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-08 | 212 | -1192/+1148 |
|/ / / | |||||
* | | | Merge pull request #18876 from owncloud/missing-context-on-update-file-target | Morris Jobke | 2015-09-07 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Use context function call instead of static | Joas Schilling | 2015-09-07 | 1 | -1/+1 |
* | | | | Merge pull request #18630 from owncloud/files-combineuploadbutton | Jan-Christoph Borchardt | 2015-09-07 | 14 | -320/+792 |
|\ \ \ \ | |||||
| * | | | | Added unit tests for "new" file menu and small fixes | Vincent Petry | 2015-09-03 | 5 | -54/+247 |
| * | | | | Remove ellipsis on new file menu items | Vincent Petry | 2015-09-03 | 1 | -1/+0 |
| * | | | | fix icon and layout details for new menu | Jan-Christoph Borchardt | 2015-09-03 | 3 | -13/+12 |
| * | | | | Combine upload action into the "New" menu | Vincent Petry | 2015-08-28 | 11 | -270/+551 |
* | | | | | Merge pull request #18872 from owncloud/settings_users_ldap | Morris Jobke | 2015-09-07 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Check if app is enabled instead of if class exists | Robin McCorkell | 2015-09-07 | 1 | -1/+1 |
* | | | | | Merge pull request #18868 from owncloud/fix-files_version-js-load | Joas Schilling | 2015-09-07 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove unneeded include | Morris Jobke | 2015-09-07 | 1 | -1/+0 |
* | | | | | Merge pull request #18866 from tflidd/doc_link_phpfpm | Robin McCorkell | 2015-09-07 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | remove spaces and empty line | tflidd | 2015-09-07 | 1 | -2/+1 |
| * | | | | Add documentation link php-fpm | tflidd | 2015-09-07 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-07 | 4 | -0/+30 |
* | | | | Merge pull request #18748 from owncloud/files-versions-tab | Morris Jobke | 2015-09-07 | 18 | -221/+976 |
|\ \ \ \ | |||||
| * | | | | Add versions tab to files sidebar | Vincent Petry | 2015-09-03 | 18 | -221/+976 |
* | | | | | Merge pull request #18839 from owncloud/autoloader-supersecure | Morris Jobke | 2015-09-07 | 5 | -15/+56 |
|\ \ \ \ \ | |||||
| * | | | | | Unique exception for invalid autoload paths, better handling | Robin McCorkell | 2015-09-05 | 3 | -9/+53 |
| * | | | | | Resolve autoloader valid roots before checking | Robin McCorkell | 2015-09-05 | 1 | -1/+1 |
| * | | | | | Only add valid root for enabled apps | Robin McCorkell | 2015-09-05 | 2 | -5/+2 |