Commit graph

52 commits

Author SHA1 Message Date
Simon Detheridge
6c04bc8712 Merge pull request #1728 from sharelatex/jel-feature-event
Track events that display "Start Free Trial" buttons

GitOrigin-RevId: 4890d8f1da8b0cd47d7c97eab322e6048f774d30
2019-04-25 14:37:08 +00:00
Jessica Lawshe
1306de81e1 Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie
Fix review panel toggles in IE11.

GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8
2019-04-17 14:14:27 +00:00
nate stemen
bec56ccafa Merge pull request #1713 from sharelatex/ns-captchas-two
turn off captchas for project invite

GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c
2019-04-16 18:47:56 +00:00
Brian Gough
d82f679fd7 Merge pull request #1699 from sharelatex/bg-improve-logging
improve logging

GitOrigin-RevId: 0d87db74c62aa5c887412250c26f5acccdf73acf
2019-04-16 08:34:37 +00:00
Brian Gough
0eaf6db2d6 Merge pull request #1703 from sharelatex/bg-handle-send-before-rejoin
handle error gracefully when client has not yet joined project

GitOrigin-RevId: 21e337f6adbbb23a2126eaf4fa026c78178efef0
2019-04-16 08:34:31 +00:00
Brian Gough
f8066349c4 Merge pull request #1700 from sharelatex/bg-simplify-queue
simplify queuing code

GitOrigin-RevId: 9c6ce66e9a3272dea28284d3cbf1dc65c9cbc825
2019-04-09 11:01:42 +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
nate stemen
2ae27fbc6a Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas
Revert "allow toggling of captchas via setting"

GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613
2019-04-08 15:20:49 +00:00
nate stemen
5aac144d5b Merge pull request #1650 from sharelatex/ns-toggle-captchas
allow toggling of captchas via setting

GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
2019-04-08 13:53:54 +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
Simon Detheridge
61cd448832 Merge pull request #1672 from sharelatex/ns-input-autocomplete
improve autocomplete when inserting over existing arguments

GitOrigin-RevId: 8d1401cca141348dd33b965c92e120cf66350d7e
2019-03-28 15:14:35 +00:00
Brian Gough
ce556499c0 remove unnecessary comparison in queue logic
GitOrigin-RevId: 4dd8d1892ca090bd9ac93940d985cb21437f1ae1
2019-03-28 10:32:01 +00:00
Brian Gough
9a48142919 Merge pull request #1671 from sharelatex/bg-reorder-messages
queue incoming out of order updates to avoid out of sync errors

GitOrigin-RevId: ed666bedea442facc92e88227abe68fdce0aebd8
2019-03-27 14:27:54 +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
Timothée Alby
983b1a0f57 Merge pull request #1648 from sharelatex/ho-simple-client-build
Simple client build

GitOrigin-RevId: d7107104960c97bad7ec1316b5e6720a6c1017b6
2019-03-20 17:12:10 +00:00
Henry Oswald
991cbf3fee Merge pull request #1636 from sharelatex/ho-fail-lint
throw error in bash quickly on error

GitOrigin-RevId: 03df23aff25583f3af122f9a643c8faef64c5c46
2019-03-18 15:37:03 +00:00
Jessica Lawshe
a1e16c9676 Merge pull request #1600 from sharelatex/as-rttc-text-markers
Switch delete track change markers to use bookmark system to improve performance

GitOrigin-RevId: 865003ba30728f7104ad4c1b9e114998aa7d66a0
2019-03-13 16:52:11 +00:00
Brian Gough
32925f0c4e Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely
allow reserved names safely

GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
2019-03-13 11:18:06 +00:00
Timothée Alby
5b5b06307a Merge pull request #1596 from sharelatex/ja-more-client-error-logging
Increase the number and type of events we log

GitOrigin-RevId: 5384beb86f095d673deebe7b17d76668137fc912
2019-03-11 11:08:20 +00:00
Timothée Alby
b86a949f50 Merge pull request #1485 from sharelatex/cmg-comments-track-changes
Add comments highlighting to rich text track changes

GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5
2019-03-11 11:08:10 +00:00
Simon Detheridge
97145847ef Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge
When a document is updated externally via git-bridge, don't show warning

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
2019-03-11 11:04:35 +00:00
Simon Detheridge
f84e94dc88 Merge pull request #1533 from sharelatex/as-fix-extra-bracket
Fix autocomplete inserting extra brace when completing command with optional argument

GitOrigin-RevId: cb01eb0b7df400997e5f7dc25a92ef7660689709
2019-03-11 11:00:36 +00:00
Brian Gough
15a6169a06 Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind
Revert "Enable search keybinding globally in editor"

GitOrigin-RevId: 423bebb48a237c8bda935bb6cb70c5cf953b7015
2019-03-11 10:58:47 +00:00
Chrystal Maria Griffiths
b1c40d2c58 Merge pull request #1501 from sharelatex/cmg-anonymous-display-name
Label only truly anonymous users as anonymous

GitOrigin-RevId: c33a5c0584bd8a0603921fcf1579204b5fcac009
2019-02-15 13:33:33 +00:00
Brian Gough
1940e9b061 Merge pull request #1523 from sharelatex/bg-avoid-unwanted-fallback-on-network-errors
avoid fallback to old websocket if initial connection succeeded

GitOrigin-RevId: 1b3f38d0a0f4889b9a15fa071de90a0a9c9a5699
2019-02-14 14:39:19 +00:00
Brian Gough
00cdc008d5 Merge pull request #1508 from sharelatex/bg-add-websocket-fallback-option
add fallback to siteUrl if websocket fails

GitOrigin-RevId: fd866d17475cb974e4158ac7a89e972c66f0dd97
2019-02-13 09:20:35 +00:00
Timothée Alby
f01f80c2bb Merge pull request #1505 from sharelatex/ns-fix-regex
remove unecessary $ from regex

GitOrigin-RevId: 5998536f71298daeab2845d070150451bbb4a858
2019-02-12 15:47:47 +00:00
Brian Gough
c51461da09 Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url
allow setting separate wsUrl for websockets

GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
2019-02-06 10:20:36 +00:00
Chrystal Maria Griffiths
09444a5e42 Merge pull request #1456 from sharelatex/sk-references-refresh
When refreshing linked file, if it's from mendeley/zotero, re-index

GitOrigin-RevId: 4f9916d0682335e1477674b46c1133a4a9d0e6af
2019-02-04 16:24:40 +00:00
Chrystal Maria Griffiths
d1150ec13d Merge pull request #1461 from sharelatex/ns-escape-double-backslash
fix double backslash not being escaped

GitOrigin-RevId: 901d5f1bfdf1434edcef4e28c5c15a848b40134b
2019-02-04 16:24:20 +00:00
Chrystal Maria Griffiths
11b6ae0982 Merge pull request #1457 from sharelatex/ns-tikz-highlight
Better TikZ support

GitOrigin-RevId: 963853cea4e3bdd9046b5b44b5719cc1a82ece5f
2019-02-04 16:24:15 +00:00
Chrystal Maria Griffiths
210e2700a9 Merge pull request #1467 from sharelatex/as-global-search-keybind
Enable search keybinding globally in editor

GitOrigin-RevId: 8e36dbe44ffd385d212bf9dabb549fd04b84a428
2019-02-04 16:24:09 +00:00
Chrystal Maria Griffiths
d9692b7f91 Merge pull request #1168 from sharelatex/cmg-range-prototype
Rich text track changes pt. 1 view changes

GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
2019-01-30 14:07:06 +00:00
James Allen
286dd564e2 Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection
Fix history default file selection and bug when comparing with version zero

GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
2019-01-29 10:12:17 +00:00
Douglas Lovell
59d4bd6182 Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling'
GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2
2019-01-24 12:12:56 +00:00
Ersun Warncke
ef9875c5a6 Merge pull request #1427 from sharelatex/ew-recaptcha
add recaptcha validate middleware to reg and add recaptcha v3

GitOrigin-RevId: 35375b7887832b40bc570cf848cab9c62243443b
2019-01-21 17:27:54 +00:00
Timothée Alby
7d5f3537df Merge pull request #1414 from sharelatex/as-fix-pdf-link-referrer
Fix links in PDF to have noreferrer

GitOrigin-RevId: fa14e552b0d4947781c88ce22fc70696b04cf8a4
2019-01-17 15:15:49 +00:00
Shane Kilkelly
539f2c3d1a Merge pull request #1385 from sharelatex/sk-fix-references-auto-parse
When we upload or create a bib file, re-index and load citations

GitOrigin-RevId: 2dbf73e8d33147a76e22db7519cd18b165598ca9
2019-01-17 10:11:38 +00:00
Chrystal Maria Griffiths
366dbbd54f Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff
Make comments cancel when you cancel them on firefox

GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
2018-12-19 10:38:35 +00:00
Paulo Jorge Reis
4563ce864c Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes
History compare labels fixes

GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
2018-12-18 11:48:49 +00:00
Paulo Reis
4ff98f0237 Import history compare controller.
GitOrigin-RevId: 61d9a3f340703b07046bb6d7a6d67905befd6faa
2018-12-17 12:54:07 +00:00
Paulo Jorge Reis
d5c651c132 Merge pull request #1276 from sharelatex/pr-fix-history-v1
Undo rename and removal of the v1 history list controller.

GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
2018-12-17 12:16:20 +00:00
Paulo Jorge Reis
217bc180ac Merge pull request #1251 from sharelatex/pr-history-labels-compare
History labels compare

GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
2018-12-17 10:10:48 +00:00
Douglas Lovell
aae0484458 Merge branch 'master' into dcl-i1207
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
2018-11-30 13:24:27 +00:00
Douglas Lovell
ed3147a58f Allow open from template button when lacking source
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
2018-11-30 13:24:23 +00:00
James Allen
1070cd36bb Merge pull request #1163 from sharelatex/ja-zotero
Add support for Zotero linked files

GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
2018-11-28 11:35:27 +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
Simon Detheridge
b39cdbc874 Merge pull request #1116 from sharelatex/as-fix-history-error
Fix error thrown when viewing history with non-default font size

GitOrigin-RevId: f4f561bfe25537663cddf79d1867393bd209dd38
2018-11-07 10:37:18 +00:00