summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3885 from nextcloud/downstream-26529Joas Schilling2017-03-171-0/+12
|\
| * Skip FailedStorage in background scanVincent Petry2017-03-171-0/+12
* | Merge pull request #3886 from nextcloud/downstream-26995Joas Schilling2017-03-172-1/+13
|\ \
| * | Chunking NG: Assemble in natural sort order of filesMarkus Goetz2017-03-172-1/+13
| |/
* | Merge pull request #3894 from nextcloud/downstream-27008Joas Schilling2017-03-171-17/+25
|\ \
| * | Integration test check download without saving file locallyVincent Petry2017-03-161-17/+25
* | | Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backendRoeland Jago Douma2017-03-171-3/+3
|\ \ \
| * | | Don't call function in constructorLukas Reschke2017-03-161-7/+3
| * | | Escape like parameters in database user backendLukas Reschke2017-03-151-3/+7
* | | | Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policyRoeland Jago Douma2017-03-178-113/+114
|\ \ \ \
| * | | | Adjust integration testLukas Reschke2017-03-161-1/+1
| * | | | Adjust tests to include base-uriLukas Reschke2017-03-162-2/+2
| * | | | Add base-uri to CSP policyLukas Reschke2017-03-165-110/+111
* | | | | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-executionRoeland Jago Douma2017-03-171-0/+9
|\ \ \ \ \
| * | | | | Harden JS by disabling jQuery evalLukas Reschke2017-03-161-0/+9
* | | | | | Merge pull request #3875 from nextcloud/use-new-short-urlsRoeland Jago Douma2017-03-171-2/+2
|\ \ \ \ \ \
| * | | | | | Use cleaner social media URLsLukas Reschke2017-03-161-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2824 from nextcloud/ext-storage-expireversionsMorris Jobke2017-03-163-10/+29
|\ \ \ \ \ \
| * | | | | | Properly expire ext storage versions (#26601)Vincent Petry2017-03-103-10/+29
* | | | | | | Merge pull request #3619 from nextcloud/fix-scss-for-appsMorris Jobke2017-03-164-7/+94
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Properly calculate webdir using the serverrootRoeland Jago Douma2017-03-102-5/+13
| * | | | | | SCSS files don't exist on the default fs so just add them to theRoeland Jago Douma2017-03-101-1/+49
| * | | | | | Fix SCSS usage in appsMorris Jobke2017-03-101-1/+32
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-17104-1128/+1394
| |_|/ / / / |/| | | | |
* | | | | | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-165-10/+193
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix layout of sharing buttonsMorris Jobke2017-03-142-13/+26
| * | | | | Fix testsRoeland Jago Douma2017-03-061-0/+1
| * | | | | Make sure copy tooltip remains when we have no social providersRoeland Jago Douma2017-03-031-5/+22
| * | | | | Move social buttons to menuRoeland Jago Douma2017-03-035-150/+107
| * | | | | Add social sharingRoeland Jago Douma2017-03-034-1/+196
* | | | | | Merge pull request #3862 from nextcloud/dont-set-the-status-twiceLukas Reschke2017-03-161-1/+0
|\ \ \ \ \ \
| * | | | | | Don't set the HTTP status twiceJoas Schilling2017-03-161-1/+0
* | | | | | | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-166-91/+438
|\ \ \ \ \ \ \
| * | | | | | | Fix html formating issuesJulius Haertl2017-03-161-14/+5
| * | | | | | | Rebuild menu to keep order of icons correctJulius Haertl2017-03-162-29/+38
| * | | | | | | Reduce device width and hide app name when menu is openJulius Haertl2017-03-161-2/+3
| * | | | | | | Make enabling/disabling apps work with the new menuJulius Haertl2017-03-163-30/+67
| * | | | | | | Fix positioning of popovermenuJulius Haertl2017-03-161-2/+6
| * | | | | | | Fix popover positioning after window resizeJulius Haertl2017-03-161-5/+13
| * | | | | | | Cleanup SCSS for app menu and fix mobile viewJulius Haertl2017-03-161-103/+91
| * | | | | | | Make app management icon act like a normal app iconJulius Haertl2017-03-162-2/+9
| * | | | | | | Fix menu issuesJulius Haertl2017-03-164-61/+101
| * | | | | | | Generate seperate menu list for header barJulius Haertl2017-03-164-22/+73
| * | | | | | | Move active app to the first slotJulius Haertl2017-03-161-9/+19
| * | | | | | | Show app icons in the headerJulius Haertl2017-03-163-5/+206
* | | | | | | | Merge pull request #3863 from nextcloud/additional-hardening-of-tRoeland Jago Douma2017-03-165-18/+23
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Harden t() with DOMPurifyLukas Reschke2017-03-165-18/+23
|/ / / / / / /
* | | | | | | Merge pull request #3860 from nextcloud/fix_master_after_3802Lukas Reschke2017-03-162-0/+39
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix unit tests of masterRoeland Jago Douma2017-03-162-0/+39
|/ / / / / /
* | | | | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-1610-8/+48
|\ \ \ \ \ \