Shane Kilkelly
677b3c759d
Remove old controller
2018-09-19 09:28:59 +01:00
Shane Kilkelly
843f1c6b35
Move AccountMergeEmailController to integration module
2018-09-19 09:28:59 +01:00
Shane Kilkelly
54a5c563fb
Address feedback
2018-09-19 09:28:59 +01:00
Shane Kilkelly
b0e4b12714
Finish off the copy of the account-merge-finish page
2018-09-19 09:28:59 +01:00
Shane Kilkelly
5e17dfd1cb
Also add the final email to the array of emails on the account
2018-09-19 09:28:59 +01:00
Shane Kilkelly
efb6018246
Add a rate-limit to the email-confirm endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26
Roughly working account-merge-by-email callback endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
958c7a19b6
Add a skeleton of a callback endpoint for merging accounts via email
2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135
WIP: add email-based account merge flow to ShareLaTeX
2018-09-19 09:28:59 +01:00
Alasdair Smith
bdcc25805e
Add route to handle /teams similar to v1
2018-09-18 17:14:37 +01:00
Brian Gough
02854274a7
2018-09-18 14:09:05 +01:00
hugh-obrien
277225d8de
use existing left sidebar controller for affiliation cta
2018-09-18 13:06:26 +01:00
Timothée Alby
b16cffe587
Merge pull request #932 from sharelatex/as-redirect-query-string
...
Support passing through query params in redirects
2018-09-18 12:35:21 +01:00
Timothée Alby
b6925647ef
Merge pull request #922 from sharelatex/ta-forbid-null-query
...
Prevent Calls to UserGetter.getUser with Null Query
2018-09-18 12:24:19 +01:00
Timothée Alby
7981d867e8
Merge pull request #924 from sharelatex/ta-sign-in-v1
...
Change Links to v1 to Sign User In
2018-09-18 12:24:08 +01:00
Alasdair Smith
7e358ab318
Support passing through query params
2018-09-18 11:34:04 +01:00
hugh-obrien
2d40c3d21a
Use existing notification styling
2018-09-18 11:01:10 +01:00
hugh-obrien
f76ff55b6f
email alert styling
2018-09-18 10:54:20 +01:00
hugh-obrien
e343c04423
add notification to confirm unconfirmed emails
2018-09-18 10:54:20 +01:00
hugh-obrien
39f580d6ba
fixing broken exports test
2018-09-18 10:13:33 +01:00
hugh-obrien
6f00d1f45a
send required export fields for s1 submission
2018-09-18 10:05:35 +01:00
Jessica Lawshe
203c005f26
Merge pull request #928 from sharelatex/jel-content-updates
...
Link mixin paths and universities list styling
2018-09-17 13:16:52 -05:00
Jessica Lawshe
6fc7468b02
Thousands of templates
2018-09-17 10:47:57 -05:00
Jessica Lawshe
4f5c12e9ac
More specific group contact controller name and email subject
...
This form is only used on the group contact modal.
2018-09-17 10:47:57 -05:00
Jessica Lawshe
08a9534f8c
Vertically align universities list items
2018-09-17 10:45:59 -05:00
Jessica Lawshe
66bfbce45f
Correct link mixin paths
2018-09-17 09:46:34 -05:00
James Allen
15103ac894
Support the same URL with multiple methods in redirects
2018-09-17 15:38:58 +01:00
James Allen
83a1039b7e
Add acceptance tests for RedirectManager
2018-09-17 15:38:58 +01:00
James Allen
40f08d1592
Add additional functionality to RedirectManager
2018-09-17 15:38:45 +01:00
Chrystal Maria Griffiths
784984dd78
Merge pull request #923 from sharelatex/cmg-share-modal
...
Show share button for collaborators
2018-09-17 15:19:44 +01:00
Alasdair Smith
42cef8e393
Merge pull request #920 from sharelatex/mm-gallery-exports
...
Add gallery fields to export controller and handler
2018-09-17 09:42:26 +01:00
Alasdair Smith
e1e7091f30
Merge pull request #905 from sharelatex/as-project-intelligent-redirect
...
Intelligently redirect to v1 if no v2 project found
2018-09-17 09:40:52 +01:00
Jessica Lawshe
c8b803681e
Set max-width for <video> on CMS pages
2018-09-14 10:48:56 -05:00
Jessica Lawshe
bcd465a35d
Allow <video> and <source> in sanitized HTML
2018-09-14 10:36:46 -05:00
Tim Alby
09c92c0b69
don't encode /
2018-09-14 16:09:24 +01:00
Tim Alby
2e4d3d7aab
change links to v1 to sign user in first
2018-09-14 14:26:16 +01:00
Tim Alby
41b92d4647
prevent calls to UserGetter.getUser with null query
2018-09-14 12:46:00 +01:00
Chrystal Griffiths
6334066d2d
Merge branch 'master' into cmg-share-modal
2018-09-14 12:09:10 +01:00
Chrystal Griffiths
915bd18058
Read-only collaborators table
2018-09-14 11:47:18 +01:00
Michael Mazour
79dc415064
Slightly refactor exports controller body handling
...
1. Move all body parsing together
2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.
2018-09-14 11:02:51 +01:00
Michael Mazour
10fcdd6daf
Add optional gallery fields to export request
...
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
2018-09-14 11:02:51 +01:00
Chrystal Griffiths
3b43cf9075
Slight copy change
2018-09-13 17:57:11 +01:00
Tim Alby
0051e59309
remove unused call to UserGetter.getUser
2018-09-13 17:39:30 +01:00
Chrystal Griffiths
b51fc01bde
Remove temporary solution
2018-09-13 17:17:18 +01:00
James Allen
ef11161ddb
Revert "Record and show last modified by user for projects"
2018-09-13 14:00:30 +01:00
hugh-obrien
26defd0833
reword CTA
2018-09-13 13:54:43 +01:00
hugh-obrien
8697edc149
replace profile completion CTA with affiliationa adding CTA
2018-09-13 12:34:18 +01:00
Michael Mazour
1f976a0e04
Improve ExportsController unit tests
...
Test the params the handler's called with.
2018-09-13 12:24:03 +01:00
Chrystal Griffiths
57ac858004
Style the notice
2018-09-13 12:19:44 +01:00
Alasdair Smith
f37040e4a4
Only redirect if has overleaf setting
2018-09-13 12:09:19 +01:00
Alasdair Smith
8a969d1c25
Redirect directly from controller instead of via handler
2018-09-13 12:09:19 +01:00
Alasdair Smith
0c658127ef
Add tests for ProjectNotTokenAccessError
2018-09-13 12:09:19 +01:00
Alasdair Smith
893e2dd235
Add test for location of redirect to v1
2018-09-13 12:09:19 +01:00
Alasdair Smith
9d600afdf8
Fix failing tests for token access
...
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
2018-09-13 12:09:19 +01:00
Alasdair Smith
cf8ae7c28c
Add test for redirecting to v1 if project unimported
2018-09-13 12:09:19 +01:00
Alasdair Smith
24495f3340
Also redirect not found read tokens to v1
2018-09-13 12:09:19 +01:00
Alasdair Smith
e0ce988d32
Intelligently redirect to v1 if no v2 project found for token
2018-09-13 12:09:19 +01:00
James Allen
5dbebc0693
Translate 'by'
2018-09-13 10:38:52 +01:00
James Allen
ab871b9ba7
Fix tabs vs spaces
2018-09-13 10:38:52 +01:00
James Allen
dd4b85b809
Combine v1 and v2 projects into item.pug
2018-09-13 10:38:52 +01:00
James Allen
225d30ffd2
Add missed lines from rebase
2018-09-13 10:38:52 +01:00
James Allen
c072961183
Update project-list list to a table and show last updated user
2018-09-13 10:38:52 +01:00
James Allen
ab10336110
Record last update time and user from project-history
2018-09-13 10:38:52 +01:00
Hugh O'Brien
24c479e984
Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
...
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Jessica Lawshe
75a6b8f32b
Move custom tab styling to file
...
Custom tab styling was nested within a portal class. This styling is also needed on the CMS pages.
2018-09-12 16:34:38 -05:00
Brian Gough
6d54e843e8
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:45:50 +01:00
Jessica Lawshe
f7e4750df6
Merge pull request #903 from sharelatex/as-cursor-position-change-editor
...
Store cursor & line position when switching editor
2018-09-11 10:44:24 -05:00
Jessica Lawshe
66e288864b
Wiki and CMS images height and width
2018-09-11 07:46:38 -05:00
Ersun Warncke
7d3e17651f
set options and method for request, pass cookies and form body
2018-09-10 06:10:36 -04:00
Ersun Warncke
dd056e36ae
add overleaf method
2018-09-10 06:10:36 -04:00
Alasdair Smith
b6a4bb74f8
Store cursor & line position when switching editor
...
When tearing down the source editor, we need to store the updated cursor
position, so that the position can be moved to when opening the rich
text editor.
2018-09-10 11:02:08 +01:00
hugh-obrien
1e04a09ec6
remove unnecessary error returns and ip fetching
2018-09-07 18:15:32 +01:00
Chrystal Griffiths
46eadfada4
Conditionally show sharing bits
2018-09-07 17:23:03 +01:00
Shane Kilkelly
eba14ee7d6
Merge pull request #874 from sharelatex/dcl-olsl760b
...
Stylesheet for publish modal
2018-09-07 10:27:11 +01:00
Chrystal Griffiths
0d283f103a
Move remaining new styles to v2-templates
2018-09-06 15:21:19 +01:00
Chrystal Griffiths
f3c47320cf
Tidy up
2018-09-06 15:21:19 +01:00
Chrystal Griffiths
6c7301fb09
Templates detail page
2018-09-06 15:20:03 +01:00
Chrystal Maria Griffiths
59ae0efad7
Templates index page
2018-09-06 15:20:03 +01:00
Jessica Lawshe
aa2f6ad0dd
Merge pull request #880 from sharelatex/jel-v2-launch-plans
...
Launch v2 Plans Page
2018-09-06 08:51:05 -05:00
Shane Kilkelly
3d369b725c
Add another confirmation checkbox to account-delete.
...
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
2018-09-06 11:35:28 +01:00
hugh-obrien
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
Jessica Lawshe
c3c2e524f5
Add quotes
2018-09-05 08:14:32 -05:00
Jessica Lawshe
40a412b6b9
Remove plans message about v2 beta
2018-09-05 08:14:05 -05:00
Jessica Lawshe
65b2715e62
Remove unused layout for v2 plans
2018-09-05 08:14:05 -05:00
Jessica Lawshe
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05:00
Shane Kilkelly
f0d17c1db7
Merge pull request #894 from sharelatex/as-fix-homepage-cta
...
Fix height issue on homepage for smaller screens
2018-09-05 11:47:02 +01:00
Tim Alby
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
hugh-obrien
5605e1c5c3
update copy for ip match notifications
2018-09-05 11:22:26 +01:00
hugh-obrien
23e6292fd7
updating tests for ip matcher logic
2018-09-05 11:22:26 +01:00
hugh-obrien
f20d27986b
create ip match notifications without forcing replacement
2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f
use new routes and params from v1 ip matcher endpoint
2018-09-05 11:22:26 +01:00
hugh-obrien
bf2ea4e7b3
test against ip matcher for notification on login if different from previous ip
2018-09-05 11:22:26 +01:00
hugh-obrien
de83df2703
adding tests for ip matching notifications
2018-09-05 11:22:25 +01:00
hugh-obrien
38faa5c25e
correctly create and display ip matched affiliations
2018-09-05 11:22:25 +01:00
hugh-obrien
fa23ea75b8
Call university ip matcher api when checking notifications
2018-09-05 11:22:25 +01:00
James Allen
24f60bf791
Don't include the license name twice in invite emails
2018-09-05 11:05:38 +01:00
Alasdair Smith
455e682fac
Fix height issue on small screens
2018-09-05 11:00:30 +01:00
Shane Kilkelly
d432b6799f
Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix
...
Don't Regard v1 Teams as Paid Subscriptions
2018-09-05 10:22:46 +01:00
Shane Kilkelly
81c845850e
Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1
...
Account-delete, clarify what happens to v1 account and projects
2018-09-05 10:22:32 +01:00
Christopher Hoskin
c3e64b12cf
Remove 'beta' from v2 welcome text
2018-09-04 15:11:27 +01:00
Shane Kilkelly
680654f7e7
Account-delete, clarify what happens to v1 account and projects
2018-09-04 13:31:22 +01:00
Douglas Lovell
15a54d8228
Style for label alignment on text area
2018-09-04 08:53:29 -03:00
Douglas Lovell
fa7f8ebfed
Styling tweaks to Gallery publish dialog
2018-09-04 07:22:58 -03:00
Ersun Warncke
e4e6a0fa1b
add new tag methods
2018-09-03 10:40:28 -04:00
Tim Alby
3324796086
don't regard v1 teams as paid subscriptions
...
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
James Allen
5025b54c9c
Merge pull request #887 from sharelatex/as-logout-of-v1
...
Extract logout to function, so different redirect can be called
2018-09-03 14:04:22 +01:00
Alasdair Smith
53bd2cfd33
Add error handling on logout
2018-09-03 11:46:36 +01:00
Alasdair Smith
6569e34873
Extract logout to function, so different redirect can be called
2018-09-03 11:01:14 +01:00
Douglas Lovell
1965967361
Use less vertical space in gallery publish modal
2018-09-03 06:51:15 -03:00
Shane Kilkelly
7be716e889
Merge pull request #879 from sharelatex/sk-handle-user-account-delete
...
Sk handle user account delete
2018-09-03 10:41:49 +01:00
Shane Kilkelly
bafcf24cc9
Add missing column class to the change-password panel
2018-09-03 10:21:45 +01:00
Shane Kilkelly
1776482159
Update wording of the change-password instruction
2018-09-03 10:21:45 +01:00
Shane Kilkelly
0300ffbdc6
Bonus, add a link to the v1 settings page to change password
2018-09-03 10:21:45 +01:00
Shane Kilkelly
27a2e06d7b
Revert "Move the new logic to the externalAuthenticationSystemUsed
function"
...
This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
2018-09-03 10:21:45 +01:00
Shane Kilkelly
40a500648c
Move the new logic to the externalAuthenticationSystemUsed
function
2018-09-03 10:21:45 +01:00
Shane Kilkelly
be6720d805
Add a janky warning that this action will delete the account on v1 also.
2018-09-03 10:21:45 +01:00
Shane Kilkelly
9141f678b1
Show the account delete option on v2
2018-09-03 10:21:45 +01:00
Paulo Reis
07f884df70
Fix spell-checker menu going offscreen.
2018-09-03 09:42:37 +01:00
Paulo Reis
60cbc989e2
Add delete as an inline table action (only when viewing archived projects).
2018-09-02 15:14:45 +01:00
Paulo Reis
af4094a88c
Use CSS hashed paths when hot-swapping themes.
2018-09-02 14:44:15 +01:00
Paulo Reis
fbf98d89f2
Improve the collapsing behaviour of 'change' entries in track-changes.
2018-09-01 15:36:02 +01:00
Douglas Lovell
91e653dafc
Limit width and margin publish model form controls to the enclosing box
2018-08-31 18:36:53 -03:00
Douglas Lovell
c570daf03b
Remove unneeded include from ol-style
2018-08-31 18:36:19 -03:00
Douglas Lovell
1e31f5dc1c
Move new publish-model styles into existing style file
2018-08-31 15:35:24 -03:00
Douglas Lovell
92548be044
Use hyphen for underscore in publish-modal style
2018-08-31 14:16:43 -03:00
Douglas Lovell
404e768d24
Merge branch 'master' into dcl-olsl760b
2018-08-31 14:04:00 -03:00
Douglas Lovell
2b9e978379
Repair syntax and additional publish-modal style
2018-08-31 13:59:47 -03:00
Douglas Lovell
135d7e75a5
Merge branch 'master' into dcl-olsl760b
2018-08-31 13:24:22 -03:00
Paulo Reis
4ff7410391
Disable the review button when history is open.
2018-08-31 17:10:15 +01:00
Paulo Reis
b8f14873d2
Style buttons inside alerts (previously had the same colours for backgrounds).
2018-08-31 16:29:49 +01:00
Paulo Reis
f88a3815c6
Add loading spinner when cloning a project.
2018-08-31 16:14:20 +01:00
Paulo Reis
8ad9db3f02
Forcefully set trackchanges textareas background to white.
2018-08-31 15:45:33 +01:00
Paulo Reis
0c390d91a0
Avoid z-index issues with track-changes comments and the editor splitter.
2018-08-31 15:44:07 +01:00
Paulo Reis
7e5094f53d
Avoid z-index issues with the new project dropdown.
2018-08-31 15:37:22 +01:00
Paulo Reis
fc7b5bdd63
* Share button shown to all users, with a tooltip for non-admin; remove its id.
2018-08-31 15:33:56 +01:00
Timothée Alby
855840d89a
Merge pull request #883 from sharelatex/ta-domain-licence-join-fix
...
Fix id Accessor in Domain Licence Join Page
2018-08-31 13:15:23 +02:00
Timothée Alby
012d341df6
Merge pull request #881 from sharelatex/ho-change-email-fire-forget
...
change email: catch invalid emails and don't pass the error back on invalid requests
2018-08-31 13:15:16 +02:00
Timothée Alby
59b137e303
Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type
...
Update university, role and department value as the user types.
2018-08-31 13:15:01 +02:00
Henry Oswald
245ad2a2a8
call changeEmail before the callback in setDefaultEmailAddress
2018-08-31 11:49:45 +01:00
Tim Alby
195ae49052
fix id accessor in domain licence join page
2018-08-31 11:41:28 +01:00
Henry Oswald
bab334aa44
fire and forget changeEmail in setDefaultEmailAddress
...
prevents blocking/erroring the change email workflow
2018-08-31 11:16:28 +01:00
Henry Oswald
038b18a209
change email: catch invalid emails and don't pass the error back on invalid requests
2018-08-31 11:06:55 +01:00
Jessica Lawshe
dff29637b7
Move quotes to partial
2018-08-30 09:52:55 -05:00
Jessica Lawshe
bac90c0976
Move v2 plans redirect to router
2018-08-30 09:52:55 -05:00
Jessica Lawshe
ec710d0b1e
Add switch button styling
2018-08-30 09:52:55 -05:00
Jessica Lawshe
a87b5a629a
v2 plans style overrides and capitalize "Best Value"
2018-08-30 09:52:55 -05:00
Jessica Lawshe
eb8e279ac7
Add border styling
2018-08-30 09:52:55 -05:00
Jessica Lawshe
7d249f513b
Remove Positive SSL badge for v2
2018-08-30 09:52:55 -05:00
Jessica Lawshe
3a2c9a3830
Plans features table styling for v2
2018-08-30 09:52:55 -05:00
Jessica Lawshe
c1d37a712c
Update translations to use appName
2018-08-30 09:52:55 -05:00
Jessica Lawshe
bc89d8fb11
Add .nav-pills styling for v2
2018-08-30 09:52:55 -05:00
Jessica Lawshe
a2a98e0be1
Add @brand-secondary color
2018-08-30 09:52:55 -05:00
Jessica Lawshe
c920dc37d2
Update button classes for v2
...
Use `.btn-default` instead of `.btn-info`
2018-08-30 09:52:55 -05:00
Jessica Lawshe
26f2ff3d6f
Unlink instapages for v2 FAQ and add group contact modal
...
group contact link: v2 opens contact portal and SL opens instapage
2018-08-30 09:52:50 -05:00
Jessica Lawshe
fe9709e5c7
Move style from winning test variant to main class
...
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.
Also alphabetize CSS classes.
Remove .more-details and extra .container from layout
CSS statements for .more-details were moved to .plans
2018-08-30 09:36:35 -05:00
James Allen
52381c8fb7
Merge pull request #851 from sharelatex/jel-remove-a-b-test
...
Remove Plans and Pricing A/B Test
2018-08-30 15:19:56 +01:00
Douglas Lovell
229626a368
Merge branch 'master' into dcl-olsl760b
2018-08-30 08:04:40 -03:00
Paulo Jorge Reis
cf075b0c42
Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2
...
Don't suggest bonus page to v2 users
2018-08-30 11:29:41 +01:00
Paulo Jorge Reis
8b64f46807
Merge pull request #861 from sharelatex/ho-mailchimp-change-email
...
catch newsletter email change error if user already exists on mailing list
2018-08-30 11:29:01 +01:00
Paulo Jorge Reis
10981f0b4e
Merge pull request #860 from sharelatex/ta-front-end-email-regex
...
Change Email Regex in Affiliations Front-End
2018-08-30 11:28:38 +01:00
Paulo Jorge Reis
85ce1d1a11
Merge pull request #867 from sharelatex/pr-fix-togglers-with-v2-history
...
Set a unique name attribute for the toggle switch directive.
2018-08-30 11:26:32 +01:00
Paulo Jorge Reis
4be364cd93
Merge pull request #864 from sharelatex/pr-history-restore-placeholder
...
Add a placeholder "restore" button, showing a tooltip.
2018-08-30 11:25:25 +01:00
Paulo Jorge Reis
cb4d4145a1
Merge pull request #855 from sharelatex/pr-v2-light-theme
...
v2 light theme
2018-08-30 11:24:52 +01:00
Paulo Jorge Reis
8b9397f80c
Merge pull request #863 from sharelatex/as-update-v1-import-modal
...
Update project import modal to be more friendly near the launch
2018-08-30 11:24:44 +01:00
James Allen
b86ac31c63
Don't suggest bonus page to v2 users
2018-08-30 10:56:31 +01:00
Alasdair Smith
bc1f10a710
Merge pull request #868 from sharelatex/ho-mongo-health-checks
...
added a /health_check/mongo endpoint
2018-08-30 09:52:20 +01:00
Jessica Lawshe
3a2400b212
Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links
...
remove wufoo latex error response logging
2018-08-29 12:24:22 -05:00
Jessica Lawshe
ad55842c0a
Merge pull request #847 from sharelatex/ns-bye-typeform
...
move typeform survey to google forms
2018-08-29 12:24:12 -05:00
Jessica Lawshe
cf8376f213
Merge pull request #840 from sharelatex/jel-blog-style
...
Blog style
2018-08-29 12:24:04 -05:00
Jessica Lawshe
a5d84ecc0a
Merge pull request #842 from sharelatex/jel-portals-user-affiliation
...
Add dashboard link mixin
2018-08-29 12:23:50 -05:00
Jessica Lawshe
1230750961
Merge pull request #865 from sharelatex/jel-sanitize-html
...
Add default sanitize HTML options
2018-08-29 12:23:32 -05:00
Douglas Lovell
f38c637f31
Stylesheet for publish modal
2018-08-29 13:56:16 -03:00
Paulo Reis
79f1e7b0ee
Update ui-select value as the user types.
2018-08-29 17:31:47 +01:00
Ersun Warncke
9feb8ef39f
Revert "Merge pull request #843 from sharelatex/ew-collabratec"
...
This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing
changes made to a726537c4372641bfca0eb37fc130ca3a932d433.
2018-08-29 12:00:53 -04:00
Ersun Warncke
afc22dc5c2
Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy"
...
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474
Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy
...
set options and method for request, pass cookies and form body
2018-08-29 10:17:21 -04:00
Ersun Warncke
c1859f3e80
Merge pull request #843 from sharelatex/ew-collabratec
2018-08-29 10:17:02 -04:00
Henry Oswald
360618a7d3
added a /health_check/mongo endpoint
2018-08-29 11:24:01 +01:00
Alasdair Smith
4174b8edee
Update image and adjust size
2018-08-29 10:50:07 +01:00
Alasdair Smith
3dc437d932
More copy updates
2018-08-29 10:50:07 +01:00
Alasdair Smith
ff275e3425
Replace image and improve copy
2018-08-29 10:50:07 +01:00
Alasdair Smith
2e0d6ab305
Remove 2 step modal and make copy more friendly
2018-08-29 10:50:07 +01:00
James Allen
6a04800f70
Merge pull request #810 from sharelatex/ja-v2-templates
...
Split out feature flags into publish and view templates
2018-08-29 10:27:23 +01:00
Paulo Reis
82aa7c30a6
Make sure each pair of radio buttons gets a unique name attribute in the toggle switch directive.
2018-08-29 10:20:40 +01:00
Shane Kilkelly
1848befcb7
Merge branch 'sk-flush-when-refreshing-linked-file'
2018-08-29 09:27:05 +01:00
Shane Kilkelly
6ee2a83885
Merge pull request #856 from sharelatex/ns-use-regex-test
...
Use regex test instead of string match
2018-08-29 09:21:40 +01:00
Shane Kilkelly
b8ff6ae9a2
Merge pull request #862 from sharelatex/ta-increase-space
...
Increase Spacing Between Buttons
2018-08-29 09:21:31 +01:00
Shane Kilkelly
2c782fee67
Merge pull request #858 from sharelatex/sk-update-v2-migration-banner
...
Update the color and wording of the warning message shown on SL
2018-08-29 09:21:19 +01:00
Shane Kilkelly
6157db1964
Merge pull request #835 from sharelatex/sk-sanitize-system-messages
...
Sanitize display of system messages.
2018-08-29 09:21:07 +01:00
Shane Kilkelly
33a4882bd3
Update the color and wording of the warning message shown on SL
2018-08-29 09:08:44 +01:00
Jessica Lawshe
98f98483ef
Add default sanitize options
2018-08-28 17:23:55 -05:00
Paulo Reis
0df5c61c44
Add a placeholder restore button, showing a tooltip.
2018-08-28 21:35:35 +01:00
Jessica Lawshe
70b19b2584
Remove unused plans style
2018-08-28 12:42:09 -05:00
Jessica Lawshe
e1fbef6910
Move style from winning test variant to main class
...
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.
Also alphabetize CSS classes.
Remove .more-details and extra .container from layout
CSS statements for .more-details were moved to .plans
2018-08-28 12:42:09 -05:00
Jessica Lawshe
ae85bfafef
Move FAQ to partial
2018-08-28 12:42:09 -05:00
Jessica Lawshe
e5c3d72e1a
Move winning variant layout to main layout
2018-08-28 12:42:09 -05:00
Jessica Lawshe
8889f2aed2
Remove Plans and Pricing A/B Test
...
Remove all layouts, analytics events, and scope related to the A/B test.
The group modal from the default layout of the A/B test should be maintained though for v2.
2018-08-28 12:42:09 -05:00
Paulo Reis
f3a4c7f2ed
Remove debug line.
2018-08-28 17:08:46 +01:00
Tim Alby
204423696d
increase spacing between buttons
2018-08-28 17:34:49 +02:00
Paulo Reis
32ff66b0dd
Add two more font-size options to the editor.
2018-08-28 14:52:25 +01:00