Commit Graph

1049 Commits

Author SHA1 Message Date
James Allen d84580f12d Label actions with text rather than icons 2017-12-19 13:58:47 +00:00
James Allen 8a3fadbfc1 Style the edit/add/rename options 2017-12-19 13:58:47 +00:00
James Allen 50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen 4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
James Allen a1615e6d84 Prototype of requesting history information by doc path, while tracking renames 2017-12-19 13:58:47 +00:00
Henry Oswald bf276b0814 ripped file fingerprinting out 2017-12-14 12:11:13 +00:00
Henry Oswald cbf656518f remove versioned files from fingerprinting 2017-12-14 11:24:47 +00:00
Henry Oswald bbbba701b0 Update editor.pug 2017-12-14 10:21:53 +00:00
Henry Oswald 490c56c692 libs -> libraries
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald ccbb15c82e remove fingerprint from ide 2017-12-13 14:54:08 +00:00
Henry Oswald dd6bd3b91e Merge branch 'master' into ho-hash-static 2017-12-13 14:25:32 +00:00
Henry Oswald 357617d952 works with libs compiled into it 2017-12-13 14:19:19 +00:00
Henry Oswald 65efbbce53 seems to work now. 2017-12-13 13:06:38 +00:00
Henry Oswald 80e6a660be wip, this does not work minified yet
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
Alasdair Smith 4126e9bd31 Merge branch 'master' into as-v1-dash-link 2017-12-12 09:55:48 +00:00
Paulo Reis edfc259c53 Fix missing border on SL. 2017-12-11 16:55:50 +00:00
Paulo Reis 7c5a7880b0 Merge branch 'master' into pr-style-v2-resizers 2017-12-06 15:49:18 +00:00
Alasdair Smith 48cd048e5c Merge branch 'master' into as-v1-dash-link 2017-12-06 15:12:29 +00:00
Paulo Jorge Reis a5f99ccce3 Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling
V2 editor styling
2017-12-06 11:22:28 +00:00
Alasdair Smith 2d66fd7280 Merge pull request #169 from sharelatex/as-import-v1
V1 Import Modal
2017-12-05 13:19:49 +00:00
Paulo Reis 5dffdf3efc Add a small a11y fix. 2017-12-05 10:23:28 +00:00
Paulo Reis a88538c3fd Make the back to projects button closer to current SL. 2017-12-05 10:20:25 +00:00
Alasdair Smith c84c00d56d Change query param for nicer api on OL side 2017-12-04 15:19:03 +00:00
Paulo Reis 0bad7d8549 Adjustments to synctex controls. 2017-12-04 15:12:13 +00:00
Alasdair Smith 77dc7adf1f Revert "Move to sidebar template"
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
2017-12-04 14:53:18 +00:00
Paulo Reis 9fda8e62fa Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers 2017-12-04 13:48:52 +00:00
Paulo Reis fd852004fe Refactor synctex controls z-index handling. 2017-12-04 12:25:40 +00:00
Alasdair Smith ab78cea48d Move to sidebar template 2017-12-04 12:24:21 +00:00
Alasdair Smith 1fd518ec58 Add query param to mark as explicitly using V1 dash 2017-12-04 12:22:27 +00:00
Alasdair Smith a25464d925 Add check for OL host 2017-12-04 11:34:00 +00:00
Alasdair Smith f595009911 Switch to existing v1 dash flag 2017-12-04 11:23:09 +00:00
James Allen 52b414498c Merge branch 'master' into as-show-v1-warnings 2017-12-04 10:03:38 +00:00
James Allen 0b0fd576eb Merge branch 'master' into as-v1-dash-link 2017-12-04 10:02:42 +00:00
James Allen 0602fed6e5 Merge branch 'master' into as-import-v1 2017-12-04 10:02:21 +00:00
James Allen 158b0d56cf Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:01:45 +00:00
James Allen f21870aac2 Merge branch 'master' into pr-ol-beta-editor-styling 2017-12-04 10:01:27 +00:00
Alasdair Smith 7f622e2e6b Conditionally show V1 dash link 2017-12-01 17:14:53 +00:00
Alasdair Smith 9a073cdaf0 Add link to V1 dash 2017-12-01 16:58:19 +00:00
Shane Kilkelly 2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Alasdair Smith 5b8c9b2f4c Add aria role to warning 2017-12-01 11:00:13 +00:00
Alasdair Smith 7d58427485 Show warnings on project list for some V1 data 2017-11-30 16:59:13 +00:00
Paulo Reis 3a959cccfd Use custom chat resizer values. 2017-11-30 15:24:48 +00:00
Alasdair Smith 52ad852814 Add check for OL host to prevent failure on legacy SL 2017-11-30 15:14:47 +00:00
Paulo Reis e38c0de6b9 Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers 2017-11-30 15:13:00 +00:00
Paulo Reis 71604ebd5c Create uiConfig Pug local; render it in the HTML. 2017-11-30 15:12:36 +00:00
Alasdair Smith f232899f3f Show warning symbol on second step 2017-11-30 10:16:15 +00:00
Alasdair Smith 6eae1d59ea Use asyncForm directive to trigger import 2017-11-30 10:16:15 +00:00
Alasdair Smith 3aaf6559c8 Add image of v2 editor 2017-11-30 10:16:15 +00:00
Alasdair Smith 265e659999 Add multiple steps 2017-11-30 10:16:15 +00:00
Alasdair Smith b68d6411ee Basic styles for import modal 2017-11-30 10:16:15 +00:00