Commit graph

1872 commits

Author SHA1 Message Date
Alasdair Smith
4759097e49 Merge pull request #494 from sharelatex/as-main-role
Add main role
2018-04-25 09:45:17 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4
Payment page improvments
2018-04-24 09:01:34 +01:00
Jessica Lawshe
8bedd99d73 Merge pull request #492 from sharelatex/jel-annual-buy-text
Update button text for annual plan
2018-04-23 11:35:09 -05:00
Jessica Lawshe
5d5edb7808 Button text for annual plan
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994 Don't include v1 folders in "Add to folders" list 2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309 Don't show dropdown for v1 folders 2018-04-23 11:34:10 -05:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar
Add toggle switch directive to editor toolbar
2018-04-23 10:04:12 +01:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works
it may have been broken from an angular upgrade or similar.
2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352 capitalise month and year on payment page 2018-04-16 15:11:31 +01:00
Henry Oswald
39e41681a0 change to plans[currencyCode]['symbol'] from price.currency.symbol
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
2018-04-16 12:19:55 +01:00
Alasdair Smith
671a2c9767 Make content wrapper have main role 2018-04-16 11:43:24 +01:00
Alasdair Smith
3482724679 Make ide body have main role 2018-04-16 11:33:53 +01:00
Henry Oswald
086f080ee4 add !isFormValid(simpleCCForm) back in, was used during debugging 2018-04-16 11:01:14 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144 make a seperate external error class which is used on entire payment form 2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f add highlight for bad card/cvv/mmyy number in. 2018-04-16 10:26:39 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Henry Oswald
c050791905 change ng to use show/hide
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae remove the form control, it just breaks the iframe styling 2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Jessica Lawshe
8d2c3ca6a1 Remove undefined controller 2018-04-12 11:53:31 -05:00
Jessica Lawshe
f9a56f7b37 Remove unknown experiments 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
2018-04-12 10:18:15 -05:00
Alasdair Smith
c87cb1d361 Basic styles for editor toolbar 2018-04-12 13:46:19 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
c3b2af4345 Instead of checking RT flag at compile time, adjust at run time 2018-04-06 16:59:06 +01:00
James Allen
1e8439a2c6 Fix restore of docs from old deleted docs 2018-04-06 10:30:13 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce First pass at restore end point 2018-04-06 10:30:13 +01:00
Paulo Reis
2e898bcf13 Use LESS to conditionally hide SL assets. 2018-04-03 09:01:43 -05:00
Paulo Reis
396b29f32d Conditionally load SL assets on error pages; adjust styles for OL v2. 2018-04-03 09:01:42 -05:00
Jessica Lawshe
b2c7bb9d95 Track v2 onboard events
Added events to the v2 banner to track on Metabase and Google
Analytics.
2018-04-03 08:48:11 -05:00
James Allen
216b17ab92 Fill in v2 link 2018-04-03 11:55:19 +01:00
Alasdair Smith
672305c9c2 Merge pull request #453 from sharelatex/ja-update-import-modal
Tone down and reword v1 import modal
2018-04-03 10:24:39 +01:00
Paulo Jorge Reis
bc46044f85 Merge pull request #466 from sharelatex/pr-v2-system-messages
v2 system messages
2018-03-28 15:17:26 +01:00
Paulo Jorge Reis
efee5a88bf Merge pull request #434 from sharelatex/jel-preview-unsupported
Remove expressions used for debugging
2018-03-28 15:16:49 +01:00
Paulo Reis
525deabc2b Move language subdomain message into the projects list too; make the close buttons similar. 2018-03-28 13:54:02 +01:00
Paulo Reis
b8049f3c46 Move system messages into the project list page (only). 2018-03-28 12:05:32 +01:00
Alasdair Smith
2e93e0bf23 Revert "Hotfix RT button showing up when it isn't enabled" 2018-03-28 10:13:23 +01:00
Alasdair Smith
4217b48a15 Hotfix RT button showing up when it isn't enabled 2018-03-27 20:10:03 +01:00
James Allen
21424f6bba Add placeholder read more link 2018-03-27 10:36:57 +01:00
Paulo Jorge Reis
70433e59da Merge pull request #447 from sharelatex/ja-remove-sixpack-from-history
Don't show history teaser image since it refers to SL
2018-03-27 10:10:27 +01:00
Paulo Jorge Reis
9a1a0794f3 Merge pull request #450 from sharelatex/pr-v2-favicons
V2 favicons and related assets
2018-03-27 10:09:34 +01:00
Paulo Jorge Reis
8f7228d26e Merge pull request #437 from sharelatex/pr-v2-splitters
Improve v2 splitters
2018-03-27 10:08:05 +01:00
Paulo Jorge Reis
f633276570 Merge pull request #438 from sharelatex/ja-panel-style-tweaks
Focus and spacing tweaks
2018-03-27 10:07:17 +01:00
James Allen
dc1b30dc8e Update import modal to be less scary 2018-03-26 15:11:17 +01:00
Paulo Reis
b7a11ff766 Add Overleaf favicon-related assets; configure layout.pug to show the Overleaf green when tinting the SVG favicon. 2018-03-26 14:24:53 +01:00
James Allen
d2ba1c7266 Don't show history teaser image since it refers to SL 2018-03-26 11:43:48 +01:00
Alasdair Smith
5e2f838af4 Instead of loading script directly use requirejs config so it can be lazy loaded 2018-03-23 13:52:48 +00:00
Alasdair Smith
1a0154c9ea Load rich text code from module view include instead of hard coding 2018-03-23 12:37:16 +00:00
Alasdair Smith
74099440f3 Generate webpack entry points including modules 2018-03-23 12:37:16 +00:00
James Allen
d517bae95c Merge pull request #423 from sharelatex/ja-set-google-analytics-cookie-domain
Set ga cookie domain to same as site
2018-03-23 11:52:00 +00:00
James Allen
45c853d30a Merge pull request #425 from sharelatex/ja-disable-beta-program
Disable beta program pages
2018-03-23 11:51:46 +00:00
James Allen
be3306aa0b Focus and spacing tweaks 2018-03-22 17:18:47 +00:00
James Allen
b1ca81bf2d Merge pull request #430 from sharelatex/ja-hide-v2-notification
Allow dismissing/hiding v2 and v1 banners
2018-03-22 16:33:02 +00:00
Paulo Reis
906f4899aa Only use custom togglers in v2. 2018-03-22 12:10:34 +00:00
Paulo Reis
db68134f81 Add i18n. 2018-03-22 11:48:14 +00:00
Jessica Lawshe
f37c34db19 Remove expressions used for debugging 2018-03-21 16:50:37 -05:00
Paulo Reis
3f073c2341 Rename attributes and vars for clarity 2018-03-20 16:11:09 +00:00
Paulo Reis
a3034fc79f Enable custom togglers. 2018-03-20 16:11:09 +00:00
James Allen
a023512872 Collapse panel with v1 info 2018-03-20 13:50:51 +00:00
Jessica Lawshe
89cfd98af3 Add details to analytics label 2018-03-20 08:31:35 -05:00
James Allen
3551f1453b Use flexible height v2 message panel 2018-03-20 12:15:18 +00:00
James Allen
d8ed0e5277 Allow v2 notification banner to be dismissed 2018-03-20 12:15:18 +00:00
James Allen
161d7b1d9d Disable beta program pages 2018-03-20 12:03:48 +00:00
James Allen
10aa4a29ca Set ga cookie domain to same as site 2018-03-20 11:54:03 +00:00
Alasdair Smith
408c195c6a Instead of using webpack chunk hashing, use existing system 2018-03-15 09:42:26 +00:00
James Allen
e77168d791 Don't render URL section if not linked file 2018-03-05 11:21:31 +00:00
James Allen
d4025908b7 Add in enabledLinkedFileTypes setting 2018-03-05 10:37:53 +00:00
James Allen
6848e97a82 Hook up refresh button to backend 2018-03-05 10:37:00 +00:00
James Allen
9733223840 Show linked file status in front end 2018-03-05 10:37:00 +00:00
James Allen
b1dda931f4 Add in modal for creating linked URL file 2018-03-05 10:37:00 +00:00
Paulo Reis
1b7d3917ed Update Front chat widget according to latest config changes. 2018-02-21 14:58:00 +00:00
Paulo Reis
12233a23c9 Avoid erroring if the front object is undefined. 2018-02-21 13:39:39 +00:00
Paulo Reis
978a8eae59 Move files around. 2018-02-21 13:39:39 +00:00
Paulo Reis
ef119402cf Add Front chat widget. 2018-02-21 13:39:39 +00:00
Alasdair Smith
fafbbfef87 Fix bug where cursor position wouldn't be saved when switching documents
This was caused by an underlying bug/poor optimisation where the aceEditor
directive would be reconstructed every time when switching between documents.
This wiped instances like CursorPositionManager which relies on keeping state
between doc changes.

Now the directive is only removed when switching between Ace and CM. This
prevents other potential bugs and improves performance.
2018-02-19 11:45:00 +00:00
Paulo Reis
ebad9091c7 Create class to scope main header changes (avoids overriding too much Bootstrap stuff); apply styles. 2018-02-15 11:08:12 +00:00
James Allen
a7fabb8e43 Merge pull request #321 from sharelatex/ja-recompile-tweaks
Animate toolbar for auto-compile and consolidate trigger logic
2018-02-14 09:34:16 +00:00
Brian Gough
5fef846a6c Merge pull request #323 from sharelatex/bg-translate-error-message-for-duplicate-names
add translation for new doc/folder  "already exists" error
2018-02-12 10:08:46 +00:00
Brian Gough
8e048bcf67 add translation for new doc/folder "already exists" error 2018-02-09 16:37:38 +00:00
Alasdair Smith
6088fcf82b Merge pull request #310 from sharelatex/ja-link-sharing-tweaks
Link sharing UX improvments
2018-02-09 11:23:28 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm
CodeMirror
2018-02-09 11:23:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Alasdair Smith
b9327cb2d4 Add toolbar with button to toggle rich text 2018-02-09 10:42:00 +00:00
Alasdair Smith
f5b6d3ff3e Load basic CM instance with dummy content 2018-02-09 10:38:51 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message
improved recaptcha error message
2018-02-09 10:26:33 +00:00
James Allen
bd9f30d858 Adjust icon spacing in PDF toolbar 2018-02-08 14:41:39 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Brian Gough
9224e164fe Merge pull request #315 from sharelatex/bg-validate-filenames-client
validate filenames on the client
2018-02-08 09:16:05 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
2018-02-07 14:15:13 +00:00