summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-03-1816-90/+194
|
* Merge pull request #3881 from nextcloud/downstream-26842Joas Schilling2017-03-171-5/+41
|\ | | | | Backbone Webdav Adapter MKCOL support
| * Backbone Webdav Adapter MKCOL supportVincent Petry2017-03-171-5/+41
| | | | | | | | | | | | | | | | | | | | Usually Backbone collections cannot be created and just simply exists. But in the Webdav world they need to be creatable. This enhancement makes it possible to use a Backbone Model to represent such collections and when creating it, it will use MKCOL instead of PUT. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-executionRoeland Jago Douma2017-03-171-0/+9
|\ \ | | | | | | Harden JS by disabling jQuery eval
| * | Harden JS by disabling jQuery evalLukas Reschke2017-03-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable execution of eval in jQuery. We do require an allowed eval CSP configuration at the moment for handlebars et al. But for jQuery there is not much of a reason to execute JavaScript directly via eval. This thus mitigates some unexpected XSS vectors. As example try to insert `$('.fileinfo').html('<a href="asd"><script>alert(1)</script></a>');` with and without this patch in your browsers JS console when the file list is opened. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-1764-630/+76
| |/ |/|
* | Merge pull request #3679 from nextcloud/socialsharingLukas Reschke2017-03-163-10/+173
|\ \ | |/ |/| Add social sharing
| * Fix layout of sharing buttonsMorris Jobke2017-03-141-13/+18
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix testsRoeland Jago Douma2017-03-061-0/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Make sure copy tooltip remains when we have no social providersRoeland Jago Douma2017-03-031-5/+22
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Move social buttons to menuRoeland Jago Douma2017-03-033-149/+96
| | | | | | | | | | | | | | | | | | * If there are social sharing buttons move them and the copy action to a menu * If there are no social sharing buttons just leave the copy action where it is directly Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add social sharingRoeland Jago Douma2017-03-033-1/+194
| | | | | | | | | | | | | | * Add socialshare manager * Add social share field under link share Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #3008 from nextcloud/appmenu-experimentMorris Jobke2017-03-163-53/+286
|\ \ | | | | | | Show apps in header
| * | Fix html formating issuesJulius Haertl2017-03-161-14/+5
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Rebuild menu to keep order of icons correctJulius Haertl2017-03-161-1/+3
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Reduce device width and hide app name when menu is openJulius Haertl2017-03-161-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Make enabling/disabling apps work with the new menuJulius Haertl2017-03-162-11/+10
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Fix positioning of popovermenuJulius Haertl2017-03-161-2/+6
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Fix popover positioning after window resizeJulius Haertl2017-03-161-5/+13
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Cleanup SCSS for app menu and fix mobile viewJulius Haertl2017-03-161-103/+91
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Make app management icon act like a normal app iconJulius Haertl2017-03-161-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Fix menu issuesJulius Haertl2017-03-163-55/+82
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Generate seperate menu list for header barJulius Haertl2017-03-162-19/+30
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | Show app icons in the headerJulius Haertl2017-03-163-5/+206
| | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | Harden t() with DOMPurifyLukas Reschke2017-03-164-17/+23
| | | | | | | | | | | | | | | | | | This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Fix unit tests of masterRoeland Jago Douma2017-03-161-0/+38
| | | | | | | | | | | | | | | | | | Follow up to #3802 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #3802 from Ko-/masterRoeland Jago Douma2017-03-162-1/+12
|\ \ \ | |/ / |/| | Check that set_time_limit is not disabled before calling it
| * | Add warning on admin screen when set_time_limit is unavailableKo-2017-03-161-0/+8
| | |
| * | Check that set_time_limit is not disabled before calling itKo-2017-03-111-1/+4
| | | | | | | | | | | | Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
* | | Merge pull request #3624 from marncz/masterRoeland Jago Douma2017-03-161-2/+15
|\ \ \ | | | | | | | | Update.js: countdown feedback before redirect
| * | | SpacingMarcin Czarnecki2017-03-151-1/+1
| | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
| * | | Update: feedback before redirectMarcin Czarnecki2017-03-141-8/+9
| | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
| * | | Update: feedback before redirectMarcin Czarnecki2017-02-251-2/+14
| | | | | | | | | | | | Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-1646-46/+0
| | | |
* | | | Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-queryRoeland Jago Douma2017-03-151-3/+3
|\ \ \ \ | | | | | | | | | | Remove single quotes around search query like in user search
| * | | | Remove single quotes around search query like in user searchJoas Schilling2017-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-154-66/+66
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-03-144-180/+230
| | | | |
* | | | | Remove the double password confirmation on changing cronJoas Schilling2017-03-131-0/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-136-2/+6
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-03-122-4/+4
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-116-76/+138
| | |
* | | Fix login page, because only guest.css is loaded nowMorris Jobke2017-03-101-0/+13
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-102-82/+106
| | |
* | | Add more styles to the server.scssMorris Jobke2017-03-095-0/+9
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [PoC] combine 2 scss files!Roeland Jago Douma2017-03-091-0/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-084-2/+8
| | |
* | | Apply text input styling to 'tel' inputs tooChristoph Wurst2017-03-071-0/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | [tx-robot] updated from transifexNextcloud bot2017-03-062-0/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-03-044-0/+758
| |/ |/|