Commit graph

181 commits

Author SHA1 Message Date
Simon Detheridge
d2de6d8e87 Merge pull request #1689 from sharelatex/revert-1684-revert-1637-as-clear-undo-stack-remote-edit
Bring back clearing of undo stack when remote change is received

GitOrigin-RevId: f18b1b4c1af0ab0c8563c3670c73d75afa6d8345
2019-04-25 14:37:27 +00:00
Brian Gough
1078688895 Merge pull request #1716 from sharelatex:bg-fix-merge-conflict
fix incorrect merge conflict

GitOrigin-RevId: 55e19f025a433e8abbde16bd68ccbc3e21f7964f
2019-04-16 10:05:38 +00:00
Brian Gough
5864e90794 Merge pull request #1698 from sharelatex/bg-send-hash-when-debugging
send sha1 hash when in debug mode

GitOrigin-RevId: 7a906deb15f1be0ac2e41d4ff2e1f105018b22f6
2019-04-16 09:06:23 +00:00
Brian Gough
f3960db1ad Merge pull request #1701 from sharelatex/bg-send-last-version
send last version to docupdater

GitOrigin-RevId: fab3415fdb1f37982d8089a9d0b35fd06f7459ae
2019-04-16 08:34:44 +00:00
Paulo Jorge Reis
9c5c6922b9 Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection
History drag and drop selection

GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01
2019-04-09 10:11:13 +00:00
Alasdair Smith
9ff021cc88 Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943
Upgrade PDFjs to v2.0.943

GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb
2019-04-01 09:27:32 +00:00
Alasdair Smith
b1a615bad9 Merge pull request #1684 from sharelatex/revert-1637-as-clear-undo-stack-remote-edit
Revert "Clear undo stack when remote change is received"

GitOrigin-RevId: ac313f008e54696f548e6396851fe22568248055
2019-03-29 12:24:42 +00:00
Shane Kilkelly
49a5056e78 Merge pull request #1637 from sharelatex/as-clear-undo-stack-remote-edit
Clear undo stack when remote change is received

GitOrigin-RevId: 1a1d1e34827e002e08a264bffa467d77701ce758
2019-03-22 10:27:51 +00:00
James Allen
abb259a98b Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4
Upgrade to angular-sanitize 1.6.4

GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e
2019-01-29 10:12:02 +00:00
Paulo Jorge Reis
4c9eee51df Merge pull request #1114 from sharelatex/as-fix-sentry-reporting
Fix Sentry reporting

GitOrigin-RevId: 1bbe598b520fe9edb136a148cc57af63df77cec4
2018-11-15 10:04:23 +00:00
James Allen
95f7d3da24 Merge pull request #1118 from sharelatex/as-upgrade-ace-1.2.9
Upgrade to Ace 1.2.9

GitOrigin-RevId: 8700f6decb530a0f0bbaefbe32a83893e8d91a90
2018-11-14 14:30:12 +00:00
Paulo Jorge Reis
49388c868b Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui
Editor cobranding UI

GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
2018-11-07 11:43:31 +00:00
Alasdair Smith
659242b457 Merge pull request #1037 from sharelatex/as-decaffeinate
Decaffeinate frontend

GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de
2018-11-05 10:19:25 +00:00
Alasdair Smith
fb8ed890f9 Correctly load Safe mathjax extention using provided config 2018-10-03 11:52:33 +01:00
Paulo Reis
a8cb126c4b Add UI Select (enhanced select boxes) components. 2018-06-15 11:33:47 +01:00
James Allen
049fe6e176 Update bracket border colour 2018-05-11 10:24:58 +01:00
James Allen
b7be63f3a8 Import Overleaf v1 theme from sharelatex/ace 2018-05-04 15:12:47 +01:00
Henry Oswald
903a9db936 upgrade static recurly lib to 4.8.5 for plans page 2018-04-16 10:10:43 +01:00
Alasdair Smith
0b77e97df2 Added angular mocks for testing and stub out globals 2018-02-20 14:01:02 +00:00
James Allen
c6b6b95dec Remove some unused files 2018-01-09 14:19:23 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
James Allen
381761127e Replace previous fineuploader path with old version 2017-12-01 13:26:31 +00:00
Shane Kilkelly
2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Shane Kilkelly
8b5115ff03 Merge branch 'sk-update-fineuploader' 2017-11-29 09:41:14 +00:00
Henry Oswald
5ef7bad60f removed groove 2017-11-24 14:58:35 +00:00
Shane Kilkelly
1ddfd948d6 Update the file-upload library 2017-11-21 16:21:58 +00:00
Shane Kilkelly
81887dd4f5 wip: upgrade fineuploader 2017-11-20 14:43:13 +00:00
Nate Stemen
f00dbf3d56 fixing popup and code folding issues 2017-11-17 16:25:45 -05:00
James Allen
6c342a6e65 Merge branch 'master' into ja-update-ace 2017-08-04 10:39:53 +02:00
James Allen
4826616411 Update with latex mode bracket matching changes 2017-08-04 10:38:54 +02:00
Shane Kilkelly
0b84caa730 Add new auto-pair behaviour to mode-latex_beta 2017-07-10 10:52:18 +01:00
Shane Kilkelly
b799bbc695 Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration 2017-07-06 14:56:03 +01:00
Shane Kilkelly
cc8499ba48 update to latest latex mode 2017-07-06 14:55:37 +01:00
Shane Kilkelly
04c94760f5 Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration 2017-07-06 14:39:28 +01:00
James Allen
01d709dff5 Remove latex beta mode 2017-07-06 11:59:44 +01:00
James Allen
4276f1544d Update ace latex worker to include context reporting 2017-07-06 11:56:20 +01:00
Shane Kilkelly
34b2012727 Enable (optional) auto-pairing for latex mode 2017-07-06 11:06:51 +01:00
Paulo Reis
3bc4beee07 Add Angular source maps and unminified bundle. 2017-06-26 16:13:05 +01:00
Paulo Reis
1bc38b2ea7 Use Angular minified bundle. 2017-06-26 10:07:15 +01:00
Paulo Reis
3dda383d70 Use promise method signatures, instead of old HTTP service ones. 2017-06-20 16:04:06 +01:00
Paulo Reis
97f3f7c2db Add latest Angular bundles. 2017-06-20 10:38:56 +01:00
Brian Gough
9687daf97f Merge pull request #520 from sharelatex/bg-upgrade-pdfjs-1.8.188
upgrade pdfjs 1.8.188
2017-06-13 16:46:10 +01:00
Brian Gough
e417a72e0a remove old version of pdfjs 2017-06-06 15:06:09 +01:00
Brian Gough
ff7e383f08 add compatibility.js from pdfjs repo 2017-06-06 12:18:58 +01:00
Brian Gough
5aa1e4cc2a add pdfjs-1.8.188 2017-06-06 11:47:30 +01:00
James Allen
32b27766bc Update Raven (Sentry lib) to 3.15.0 in client 2017-05-22 16:45:50 +01:00
Paulo Reis
2ac6b70a1c Use workaround from Ace's commits. 2017-04-04 17:08:23 +01:00
Paulo Reis
c2df5dc01c Apply Chrome's accent input workaround in Safari version 10.1. 2017-04-03 16:26:20 +01:00
Paulo Reis
20732ed571 Add Safari user-agent detection in Ace useragent lib. 2017-04-03 16:24:19 +01:00
Brian Gough
13492c7fc4 handle the \feynmandiagram command in code check
pulled from our ace repository https://github.com/sharelatex/ace
commit baeb9aff561d048b8a839683261ffdf149ecd4ef
2017-03-29 15:27:10 +01:00