Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3995 from nextcloud/files_scan_appdata | Lukas Reschke | 2017-03-23 | 2 | -1/+286 |
|\ | |||||
| * | Use proper name and code style | Morris Jobke | 2017-03-22 | 1 | -2/+2 |
| * | Add files:scanAppData command | Roeland Jago Douma | 2017-03-22 | 2 | -1/+286 |
* | | Merge pull request #3948 from nextcloud/downstream-27271 | Lukas Reschke | 2017-03-23 | 1 | -3/+8 |
|\ \ | |||||
| * | | fix path for files from root folder | Morris Jobke | 2017-03-22 | 1 | -1/+5 |
| * | | In the real world id is an initial filename | Victor Dubiniuk | 2017-03-20 | 1 | -3/+4 |
* | | | Merge pull request #3989 from nextcloud/files-external-save-button | Lukas Reschke | 2017-03-23 | 3 | -18/+17 |
|\ \ \ | |||||
| * | | | replace autosave with a save button for external storage configuration | Robin Appelman | 2017-03-22 | 3 | -18/+17 |
* | | | | Merge pull request #3999 from nextcloud/backport-27262 | Morris Jobke | 2017-03-23 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Updated UI messages relating to the encryption functionality | Matthew Setter | 2017-03-22 | 2 | -2/+2 |
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-23 | 8 | -2/+32 |
|/ / / / | |||||
* | | / | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-22 | 40 | -14/+280 |
| |_|/ |/| | | |||||
* | | | Revert "Bundle vendor js" | Roeland Jago Douma | 2017-03-22 | 1 | -0/+2 |
* | | | Merge pull request #3795 from nextcloud/bundle_vendor_js | Roeland Jago Douma | 2017-03-22 | 1 | -2/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | Handlebars is already loaded by core.js | Roeland Jago Douma | 2017-03-22 | 1 | -2/+0 |
* | | | Merge pull request #3972 from nextcloud/merge-some-more-css | Roeland Jago Douma | 2017-03-22 | 15 | -13/+13 |
|\ \ \ | |||||
| * | | | fix path | Morris Jobke | 2017-03-21 | 2 | -1/+1 |
| * | | | Merge some CSS files using our SCSS compiler | Lukas Reschke | 2017-03-21 | 15 | -13/+13 |
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-22 | 38 | -50/+224 |
* | | | | Fix reshare with user activity message | Joas Schilling | 2017-03-21 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge pull request #3937 from nextcloud/downstream-27234 | Morris Jobke | 2017-03-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix typo in sftp public key | Martin | 2017-03-19 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | [master] Fix branding | Lukas Reschke | 2017-03-21 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #3955 from nextcloud/downstream-27113 | Roeland Jago Douma | 2017-03-21 | 3 | -1/+7 |
|\ \ | |||||
| * | | [CI] Can we get some faster phpunit execution? (#27113) | Thomas Müller | 2017-03-20 | 3 | -1/+7 |
| |/ | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-21 | 22 | -6/+90 |
* | | Log access to preview images | Lukas Reschke | 2017-03-20 | 3 | -13/+56 |
* | | Merge pull request #3957 from nextcloud/downstream-27307 | Christoph Wurst | 2017-03-20 | 1 | -1/+8 |
|\ \ | |||||
| * | | Fix provisioning API call | Joas Schilling | 2017-03-20 | 1 | -1/+8 |
* | | | Merge pull request #3884 from nextcloud/downstream-26956 | Joas Schilling | 2017-03-20 | 4 | -4/+45 |
|\ \ \ | |||||
| * | | | Use DI | Joas Schilling | 2017-03-17 | 1 | -1/+1 |
| * | | | Skip null groups in group manager (#26871) (#26956) | Vincent Petry | 2017-03-17 | 4 | -4/+45 |
* | | | | Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer | Joas Schilling | 2017-03-20 | 2 | -5/+6 |
|\ \ \ \ | |||||
| * | | | | Don't use private api | Joas Schilling | 2017-03-20 | 1 | -1/+2 |
| * | | | | Correctly escape the footer description from theming | Joas Schilling | 2017-03-17 | 2 | -5/+5 |
* | | | | | Merge pull request #3950 from nextcloud/downstream-27149 | Lukas Reschke | 2017-03-20 | 2 | -1/+6 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fix grammar | Lukas Reschke | 2017-03-20 | 1 | -1/+1 |
| * | | | | Add ignore_files to config, | Felix Heidecke | 2017-03-20 | 2 | -1/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3946 from nextcloud/downstream-27263 | Roeland Jago Douma | 2017-03-20 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fix public link download button | Vincent Petry | 2017-03-20 | 1 | -0/+4 |
| |/ / / | |||||
* / / / | Log files:scan exception, add InterruptedException | Vincent Petry | 2017-03-20 | 1 | -8/+10 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-20 | 16 | -46/+336 |
* | | | Merge pull request #3906 from nextcloud/shares-circles-2 | Roeland Jago Douma | 2017-03-19 | 7 | -9/+117 |
|\ \ \ | |||||
| * | | | shares-circles | Maxence Lange | 2017-03-17 | 7 | -9/+117 |
* | | | | Merge pull request #3913 from cwickert/master | Roeland Jago Douma | 2017-03-19 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | DummyGetResponsePlugin: ownCloud -> Nexcloud | Christoph Wickert | 2017-03-18 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-19 | 8 | -0/+348 |
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-18 | 10 | -0/+182 |
|/ / / | |||||
* | | | Merge pull request #3887 from nextcloud/downstream-26379 | Morris Jobke | 2017-03-17 | 3 | -0/+377 |
|\ \ \ | |||||
| * | | | Safer queries | Joas Schilling | 2017-03-17 | 1 | -2/+2 |