Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3885 from nextcloud/downstream-26529 | Joas Schilling | 2017-03-17 | 1 | -0/+12 |
|\ | |||||
| * | Skip FailedStorage in background scan | Vincent Petry | 2017-03-17 | 1 | -0/+12 |
* | | Merge pull request #3886 from nextcloud/downstream-26995 | Joas Schilling | 2017-03-17 | 2 | -1/+13 |
|\ \ | |||||
| * | | Chunking NG: Assemble in natural sort order of files | Markus Goetz | 2017-03-17 | 2 | -1/+13 |
| |/ | |||||
* | | Merge pull request #3894 from nextcloud/downstream-27008 | Joas Schilling | 2017-03-17 | 1 | -17/+25 |
|\ \ | |||||
| * | | Integration test check download without saving file locally | Vincent Petry | 2017-03-16 | 1 | -17/+25 |
* | | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend | Roeland Jago Douma | 2017-03-17 | 1 | -3/+3 |
|\ \ \ | |||||
| * | | | Don't call function in constructor | Lukas Reschke | 2017-03-16 | 1 | -7/+3 |
| * | | | Escape like parameters in database user backend | Lukas Reschke | 2017-03-15 | 1 | -3/+7 |
* | | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy | Roeland Jago Douma | 2017-03-17 | 8 | -113/+114 |
|\ \ \ \ | |||||
| * | | | | Adjust integration test | Lukas Reschke | 2017-03-16 | 1 | -1/+1 |
| * | | | | Adjust tests to include base-uri | Lukas Reschke | 2017-03-16 | 2 | -2/+2 |
| * | | | | Add base-uri to CSP policy | Lukas Reschke | 2017-03-16 | 5 | -110/+111 |
* | | | | | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution | Roeland Jago Douma | 2017-03-17 | 1 | -0/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Harden JS by disabling jQuery eval | Lukas Reschke | 2017-03-16 | 1 | -0/+9 |
* | | | | | | Merge pull request #3875 from nextcloud/use-new-short-urls | Roeland Jago Douma | 2017-03-17 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use cleaner social media URLs | Lukas Reschke | 2017-03-16 | 1 | -2/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #2824 from nextcloud/ext-storage-expireversions | Morris Jobke | 2017-03-16 | 3 | -10/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Properly expire ext storage versions (#26601) | Vincent Petry | 2017-03-10 | 3 | -10/+29 |
* | | | | | | | Merge pull request #3619 from nextcloud/fix-scss-for-apps | Morris Jobke | 2017-03-16 | 4 | -7/+94 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Properly calculate webdir using the serverroot | Roeland Jago Douma | 2017-03-10 | 2 | -5/+13 |
| * | | | | | | SCSS files don't exist on the default fs so just add them to the | Roeland Jago Douma | 2017-03-10 | 1 | -1/+49 |
| * | | | | | | Fix SCSS usage in apps | Morris Jobke | 2017-03-10 | 1 | -1/+32 |
* | | | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-03-17 | 104 | -1128/+1394 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #3679 from nextcloud/socialsharing | Lukas Reschke | 2017-03-16 | 5 | -10/+193 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix layout of sharing buttons | Morris Jobke | 2017-03-14 | 2 | -13/+26 |
| * | | | | | Fix tests | Roeland Jago Douma | 2017-03-06 | 1 | -0/+1 |
| * | | | | | Make sure copy tooltip remains when we have no social providers | Roeland Jago Douma | 2017-03-03 | 1 | -5/+22 |
| * | | | | | Move social buttons to menu | Roeland Jago Douma | 2017-03-03 | 5 | -150/+107 |
| * | | | | | Add social sharing | Roeland Jago Douma | 2017-03-03 | 4 | -1/+196 |
* | | | | | | Merge pull request #3862 from nextcloud/dont-set-the-status-twice | Lukas Reschke | 2017-03-16 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Don't set the HTTP status twice | Joas Schilling | 2017-03-16 | 1 | -1/+0 |
* | | | | | | | Merge pull request #3008 from nextcloud/appmenu-experiment | Morris Jobke | 2017-03-16 | 6 | -91/+438 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix html formating issues | Julius Haertl | 2017-03-16 | 1 | -14/+5 |
| * | | | | | | | Rebuild menu to keep order of icons correct | Julius Haertl | 2017-03-16 | 2 | -29/+38 |
| * | | | | | | | Reduce device width and hide app name when menu is open | Julius Haertl | 2017-03-16 | 1 | -2/+3 |
| * | | | | | | | Make enabling/disabling apps work with the new menu | Julius Haertl | 2017-03-16 | 3 | -30/+67 |
| * | | | | | | | Fix positioning of popovermenu | Julius Haertl | 2017-03-16 | 1 | -2/+6 |
| * | | | | | | | Fix popover positioning after window resize | Julius Haertl | 2017-03-16 | 1 | -5/+13 |
| * | | | | | | | Cleanup SCSS for app menu and fix mobile view | Julius Haertl | 2017-03-16 | 1 | -103/+91 |
| * | | | | | | | Make app management icon act like a normal app icon | Julius Haertl | 2017-03-16 | 2 | -2/+9 |
| * | | | | | | | Fix menu issues | Julius Haertl | 2017-03-16 | 4 | -61/+101 |
| * | | | | | | | Generate seperate menu list for header bar | Julius Haertl | 2017-03-16 | 4 | -22/+73 |
| * | | | | | | | Move active app to the first slot | Julius Haertl | 2017-03-16 | 1 | -9/+19 |
| * | | | | | | | Show app icons in the header | Julius Haertl | 2017-03-16 | 3 | -5/+206 |
* | | | | | | | | Merge pull request #3863 from nextcloud/additional-hardening-of-t | Roeland Jago Douma | 2017-03-16 | 5 | -18/+23 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Harden t() with DOMPurify | Lukas Reschke | 2017-03-16 | 5 | -18/+23 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #3860 from nextcloud/fix_master_after_3802 | Lukas Reschke | 2017-03-16 | 2 | -0/+39 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Fix unit tests of master | Roeland Jago Douma | 2017-03-16 | 2 | -0/+39 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3802 from Ko-/master | Roeland Jago Douma | 2017-03-16 | 10 | -8/+48 |
|\ \ \ \ \ \ |