Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add marked | Joas Schilling | 2017-01-13 | 5 | -0/+68 |
* | Merge pull request #3048 from nextcloud/share-scss-optimisation | John Molakvoæ | 2017-01-13 | 1 | -68/+45 |
|\ | |||||
| * | Share scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-12 | 1 | -68/+45 |
* | | Merge pull request #3060 from nextcloud/cleanup-js-tests | Joas Schilling | 2017-01-13 | 3 | -3/+17 |
|\ \ | |||||
| * | | fix image warnings | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| * | | allow/fix loading of fonts | Christoph Wurst | 2017-01-13 | 1 | -1/+4 |
| * | | expect warning to be shown | Christoph Wurst | 2017-01-13 | 1 | -1/+3 |
| * | | add spies for l10n warnings | Christoph Wurst | 2017-01-13 | 1 | -0/+7 |
* | | | Merge pull request #3051 from nextcloud/issue-2831-change-row-format-before-c... | Joas Schilling | 2017-01-13 | 1 | -0/+12 |
|\ \ \ | |||||
| * | | | Change the row-format before changing the collation | Joas Schilling | 2017-01-12 | 1 | -0/+12 |
| |/ / | |||||
* | | | Merge pull request #2918 from nextcloud/encryption-recovery-improvements | Morris Jobke | 2017-01-13 | 10 | -81/+176 |
|\ \ \ | |/ / |/| | | |||||
| * | | create new encryption keys on password reset and backup the old one | Bjoern Schiessle | 2017-01-10 | 10 | -81/+176 |
* | | | Merge pull request #3035 from nextcloud/fix-federationScopeMenu-menu | Morris Jobke | 2017-01-12 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Update federationscopemenu.js | John Molakvoæ | 2017-01-11 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-12 | 12 | -26/+98 |
|/ / | |||||
* | | Merge pull request #3029 from nextcloud/systemtags-scss-optimisation | John Molakvoæ | 2017-01-11 | 1 | -28/+20 |
|\ \ | |||||
| * | | Systemtags scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -28/+20 |
* | | | Merge pull request #3027 from nextcloud/multiselect-scss-optimisation | John Molakvoæ | 2017-01-11 | 1 | -31/+24 |
|\ \ \ | |||||
| * | | | Multiselect scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -31/+24 |
* | | | | Merge pull request #3026 from nextcloud/icons-scss-optimisation | Morris Jobke | 2017-01-11 | 1 | -60/+52 |
|\ \ \ \ | |||||
| * | | | | Comments and delete icon | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -7/+19 |
| * | | | | Loader and animation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -53/+33 |
| |/ / / | |||||
* | | | | Merge pull request #3028 from nextcloud/tooltip-scss-optimisation | Roeland Jago Douma | 2017-01-11 | 1 | -54/+53 |
|\ \ \ \ | |||||
| * | | | | Tooltip scss optimisation | John Molakvoæ (skjnldsv) | 2017-01-11 | 1 | -54/+53 |
| |/ / / | |||||
* | / / | [tx-robot] updated from transifex | Nextcloud bot | 2017-01-11 | 32 | -290/+604 |
| |/ / |/| | | |||||
* | | | Merge pull request #2849 from nextcloud/downstream-add-two-factor-exception | Roeland Jago Douma | 2017-01-11 | 6 | -46/+179 |
|\ \ \ | |||||
| * | | | Update autoloader | Roeland Jago Douma | 2017-01-11 | 2 | -0/+2 |
| * | | | fix coding style and increase code coverage | Christoph Wurst | 2017-01-11 | 3 | -61/+131 |
| * | | | Fix tests | Cornelius Kölbel | 2017-01-11 | 1 | -2/+5 |
| * | | | Update TwoFactorException.php | Cornelius Kölbel | 2017-01-11 | 1 | -2/+2 |
| * | | | Add a TwoFactorException | Cornelius Kölbel | 2017-01-11 | 3 | -5/+63 |
| |/ / | |||||
* | | | Merge pull request #3007 from Loki3000/master | Roeland Jago Douma | 2017-01-11 | 3 | -4/+19 |
|\ \ \ | |/ / |/| | | |||||
| * | | remove non required sql requests | Loki3000 | 2017-01-10 | 1 | -3/+8 |
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | spaces added | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | allowed '0' uid | Loki3000 | 2017-01-10 | 1 | -2/+2 |
| * | | fix spaces | Loki3000 | 2017-01-10 | 1 | -1/+1 |
| * | | fix brackets | Loki3000 | 2017-01-10 | 1 | -2/+4 |
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+6 |
| * | | remove non required db requests | Loki3000 | 2017-01-10 | 1 | -1/+4 |
* | | | Merge pull request #3020 from nextcloud/2944 | Roeland Jago Douma | 2017-01-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update mobile.css | Rodrigo Almeida | 2017-01-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #2744 from nextcloud/oc_26324 | Roeland Jago Douma | 2017-01-11 | 1 | -52/+53 |
|\ \ \ | |||||
| * | | | Fix DAV stat cache to properly cache 404 | Vincent Petry | 2017-01-05 | 1 | -52/+53 |
* | | | | Merge pull request #2745 from nextcloud/oc_26590 | Roeland Jago Douma | 2017-01-11 | 2 | -5/+37 |
|\ \ \ \ | |||||
| * | | | | Only check for local shared storages | Roeland Jago Douma | 2017-01-10 | 2 | -4/+6 |
| * | | | | Skip local shares in bkg scan and occ files:scan (#26590) | Vincent Petry | 2017-01-10 | 2 | -5/+35 |
* | | | | | Merge pull request #2951 from nextcloud/handle-nextcloud-log-type-gracefully | Roeland Jago Douma | 2017-01-11 | 3 | -8/+43 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Better fallback for unknown log types | Joas Schilling | 2017-01-10 | 2 | -11/+14 |