Commit graph

3953 commits

Author SHA1 Message Date
Jessica Lawshe
625b4c9339 Merge pull request #2216 from overleaf/jel-saml-beta-account-settings
Allow SAML beta testing on Account Settings

GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
2019-10-09 13:13:40 +00:00
Jessica Lawshe
5c918bed94 Adding an institution email that must be linked
GitOrigin-RevId: 9ba42a07fb386275cf6d81a7d4b91a7f974faf15
2019-10-08 13:29:17 +00:00
Timothée Alby
17babc034f Merge pull request #2204 from overleaf/ta-recurly-countries
Update Countries To Use Recurly's Countries List

GitOrigin-RevId: e6465af0bf4574f0bd45fc790f154d7a5ec1d889
2019-10-07 08:46:47 +00:00
Jessica Lawshe
ea0270dbdd Merge pull request #2168 from overleaf/pr-restrict-main-file-options
Restrict main file options based on extension.

GitOrigin-RevId: f7d7a61c0454621dd8bc6ab5edce8a89721018ea
2019-10-03 14:34:41 +00:00
Jessica Lawshe
86d844baf2 Merge pull request #2193 from overleaf/jel-account-settings-processing
Add processing message to affiliation UI

GitOrigin-RevId: 2ceb9c7815da778f832715cac5c00bac3a32c127
2019-10-02 14:22:20 +00:00
Simon Detheridge
c1f43ad60e Merge pull request #2183 from overleaf/em-plans-faq
Allow linking inside plans FAQ invoice answer

GitOrigin-RevId: 20fb07f0f8fafee65efaa1f4467013cccc7a154d
2019-10-01 12:10:06 +00:00
Eric Mc Sween
039b5eaba0 Merge pull request #2167 from overleaf/jel-saml-account-settings-layout
Account settings layout for institution SSO

GitOrigin-RevId: d9c9e5eeb3b4a215456b0f5294139c1b8d4968c3
2019-09-30 13:36:41 +00:00
Simon Detheridge
7aae089e35 Merge pull request #2171 from overleaf/ta-console-fix
Fix Invisible JS Errors

GitOrigin-RevId: 7d50fcc1517d148cc70744b1f23b3c5171d2ea62
2019-09-25 14:48:34 +00:00
Simon Detheridge
89abb5b609 Merge pull request #2160 from overleaf/pr-persist-contact-modal-details
Persist contact modal form info

GitOrigin-RevId: d7bf656015694e36a717e89de0879233c43d63a3
2019-09-25 14:48:12 +00:00
Simon Detheridge
e5e28c7fb1 Merge pull request #2158 from overleaf/pr-fix-autocomplete-opens-for-collaborators
Ignore remote changes for autocompletion purposes.

GitOrigin-RevId: df0541f1f7cb8527263988f60ca5b80510f8971e
2019-09-25 14:48:05 +00:00
Brian Gough
6c2d06c78b Merge pull request #2173 from overleaf/bg-fix-track-changes-adapter-extensions
avoid exception for missing marker ids

GitOrigin-RevId: 47faa35450cafef3c55a9b63787df1d9df9f1eaa
2019-09-25 13:03:29 +00:00
Simon Detheridge
deaf76be39 Merge pull request #2135 from overleaf/sk-hide-info-readonly-token-access
Restrict information and features for token-read-only users of a project

GitOrigin-RevId: 98512fb9a916f430fd635fd5634c37799476010d
2019-09-18 10:14:39 +00:00
Jessica Lawshe
7c533fa5fb Error handling when missing SAML data
When logging in and linking, if session data is missing show a more specific error message.

GitOrigin-RevId: 32d733f7478180bcce18e1f466ae10255c763997
2019-09-17 12:33:22 +00:00
Timothée Alby
561d14bbb6 Merge pull request #2125 from overleaf/spd-editor-reconnect-improvements
Track connection state in ConnectionManager and improve retry logic

GitOrigin-RevId: b81b8376f7210e89e0dc102e68bdf2092c1ae8ad
2019-09-10 14:44:24 +00:00
Simon Detheridge
b57adcf02a Merge pull request #2107 from overleaf/spd-max-recon-interval
Shrink MAX_RECONNECT_GRACEFULLY_INTERVAL to 45 seconds

GitOrigin-RevId: f84983b772d0dde5fc76d9439a3424cefb66ec06
2019-09-03 15:25:32 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
2019-09-03 15:25:01 +00:00
Chrystal Maria Griffiths
c1f8ac8de1 Merge pull request #2090 from overleaf/hb-fix-daterangepicker
Cleanup Metrics Daterange Picker

GitOrigin-RevId: ae5ef24c5b7f007f5bdd38ecebea2d0830611b71
2019-08-27 10:49:57 +00:00
Timothée Alby
03460ba229 Merge pull request #2020 from overleaf/ta-recurly-sca
SCA Integration

GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
2019-08-22 12:10:46 +00:00
Eric Mc Sween
ced31d6131 Merge pull request #2055 from overleaf/jel-sso-layouts
Layouts for login, register, institutional log in, & linking pages

GitOrigin-RevId: af0ea36e3bd6e39b0a6305bf0882c296eb931d5b
2019-08-20 12:59:41 +00:00
Eric Mc Sween
4d69b63993 Merge pull request #2070 from overleaf/pr-fix-light-drag-and-drop
Change hover highlights and draggable helper when moving files

GitOrigin-RevId: b7a6e9cd1484115fa5fbf1ed40127a6aba525cbd
2019-08-20 12:59:30 +00:00
Brian Gough
b591c950e0 Merge pull request #2077 from overleaf/bg-fast-reconnect-for-websocket
handle 'retry' messages from realtime

GitOrigin-RevId: a896b491f978e37a4afef67e434795b0f7cd301c
2019-08-14 15:19:35 +00:00
Eric Mc Sween
72ea7eb5f0 Merge pull request #1992 from overleaf/pr-history-file-selection-improvements
History file selection and scrolling improvements

GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788
2019-08-13 12:49:32 +00:00
Alasdair Smith
48481e431e Merge pull request #2034 from overleaf/as-upgrade-babel
Upgrade babel to v7

GitOrigin-RevId: 1626f0d3343a5cb32a71dba5a8f32657b2d7237c
2019-08-09 09:54:37 +00:00
Eric Mc Sween
523b5b2114 Merge pull request #2046 from overleaf/hb-detect-changes-pre-export
Do one compile on toggle to autocompile

GitOrigin-RevId: 21776835c691bec9a1f80a7c0d4e651cc8c59dac
2019-08-06 15:33:07 +00:00
Eric Mc Sween
83495f4559 Merge pull request #2037 from overleaf/hb-detect-changes-pre-export
Detect for uncompiled changes before export

GitOrigin-RevId: a8b044c79ea4a6678388130d5ce77a05693c2d60
2019-08-06 12:34:37 +00:00
Brian Gough
2e20975f53 Merge pull request #2042 from overleaf/bg-fix-applyCMToShareJS-offsets
fix startPos calculation for applyCMtoShareJs

GitOrigin-RevId: 642dc1fd2d7b2a1b34031900c137ffc10f94ddeb
2019-08-06 07:51:57 +00:00
Brian Gough
8237319683 Merge pull request #2041 from overleaf/bg-enforce-consistency-check
enforce consistency check for editors

GitOrigin-RevId: 2b8abed4519476be52563cbfecb799858f6dad0c
2019-08-06 07:51:52 +00:00
Alasdair Smith
de60c3d25f Merge pull request #2036 from overleaf/jel-footer-link
Support full URLs in link to tabs within the same page

GitOrigin-RevId: 50f66c57b2b3e4771b9b9620af9417822956be0a
2019-08-05 14:48:08 +00:00
Alasdair Smith
efbcfd10be Merge pull request #2030 from overleaf/jel-card-z-index
Remove card position styling

GitOrigin-RevId: 298998f5f3032064b7bce8016cab96a54597c2b3
2019-08-02 08:59:17 +00:00
Timothée Alby
7785c7b59e Merge pull request #2029 from overleaf/ta-build-main-recurly-3
Load Recurly JS Separately

GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
2019-07-31 15:44:44 +00:00
Timothée Alby
ef9b487a60 Merge pull request #2019 from overleaf/jel-remove-oauth-migration
Remove unused OAuth link/unlink migration

GitOrigin-RevId: 20fce5a714f5897a1b5a93a65156f5368f2d1c65
2019-07-31 08:33:37 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
2019-07-31 08:33:31 +00:00
Jessica Lawshe
0a2a32120f Use v2 data for OAuth providers
GitOrigin-RevId: 09df3253c283b3196bc48a0440e9ea5f1eb20c9c
2019-07-23 10:59:53 +00:00
Alasdair Smith
827814175f Remove sixpack (#1974)
* Remove unused sixpack AB test

* Remove unused sixpack AB test

* Remove unused sixpackDomain global

* Remove unused Sixpack file

* Remove sixpack from frontend

* Remove unused sixpack-client package

GitOrigin-RevId: cdd4acf91cb045db93485f09dcb5ec63e43d01dc
2019-07-18 14:35:29 +00:00
Henry Oswald
032ef02a03 Merge pull request #1990 from overleaf/ho-sharelatex-overleaf-rename
change name of site in maintenance popup from SL to OL

GitOrigin-RevId: 2adf3b76e4ac16d2137a3fd13239bd78e178a8da
2019-07-18 13:34:46 +00:00
Eric Mc Sween
65849456d0 Merge pull request #1925 from overleaf/as-babel-plugin-angular-annotate
Enable Angular "annotations" via Babel plugin

GitOrigin-RevId: 343610025e3ba791fb284a0b696a1ea33e125a80
2019-07-16 09:22:21 +00:00
Jessica Lawshe
e3c6f0f74a Merge pull request #1930 from overleaf/hb-expand-publish-menu-text-box-size
Increase size of space for text in publish menu list

GitOrigin-RevId: 4c719155db75f2a1a126917d639caeaebd4620e8
2019-07-11 15:35:41 +00:00
Jessica Lawshe
ed6891e66d Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check
Remove checks for `force-import-to-v2`

GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
2019-07-11 15:35:36 +00:00
Eric Mc Sween
62a0c57021 Merge pull request #1927 from overleaf/as-fix-hard-coded-module-import
Fix hard coded module import

GitOrigin-RevId: b41dbe5fc5c65a238f0a482023f19b023f6dc89f
2019-07-04 12:51:32 +00:00
Eric Mc Sween
f7b4ae1e1a Merge pull request #1938 from overleaf/jel-login-line-height
Only apply custom line-height on login page to <hr/>

GitOrigin-RevId: 43f8be3847de93f706fa04e5d09e19ff33fc0212
2019-07-04 12:51:27 +00:00
Eric Mc Sween
545b57d6be Merge pull request #1939 from overleaf/jel-no-search-results
Show message when there are no learn wiki search results

GitOrigin-RevId: cb1600baeb4a9860575385be78a825cb3942903a
2019-07-04 12:51:22 +00:00
Simon Detheridge
67c0a3c2a4 Merge pull request #1933 from overleaf/spd-leave-project-without-tags
Fix crash when leaving a project with no tags

GitOrigin-RevId: fcbbea5907d3e967785e3f21de039f02bc2123c0
2019-07-02 09:16:28 +00:00
Timothée Alby
c86910a5ef Merge pull request #1912 from overleaf/ta-invite-404
Better Handling of Invites not Found

GitOrigin-RevId: 6fddd1dca772bb4b5108fef433044720fb78c4e9
2019-07-01 14:06:49 +00:00
Miguel Serrano
0e52453931 Merge pull request #1908 from overleaf/as-remove-tags-on-leave
Remove tags when leaving project

GitOrigin-RevId: 833412264d09348b02f57fb60cd0f07d81cfc037
2019-06-27 10:32:12 +00:00
Miguel Serrano
dc54a261e3 Merge pull request #1907 from overleaf/as-fix-tag-project-count
Fix tag project count

GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
2019-06-27 10:32:01 +00:00
Brian Gough
30d8247d54 Merge pull request #1911 from overleaf/bg-block-non-bmp-characters
block null and non-BMP characters in Ace

GitOrigin-RevId: cdeaffc88e128a62463229d5cb55143028f23112
2019-06-26 11:07:20 +00:00
Simon Detheridge
bd3f59c22a Merge pull request #1895 from overleaf/jel-oauth-db-flip
Add setting var for OAuth data source

GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
2019-06-25 11:22:17 +00:00
Simon Detheridge
aa5f45e128 Merge pull request #1891 from overleaf/revert-1889-as-fix-cached-icons
Switch back to better icon naming scheme

GitOrigin-RevId: f41e01b2fec2d3af35603ef6b6120f4cafa1b981
2019-06-25 11:22:08 +00:00
Simon Detheridge
6fc507aea3 Merge pull request #1883 from overleaf/as-remove-rttc-beta-program
Move rich text track changes out of the beta program

GitOrigin-RevId: 4b23a42f3b2ef53012b5c6cca310fe82de5d9a0c
2019-06-21 13:58:52 +00:00
Simon Detheridge
6e238a8345 Merge pull request #1898 from overleaf/as-tags-archived-projects
Clean up decaffeinated project list code

GitOrigin-RevId: ae2408b8768eb8be02b4cf80be5400bb707fff66
2019-06-21 13:58:46 +00:00
Simon Detheridge
c30e83a4ed Merge pull request #1877 from overleaf/em-filestore-range-request
Get file size before truncating files for preview

GitOrigin-RevId: 0822691d75bd8bfe3d6cfd23f9ca4b1c3be20585
2019-06-20 11:30:50 +00:00
Simon Detheridge
1e14f75e08 Merge pull request #1872 from overleaf/hb-autocomplete-braces
Autocomplete braces bugfixes

GitOrigin-RevId: 9b3af30b71b85cf95288b0388c9af7792b87ca80
2019-06-20 11:30:44 +00:00
Alasdair Smith
350e2ac38f Merge pull request #1886 from overleaf/as-upgrade-ace-1.4.5
Upgrade to Ace v1.4.5

GitOrigin-RevId: 7ab7ba24c0bfc927567fbd4196e05a1c3f26d283
2019-06-20 09:21:27 +00:00
Alasdair Smith
d6651183b5 Merge pull request #1889 from overleaf/as-fix-cached-icons
Temporarily rename icons to bust cache

GitOrigin-RevId: 4dc496bbc2f61de1051068f4cbb7ded982fc999f
2019-06-19 09:53:48 +00:00
Alasdair Smith
f83ab4ec3b Merge pull request #1767 from overleaf/as-color-contrast
Improve colour contrast

GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976
2019-06-19 09:01:43 +00:00
Simon Detheridge
3ce74a3877 Merge pull request #1868 from overleaf/bg-sanitise-error-for-google-analytics
sanitise error sent to google analytics

GitOrigin-RevId: 6307b7a54f18b9e8a1da31f45a5a148e1321db62
2019-06-18 01:56:02 +00:00
Simon Detheridge
08861187d5 Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder
display warning if synctex fails to return filename

GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d
2019-06-17 15:14:31 +00:00
Brian Gough
c242a8d4c1 Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout
enable sharejs hash checking

GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
2019-06-13 08:47:52 +00:00
Eric Mc Sween
9ca3b68efc Merge pull request #1858 from overleaf/em-fix-file-preview
Fix a typo that breaks file preview

GitOrigin-RevId: d7aa7e8090bfe36414455741c3dd970bc6835d92
2019-06-11 18:35:28 +00:00
Eric Mc Sween
0cc4f6d329 Merge pull request #1857 from overleaf/em-fix-linked-files
Revert "Decaffeination fixes"

GitOrigin-RevId: e36e6c2b0f5430cfbd1d1bfac8de055b4db10b77
2019-06-11 11:45:33 +00:00
Eric Mc Sween
4dc1e97d27 Merge pull request #1844 from overleaf/em-no-pdf-eps-previews
Do not try to preview PDF or EPS files

GitOrigin-RevId: fd4fcd1c57573e9bc5fa1eed74e3430188482be4
2019-06-07 16:16:32 +00:00
Jessica Lawshe
81c3f1919e Merge pull request #1818 from overleaf/jel-trial-impression-timeout
Send timeout trial impression event

GitOrigin-RevId: 6931c3063c094cff843ffa7fac5a513af8f6b8f5
2019-06-06 15:48:48 +00:00
Jessica Lawshe
0fe129f3f5 Merge pull request #1812 from overleaf/jel-trial-impression-history
Send history trial impression event

GitOrigin-RevId: 7256738eda99bae2b2be11459e5eba164afdc2f4
2019-06-06 15:48:37 +00:00
Timothée Alby
2f14426876 Merge pull request #1839 from overleaf/ns-add-vref
add vref

GitOrigin-RevId: aa311141873f818830dcfa5ea63f0420549b5dd9
2019-06-04 11:24:11 +00:00
Timothée Alby
14cbeef31d Merge pull request #1806 from overleaf/ta-use-billing-name
Use Billing Name when Creating Subscription

GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
2019-06-04 11:23:55 +00:00
nate stemen
113670f864 Merge pull request #1838 from overleaf/ns-ref-highlighting
highlight arguments of known ref commands

GitOrigin-RevId: 6c95ff5a973c28788c569fe71da024692df2d69e
2019-06-03 18:31:54 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
2019-05-28 15:51:27 +00:00
Alasdair Smith
56839ae6fb Merge pull request #1797 from overleaf/msm-disable-spellcheck-on-readonly
Disabled spell checker on read-only

GitOrigin-RevId: fff76f8fae5ea9c3035902b2abf1c7c54ad556bf
2019-05-28 11:25:33 +00:00
Alasdair Smith
4e8facf3cc Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow
History filenames overflow + full history for admins

GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c
2019-05-28 11:25:17 +00:00
Simon Detheridge
d999cd5030 Merge pull request #1810 from overleaf/jel-sso-unlink
Include CSRF token in POST request

GitOrigin-RevId: 9371993971e81ad3f7301427d1a5ed7be5bb1a01
2019-05-28 09:33:37 +00:00
Simon Detheridge
45f3f74d0b Merge pull request #1811 from overleaf/ns-code-check-fail-invisible
check for light theme to set autocompile status color

GitOrigin-RevId: d77cbb965ccb0bd05cd237717e29ebe0e1d68681
2019-05-28 09:33:22 +00:00
Alasdair Smith
a3894ac9b4 Merge pull request #1794 from overleaf/as-upgrade-ace-1.4.4
Upgrade Ace to v1.4.4

GitOrigin-RevId: 26681bcf255537f8eb09fa0ac1c98009cf964496
2019-05-23 08:49:13 +00:00
Timothée Alby
d86abf49e6 Merge pull request #1729 from overleaf/ta-show-last-modified
Show LastUpdatedBy on Dashboard

GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
2019-05-21 13:39:29 +00:00
Timothée Alby
759392047d Merge pull request #1789 from overleaf/as-fix-reference-search-cut-off
Fix reference search hint cutting off last suggestion

GitOrigin-RevId: a8b3e32e1173b27602b0576c1b00afcc1cbf7683
2019-05-21 13:39:23 +00:00
Jessica Lawshe
8c2da6afab Merge pull request #1673 from overleaf/jel-cms-table-style
Styling for features table

GitOrigin-RevId: a8c37cf9bcda7c93d3d910036cd08f3cba06209e
2019-05-20 16:10:56 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
2019-05-20 16:10:46 +00:00
Paulo Jorge Reis
3486f61b5b Merge pull request #1784 from overleaf/revert-1782-pr-as-ace-diagnostics
Revert "Ace diagnosis"

GitOrigin-RevId: db782b4df6d3f2d773eb063b6b1e498875126dfb
2019-05-17 10:19:07 +00:00
Alasdair Smith
1ec05a0fab Merge pull request #1782 from overleaf/pr-as-ace-diagnostics
Ace diagnosis

GitOrigin-RevId: 5a4c1d49887594686f810fedc06266bdbb7175c5
2019-05-17 08:55:44 +00:00
Brian Gough
c7ce214f8c Merge pull request #1770 from overleaf/ns-tags-and-tikz
handle math in \tag* and \tikz commands

GitOrigin-RevId: 6a71100409f405d58e04d12403acd3f4f24360c7
2019-05-15 12:41:26 +00:00
Jessica Lawshe
77de78e70b Merge pull request #1771 from overleaf/jel-new-file-controller-scope
Pass in missing scope to NewFileModalController

GitOrigin-RevId: 41de974c8ff93bb41d42ef2d17e0c0732ba12ffb
2019-05-14 15:58:49 +00:00
Jessica Lawshe
7763427cea Merge pull request #1761 from overleaf/jel-trial-impression-collab
Send event on collaborator trial impression event

GitOrigin-RevId: f19feaf2a00ef5728d7a190f0736efe76e417230
2019-05-14 13:12:38 +00:00
Jessica Lawshe
59cce6b52e Merge pull request #1752 from overleaf/jel-trial-impression-events
Send event on mendeley/zotero trial impression

GitOrigin-RevId: a308afd063e11308297be48933ad308d9120c327
2019-05-14 13:12:32 +00:00
Alasdair Smith
dc09095ae7 Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf
Resize Ace when toggling PDF view

GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
2019-05-10 08:56:21 +00:00
Alasdair Smith
51a4c33e91 Merge pull request #1748 from overleaf/hb-fix-change-plan-vat-display
Use two decimal places for inc-vat change plan prices

GitOrigin-RevId: 6dd46c42693345ba0aaca5cfe061bc907a112a68
2019-05-09 13:03:09 +00:00
Alasdair Smith
36035e8ccd Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3
Pass build-id when downloading pdf

GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b
2019-05-08 09:09:11 +00:00
Alasdair Smith
cbab60476a Merge pull request #1747 from overleaf/hb-graphics-autocomplete-additions
Make image autocomplete file type case insensitive

GitOrigin-RevId: 8a39a600340d8cea7bbfda08d8cc95343c8002ad
2019-05-08 09:09:05 +00:00
Alasdair Smith
9b94b32b83 Merge pull request #1751 from overleaf/as-fix-cite-auto-complete
Don't show shortened arguments in cite autocomplete

GitOrigin-RevId: 75e86e1b97adb7632f30960a50ad775511868d5b
2019-05-08 09:08:57 +00:00
Paulo Jorge Reis
d613d7e1a2 Merge pull request #1647 from sharelatex/as-upgrade-ace-1.4.3
Upgrade Ace to v1.4.3

GitOrigin-RevId: 810350080a6b89fd9817ebcacde7e9817097d99a
2019-05-06 09:02:03 +00:00
Simon Detheridge
16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags
Color-code tags/folders

GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
2019-04-25 14:37:32 +00:00
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
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
2019-04-25 14:37:15 +00:00
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
Timothée Alby
54186d9db1 Add linked accounts section to user settings page (#1705)
Add linked accounts section to user settings page

GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
2019-04-23 14:34:55 +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
Paulo Jorge Reis
f2fbdcc078 Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link
Revert "Add survey link in the projects list sidebar."

GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2
2019-04-17 10:45:15 +00:00
Paulo Jorge Reis
8b7b49f72a Merge pull request #1693 from sharelatex/cmg-clone-owners
Return new project data from api when cloning

GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786
2019-04-17 10:26:11 +00:00
Paulo Jorge Reis
5a6cdf0999 Merge pull request #1679 from sharelatex/cmg-dashboard-owner
Fix ordering by Owner on the dashboard

GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767
2019-04-17 10:26:03 +00:00
Paulo Jorge Reis
6c6bc1216a Merge pull request #1670 from sharelatex/pr-fix-contrast-issues
Fix contrast issues (and others)

GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec
2019-04-17 10:25:55 +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
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