github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
8127 commits 3 branches 7 tags 206 MiB
Commit graph

7779 commits

Author SHA1 Message Date
Timothée Alby
7af86b0704 Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller 
fix missing next argument

GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce
 2018-10-24 14:03:02 +00:00
Timothée Alby
b123f830ff Merge pull request #1042 from sharelatex/ta-user-membership-access 
User Membership Access Refactor

GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd
 2018-10-24 14:02:55 +00:00
Timothée Alby
3abfe36279 Merge pull request #1057 from sharelatex/ja-update-git-ignore 
Don't gitignore new module directories

GitOrigin-RevId: f6c4a65af6fa98c879c0ceb952f3161d6f395dee
 2018-10-24 12:49:53 +00:00
James Allen
eecbbc045d Merge pull request #1044 from sharelatex/ja-merge-modules 
Merge modules into web monorepo

GitOrigin-RevId: 742df73bff72010b01c93e20759a489969b04ed3
 2018-10-24 10:29:57 +00:00
Brian Gough
d75d8ee079 Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes 
check the filetype before syncing file

GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e
 2018-10-23 13:16:30 +00:00
Simon Detheridge
8b55643f7e Merge pull request #1030 from sharelatex/spd-bonus-program 
Implement bonus program

GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8
 2018-10-23 11:36:17 +00:00
Jessica Lawshe
24a2cafc33 Merge pull request #1038 from sharelatex/jel-style-improvements 
Content pages style improvements

GitOrigin-RevId: 6cb212deba561ebfa6349bdfcf16e309679be275
 2018-10-19 14:12:35 +00:00
Jessica Lawshe
7a03fbeb06 Merge pull request #1018 from sharelatex/jel-track-changes-info-page 
Styling for track changes info page and add existence checks for metadata

GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
 2018-10-19 14:12:30 +00:00
James Allen
1aecd0be3d Merge pull request #1039 from sharelatex/ja-copybara 
Sync to OSS repo using copybara

GitOrigin-RevId: 5ce0c08d614f3d84e7c3e1f9b3413681e5049103
 2018-10-19 12:46:51 +00:00
Paulo Jorge Reis
6dd9680af8 Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout 
Fix single-quotes breaking layout directive
 2018-10-19 11:30:59 +01:00
Paulo Reis
00a489a000 Fetch brand variation details for branded projects; inject details into the editor page front-end. 
Test brand variation details.

Rename BrandVariationsController to BrandVariationsHandler.

Use the V1 API helper.

Do not swallow errors when fetching brand details for project load.

Fix indentation.
 2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62 Avoid adding custom toggler attributes when the feature flag is false. 2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646 Avoid using Angular eval for user-provided strings in the layout directive. 2018-10-19 10:00:52 +01:00
Jessica Lawshe
a1fa48b3ed Merge pull request #1033 from sharelatex/jel-portal-default-bg 
Add default portal background
 2018-10-18 10:31:07 -05:00
Jessica Lawshe
96b24a80ca Merge pull request #944 from sharelatex/jel-linkable-tabs 
Linkable tabs directive
 2018-10-18 10:30:58 -05:00
Brian Gough
c6ec31c773 Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names 
avoid duplicate project names for templates and zips
 2018-10-18 13:51:05 +01:00
Jessica Lawshe
88f3fce26e Add default portal background 2018-10-17 17:00:50 -05:00
Jessica Lawshe
1362da710b Watch for hash change for tabs 2018-10-17 09:31:48 -05:00
Jessica Lawshe
97fdf72346 If hash not empty and remove unused file 2018-10-17 09:31:48 -05:00
Paulo Reis
1424ae686a Add scrollIntoView behaviour. 2018-10-17 09:31:48 -05:00
Paulo Reis
399a9ed604 Create bookmarkable tabs directive. 2018-10-17 09:31:48 -05:00
Alasdair Smith
baf8b599d7 Handle hash-bang urls used sometimes in v1 2018-10-17 09:31:48 -05:00
Jessica Lawshe
8e99142537 Add main CMS controller 
Main is in index now, and blog controller moved to separate file
 2018-10-17 09:31:48 -05:00
Jessica Lawshe
bec50892de Linkable tabs 2018-10-17 09:31:48 -05:00
Simon Detheridge
6ad16c9406 Merge pull request #1028 from sharelatex/spd-no-github-for-new-users 
retry: Don't add old v1 features for new accounts
 2018-10-17 14:51:46 +01:00
Brian Gough
ad6b3a625a use generateUniquename to create names with timestamps 2018-10-16 14:43:40 +01:00
Hugh O'Brien
3b766bf523 Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id 
Create projects with brand variation id
 2018-10-16 11:17:09 +01:00
Hugh O'Brien
876663f94b Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback 
Add affiliations on university domain confirmation
 2018-10-16 11:17:01 +01:00
Simon Detheridge
0f54bc2c52 Add additional tests for V1SubscriptionManager 
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.

bug: overleaf/sharelatex#1014
 2018-10-16 10:15:42 +01:00
Simon Detheridge
6fc6c44605 Don't add old v1 features for new accounts 
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.

Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.

bug: overleaf/sharelatex#1014
 2018-10-16 09:45:16 +01:00
Simon Detheridge
ec9c38df57 Revert "Don't add old v1 features for new accounts" 2018-10-15 17:46:48 +01:00
Simon Detheridge
85f097343f Merge pull request #1022 from sharelatex/spd-no-github-for-new-users 
Don't add old v1 features for new accounts
 2018-10-15 15:28:34 +01:00
Timothée Alby
c41fb5c9f4 Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation 
Email confirmation notification UI fixes
 2018-10-15 14:49:06 +02:00
Tim Alby
6f63cd7ca0 add notification to confirm unconfirmed emails 2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a refactor to use config file 2018-10-15 14:46:38 +02:00
Brian Gough
a640397052 make project names unique for zip uploads and template imports 2018-10-15 09:33:39 +01:00
Brian Gough
59cf0aa3cb fix bug in call to findAllUsersProjects 2018-10-15 09:33:39 +01:00
Simon Detheridge
48995d2d44 Don't add old v1 features for new accounts 
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.

Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.

bug: overleaf/sharelatex#1014
 2018-10-12 17:45:57 +01:00
Jessica Lawshe
1256d29af9 Merge pull request #1020 from sharelatex/jel-wiki-tables 
Add class for table without borders
 2018-10-12 08:55:51 -05:00
Alasdair Smith
f35ffc861f Merge pull request #1014 from sharelatex/ns-allow-capital-letters-in-ref-commands 
allow capital letters in ref commands e.g. \Cref
 2018-10-12 10:08:18 +01:00
Alasdair Smith
8fc04e8c6c Merge pull request #1021 from sharelatex/as-addsearch 
Port AddSearch styles from v1
 2018-10-12 10:08:08 +01:00
Alasdair Smith
518ae83e48 Override search result title to use sans-serif 2018-10-12 09:53:22 +01:00
Alasdair Smith
0f9b65be23 Fix spaces -> tabs in copy/pasted code 2018-10-12 09:52:51 +01:00
Hugh O'Brien
b825f0b267 Merge branch 'master' into hb-v2-affiliations-callback 2018-10-11 17:14:35 +01:00
Alasdair Smith
85912595e8 Port addsearch styles from v1 2018-10-11 12:13:51 +01:00
Timothée Alby
89590d5199 Merge pull request #1003 from sharelatex/cmg-split-screen-button 
Switch between pdf and editor with full-screen button
 2018-10-11 10:54:53 +01:00
Tim Alby
16db3a0806 gracefully handle subscriptions without currency 2018-10-11 10:38:48 +01:00
Alasdair Smith
e91ab3bf83 Merge pull request #1017 from sharelatex/as-fix-autocompile-loop 
Prevent autocompile loop
 2018-10-11 10:30:39 +01:00
Alasdair Smith
96d7d83b90 Add guard against autocompile being disabled 2018-10-11 09:30:21 +01:00
Jessica Lawshe
a5eb6d0311 Add class for table without borders 2018-10-10 16:21:02 -05:00
Simon Detheridge
e7506489d1 Fix missing string in modals.pug 
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.

Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-10 15:06:37 +01:00
Alasdair Smith
9dd965da3c Prevent autocompile loop 
If an autocompile hits a rate limit, it would get into a bad state where
it would continuely loop making compile requests. This is because the
compile response resolving would disable auto compile (because the rate
limit was hit) but also trigger calculation of uncompiled changes, which
would not check if autocompile was disabled. The fix is to just check if
autocompile is disabled.
 2018-10-10 15:04:18 +01:00
Paulo Reis
b0802380ae Update tests 2018-10-10 14:09:47 +01:00
Paulo Reis
901fb0fc1e Unit test brand variation id. 2018-10-10 14:09:47 +01:00
Paulo Reis
29787c42c5 Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates. 2018-10-10 14:09:47 +01:00
Paulo Reis
a380feab98 Add brand variation id to the Project model. 2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22 Merge pull request #1005 from sharelatex/spd-no-more-asterisks 
Sanitize paths in all relevant ProjectEntityHandler methods
 2018-10-10 10:44:13 +01:00
Alasdair Smith
250edf4670 Merge pull request #1010 from sharelatex/as-fix-no-sl 
Switch dev env to use v2 port instead of SL
 2018-10-10 10:11:16 +01:00
Nate Stemen
3548f61615 allow capital letters in ref commands e.g. \Cref 2018-10-09 14:58:02 -04:00
Simon Detheridge
32149e652f Handle 'invalid element name' error in project list ui 
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.

Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7 update error message 2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800 add account merge error 2018-10-09 09:47:03 -04:00
Timothée Alby
914546d7d6 Merge pull request #983 from sharelatex/ta-user-ties 
Add Group Managers Management Page
 2018-10-09 14:00:59 +01:00
Brian Gough
4efc118b9c Merge pull request #1009 from sharelatex/bg-update-metrics-to-1.8.0 
update to metrics v1.8.0 for metrics.globalGauge
 2018-10-09 12:15:30 +01:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Brian Gough
8c3b5acdd0 update to metrics v1.8.0 for metrics.globalGauge 2018-10-09 11:46:19 +01:00
Alasdair Smith
98d35b4e50 Use settings instead of hard-coding ports 2018-10-09 11:23:21 +01:00
Brian Gough
a68bde819d Merge pull request #1004 from sharelatex/ta-test-mock-fix 
Fix Test Mock
 2018-10-09 10:35:50 +01:00
Chrystal Griffiths
7ae39a0f84 Revert to ng-show 2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7 Avoid duplicating code 2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412 Merge pull request #1008 from sharelatex/ta-fix-help-link 
fix link to link sharing help page
 2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c fix link to link sharing help page 2018-10-08 16:07:11 +01:00
Simon Detheridge
56dcbefb5b Check for safe paths in all ProjectEntityHandler methods 
Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks.

Added checks to all methods in ProjectEntityHandler that can create or rename a file.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-08 15:31:04 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
e66210d2af Add method to sanitize full paths 
For convenience, add a method to SafePath to break a path into components and verify the status of each one.

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-08 14:48:17 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850 
Display password change form in Account Settings
 2018-10-08 13:59:04 +01:00
Simon Detheridge
9c189303c1 Merge pull request #1002 from sharelatex/spd-email-cta-links 
Add additional CTA link to emails
 2018-10-08 13:56:21 +01:00
Simon Detheridge
af9c9517f3 Merge pull request #999 from sharelatex/as-validate-password-length 
Validate password length
 2018-10-08 13:55:25 +01:00
hugh-obrien
f6307f9086 store reversedHostname property and update test accordingly 2018-10-08 13:37:12 +01:00
hugh-obrien
3919acad46 store reversed hostname and review fixes for v2 university domain confirmation 2018-10-08 12:08:29 +01:00
Jessica Lawshe
b78f362c53 Merge pull request #1000 from sharelatex/jel-meta-img-src 
Handle image_src in metadata layout
 2018-10-08 11:44:10 +01:00
Jessica Lawshe
97cf4886ee Merge pull request #994 from sharelatex/jel-templates-clickable-margins 
Styling to increase margins for clickable items on templates pages
 2018-10-08 11:43:54 +01:00
Jessica Lawshe
f04212c96f Merge pull request #995 from sharelatex/ta-remove-confirmed-field 
remove unused confirmed field from user model
 2018-10-08 11:43:42 +01:00
Alasdair Smith
e129172553 Fix ordering of boolean check to be more readable 2018-10-08 11:25:24 +01:00
Jessica Lawshe
8ef7f6c26d Adjust margins to separate clickable items on templates 2018-10-08 11:09:06 +01:00
Alasdair Smith
f26f30e677 Fix spaces instead of tabs 2018-10-08 10:44:26 +01:00
Alasdair Smith
04572f61bb Fix copy/paste error 2018-10-08 10:44:26 +01:00
Alasdair Smith
e37a54e254 Make error message match other styles 2018-10-08 10:44:26 +01:00
Alasdair Smith
8777b0f5f8 Style error message after moving it above inputs 2018-10-08 10:44:26 +01:00
Alasdair Smith
af499e4539 Style error message on register form 2018-10-08 10:44:26 +01:00
Alasdair Smith
2edca417b1 Reduce padding 2018-10-08 10:44:25 +01:00
Alasdair Smith
1ef947b1fe Fix tests after refactoring register validation 2018-10-08 10:44:25 +01:00
Alasdair Smith
676557a051 Refactor to validate in AuthenticationManager 2018-10-08 10:44:25 +01:00
Alasdair Smith
44c86b3769 Refactor to use password strength options 2018-10-08 10:44:25 +01:00
Alasdair Smith
1fe8aebf5b Add error handling for 400 responses 2018-10-08 10:44:25 +01:00
Alasdair Smith
bf60fe7f6c Add error handling for InvalidError 2018-10-08 10:44:25 +01:00
Alasdair Smith
e99165b475 Validate password length when registering 2018-10-08 10:44:25 +01:00
Hugh O'Brien
cc962c3e6f Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal 
Generic Zip or Pdf Exports endpoint
 2018-10-08 10:13:18 +01:00
hugh-obrien
65ecdf84f4 cleanup and tests for v2 affiliations confirmation 2018-10-07 16:40:26 +01:00
hugh-obrien
af3cc01496 Lookup users by email hostname using new field 2018-10-06 17:22:39 +01:00
hugh-obrien
026f7eebcd Setting up hostname field and institution domain confirmation endpoint 2018-10-06 15:57:25 +01:00
Tim Alby
c00a0a435d remove console.log in tests 2018-10-05 16:24:28 +01:00
Tim Alby
7b4b75b51a fix incorrect or missing test mocks 2018-10-05 16:24:05 +01:00
Simon Detheridge
286f25529a Remove secondary CTA link from account merge confirmation email 
bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-05 13:19:05 +01:00
Simon Detheridge
d316a76106 Revert "add plain text link to email address confirmation emails" 
This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.
 2018-10-05 13:16:42 +01:00
Simon Detheridge
a2ef0e1ae5 Add additional CTA link to emails 
Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button.

bug: sharelatex/web-sharelatex-internal#987
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-05 12:04:00 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout 
The CMS is already using `image`, which is an object based on data from the API.
 2018-10-05 11:06:21 +01:00
Shane Kilkelly
4c2a90966a Merge pull request #918 from sharelatex/sk-enable-sudo-mode-in-v2 
Enable sudo-mode for v2
 2018-10-05 10:05:24 +01:00
Simon Detheridge
2b8ce379f8 Lookup correct compiler when importing v1 templates 
bug: overleaf/sharelatex#981
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-04 16:42:03 +01:00
Shane Kilkelly
2c47da553b Add an error log if activating sudo-mode on login fails 2018-10-04 15:05:40 +01:00
Shane Kilkelly
778abaff6e Remove stray log 2018-10-04 15:05:40 +01:00
Shane Kilkelly
70b56d0362 Fix up acceptance tests 2018-10-04 15:05:40 +01:00
Shane Kilkelly
2ef23194df WIP: trying to get acceptance tests to pass 2018-10-04 15:05:40 +01:00
Shane Kilkelly
f9ed367148 Move the auth mechanism for sudo-mode into SudoModeHandler 2018-10-04 15:05:40 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Chrystal Maria Griffiths
6b8eb0ac23 Merge pull request #996 from sharelatex/jel-meta-img 
Update default meta images
 2018-10-04 15:01:19 +01:00
Chrystal Maria Griffiths
e932eb074b Merge pull request #992 from sharelatex/as-fix-mathjax 
Fix mathjax incorrectly loading config
 2018-10-04 15:01:05 +01:00
Chrystal Griffiths
13843f82a0 Use settings appName 2018-10-04 09:57:51 +01:00
Jessica Lawshe
bbe847c16d Update default meta images 
Favicons are not picked up by social sites.
 2018-10-03 17:34:40 +01:00
Tim Alby
5ff66187a0 remove unused confirmed field from user model 2018-10-03 16:01:30 +01:00
Ersun Warncke
752658f773 Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api 
Use v1 Doc Info API for Token Access
 2018-10-03 09:22:41 -04:00
Timothée Alby
e3cfa36b56 Merge pull request #984 from sharelatex/ta-email-cta-link 
add plain text link to email address confirmation emails
 2018-10-03 14:20:05 +01:00
Timothée Alby
c74c782cee Merge pull request #961 from sharelatex/ta-account-sync-affiliations 
Add getInstitutionsPlan Function
 2018-10-03 14:19:56 +01:00
Alasdair Smith
fb8ed890f9 Correctly load Safe mathjax extention using provided config 2018-10-03 11:52:33 +01:00
Brian Gough
ecdd00ecb9 Merge pull request #980 from sharelatex/jel-viewport-metatag 
Add viewport metatag
 2018-10-03 10:10:22 +01:00
Brian Gough
2b738907aa Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error 
clean up broken project on error in ProjectDuplicator
 2018-10-03 10:04:30 +01:00
Ersun Warncke
642b45d0d6 use v1 doc info api 2018-10-02 11:16:46 -04:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Alasdair Smith
10571b09f3 Merge pull request #979 from sharelatex/jel-content-links 
Content pages link colors
 2018-10-02 14:07:10 +01:00
Alasdair Smith
f90dd1b49a Merge pull request #986 from sharelatex/as-sign-in-from-v2-post 
Remove POST /docs custom handler, now handled by redirects
 2018-10-02 14:06:57 +01:00
Brian Gough
4621234220 clean up broken project on error in ProjectDuplicator 2018-10-02 12:14:22 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Alasdair Smith
062f26dda3 Remove POST /docs custom handler, now handled by redirects 
Implementing a system for signing into v1 via v2 using POSTs so the
unauthenticated route is no longer necessary
 2018-09-28 14:11:38 +01:00
Tim Alby
4e9737bf71 add plain text link to email address confirmation emails 2018-09-28 13:36:31 +01:00
Alasdair Smith
1330c8da73 Also check if v1 project exported if not found for read-only tokens 2018-09-28 11:47:14 +01:00
Alasdair Smith
435fe11115 Check if v1 project was exported if not found 
This prevents a redirect loop for projects which were exported but then
deleted on v2. v2 would not find the project, redirect to v1, which
would find that it was exported and redirect back to v2.
 2018-09-28 11:47:14 +01:00
Brian Gough
6d5908f2f4 Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email 
Don't include the license name twice in invite emails
 2018-09-28 11:15:40 +01:00
Brian Gough
1f6abd4e69 fix invalid project names when opening templates 2018-09-28 10:38:25 +01:00
Brian Gough
8f8694ad94 iterate over owned projects in a more robust way 2018-09-28 09:48:15 +01:00
Brian Gough
6b80d3563d add support for creating unique project names 2018-09-28 09:48:15 +01:00
Alasdair Smith
45bd46bc01 Merge pull request #977 from sharelatex/as-encode-auth-with-v1-query-strings 
Encode redirects which will auth with v1 first
 2018-09-28 09:45:54 +01:00
Jessica Lawshe
0ff6ef0748 Ensure Wiki search link color property set on hover 2018-09-27 11:52:38 -05:00
Jessica Lawshe
23c9c719af Update hover color for tabs 2018-09-27 11:52:30 -05:00
Jessica Lawshe
69421cb7b7 Add hover color for content page links 2018-09-27 11:52:09 -05:00
hugh-obrien
52859cdfaa make the zip fetching endpoint for exports generic to either zips or pdfs 2018-09-27 16:11:11 +01:00
Alasdair Smith
4f2c91a59a Add new redirect option to auth with v1, which will urlencode the query string 
This is necessary for the GET /docs endpoint, which can be used to send
urls as part of query parameters. If these are not encoded before
redirecting, they can become corrupted.
 2018-09-27 12:19:16 +01:00
James Allen
0cb563816d Don't enable legacy blog in v2 2018-09-27 10:56:14 +01:00
Jessica Lawshe
aaac1fabfd Set width for iframes on blog posts 2018-09-26 12:45:50 -05:00
Alasdair Smith
c2ecccfa02 Use correct setting 2018-09-26 17:35:55 +01:00
Alasdair Smith
f2fa83a218 Fix /teams redirect using wrong setting 2018-09-26 17:04:40 +01:00
Alasdair Smith
9c0a888d11 Add custom redirect for /docs 
We want to redirect POST and GET to different locations, but this is
unsupported by RedirectManager. Therefore we redirect GETs with
RedirectManager and POSTs with this custom route.
 2018-09-26 17:04:40 +01:00
James Allen
8ebfd7882d Add logos for homepage 2018-09-26 10:34:50 +01:00
Jessica Lawshe
208ed3cec8 Merge pull request #967 from sharelatex/jel-content-pages-styling 
Content pages styling
 2018-09-25 13:42:06 -05:00
Ersun Warncke
a23f0a3d15 fix test failure from merge 2018-09-25 08:54:01 -04:00
Ersun Warncke
7b90fcb186 Merge pull request #969 from sharelatex/ew-check-doc-token-access 
check access for doc on read only token
 2018-09-25 08:35:56 -04:00
Ersun Warncke
eeed857dd9 change api path 2018-09-25 06:45:27 -04:00
Ersun Warncke
f0c0834b0f only do v1 access check when api config present 2018-09-25 05:42:04 -04:00
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
James Allen
1d657e1700 Merge pull request #968 from sharelatex/ja-show-register-button 
Show register button on OL v2
 2018-09-25 10:25:38 +01:00
James Allen
e2f90ba01a Merge pull request #966 from sharelatex/as-no-project-token-based 
Redirect logged out users to v1 if project is not found from token based url
 2018-09-25 10:25:30 +01:00
Alasdair Smith
298ee2dbb4 Fix v1 return to path 2018-09-25 10:06:24 +01:00
Alasdair Smith
da16e8d01f Add acceptance test for unimported read only token 2018-09-25 09:43:39 +01:00
Alasdair Smith
ca895ae1b1 Redirect to v1 via sign in link 2018-09-25 09:37:22 +01:00
Brian Gough
89ba3912c0 Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads 
Replace ShareLaTeX with Overleaf in name of multiple project download file
 2018-09-25 09:33:53 +01:00
Brian Gough
5947294016 Merge branch 'bg-support-main-file-for-templates' 2018-09-25 09:32:14 +01:00
Brian Gough
a524f99fbf Merge pull request #957 from sharelatex/hb-force-v1-image-templates 
Force gallery items to use legacy OL v1 texlive image
 2018-09-25 09:27:54 +01:00
Brian Gough
fee9358a45 Merge pull request #939 from sharelatex/bg-temporarily-disable-chktex 
temporarily disable syntax checking
 2018-09-25 09:27:33 +01:00
Brian Gough
0d4143205d strip quotes from mainFile 2018-09-25 09:05:49 +01:00
James Allen
19b97e953f Show register button on OL v2 2018-09-25 08:29:34 +01:00
Ersun Warncke
f89e85231a check access for doc on read only token 2018-09-24 18:03:28 -04:00
Jessica Lawshe
670129049f Fix text wrapping on quotes 2018-09-24 16:12:13 -05:00
Jessica Lawshe
7fddf58916 Green tab links 2018-09-24 16:05:28 -05:00
Jessica Lawshe
d6126719bc Alternate <hr> color for content pages 2018-09-24 15:59:44 -05:00
Jessica Lawshe
dc9e317f8f Merge pull request #962 from sharelatex/jel-tab-lists 
Tab header styling
 2018-09-24 14:23:25 -05:00
Jessica Lawshe
16d1c13566 Merge pull request #956 from sharelatex/jel-margins 
Margins on content pages
 2018-09-24 14:23:10 -05:00
Alasdair Smith
d6350c963e Remove projectExists flag from higher access check 
Now that find project by read and read/write token methods check whether
the project exists, it is not neccessary to check whether the project
exists in the higher access check. Therefore it has been removed
 2018-09-24 19:00:10 +01:00
Alasdair Smith
99dec02266 If no project found for read/write token, redirect to v1 2018-09-24 19:00:10 +01:00
Alasdair Smith
237810509a If no project found for read token, redirect to v1 2018-09-24 19:00:10 +01:00
Christopher Hoskin
5c35cc9593 Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963) 2018-09-24 16:33:54 +01:00
Jessica Lawshe
530a3b0d44 Tab header styling 
li styling was being applied to nested lists in the tab, but this was only meant for the tab headers list
 2018-09-24 10:22:22 -05:00
Brian Gough
418bc10a18 allow getting doc paths by project id 2018-09-24 16:04:23 +01:00
Brian Gough
5954e45016 add missing require 2018-09-24 15:44:09 +01:00
Brian Gough
586e3814fe add missing require 2018-09-24 15:27:16 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Tim Alby
51c5228288 add getInstitutionsPlan function 2018-09-24 13:16:31 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850 
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
 2018-09-24 09:11:48 -03:00
hugh-obrien
5f4a36ca26 remove debug line 2018-09-24 10:49:01 +01:00
hugh-obrien
c0b32f031e force gallery items to use legacy OL v1 texlive image 2018-09-24 10:49:01 +01:00
Paulo Reis
1bf09e3928 Adjust checkbox padding. 2018-09-24 10:38:18 +01:00
Paulo Reis
6c3c51c44e Use less padding in the login and register forms. 2018-09-24 10:24:12 +01:00
Paulo Reis
69771257ff Adapt styles to get a nicer responsive behaviour. 2018-09-24 08:34:50 +01:00
Shane Kilkelly
7d5bd74c43 Enable legacy login for tests 2018-09-24 08:34:50 +01:00
Jessica Lawshe
1e4e22c472 Add margin to register button 2018-09-24 08:34:50 +01:00
Paulo Reis
be9045c7ed Add styles for homepage too; add alternative versions of the register buttons. 2018-09-24 08:34:50 +01:00
Paulo Reis
70e99d4001 Add styles for the newsletter checkbox. 2018-09-24 08:34:50 +01:00
Paulo Reis
b008d163e7 Add login and register styles. 2018-09-24 08:34:50 +01:00
Paulo Reis
062bf0cd87 Add brand assets for login and register. 2018-09-24 08:34:50 +01:00
Jessica Lawshe
b8fb750c16 Bottom margin for tab nav only on portals 2018-09-21 17:11:47 -05:00
Jessica Lawshe
7fc0ab36b3 CMS pages margin 2018-09-21 17:09:08 -05:00
Jessica Lawshe
b85fd183a1 Merge pull request #955 from sharelatex/jel-tabs-active 
Keep border on hover for active tab
 2018-09-21 13:38:33 -05:00
Jessica Lawshe
55fb33c2c1 Merge pull request #948 from sharelatex/jel-content-pages-link-color 
Content pages link color
 2018-09-21 13:38:18 -05:00
Jessica Lawshe
e1dd35e759 Keep border on hover for active tab 2018-09-21 12:26:49 -05:00
James Allen
9e827be3ed Merge pull request #951 from sharelatex/as-copy-v1-assets 
Copy assets from v1
 2018-09-21 17:41:55 +01:00
James Allen
ea9f788fc1 Merge pull request #954 from sharelatex/cmg-better-buttons 
Improve gallery detail
 2018-09-21 17:41:43 +01:00
Chrystal Griffiths
e3b47047ab Buttons on left 2018-09-21 16:28:04 +01:00
Alasdair Smith
c1195cadcf Add renamed apple-touch-icon for v1 url interop 2018-09-21 15:49:04 +01:00
Alasdair Smith
b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith
5481ceefdd Copy static assets from v1 2018-09-21 14:59:47 +01:00
Alasdair Smith
1c1d5065a2 Move to publi/img dir 2018-09-21 14:59:25 +01:00
Alasdair Smith
11fd4f9a66 Copy overleaf partner files 2018-09-21 14:17:39 +01:00
Alasdair Smith
a2ed46a394 Add atlassian & google verification files 2018-09-21 14:01:26 +01:00
Alasdair Smith
945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +01:00
James Allen
91ee445277 Merge pull request #936 from sharelatex/cmg-gallery-styling 
Extra v2 gallery styling
 2018-09-21 11:06:25 +01:00
Chrystal Griffiths
af0d67d379 Change styles to accommodate masonry changes 2018-09-21 10:50:46 +01:00
James Allen
772ac42005 Fix messed up rebase 2018-09-21 10:42:20 +01:00
Alasdair Smith
3462b8042e Add /chrome redirect to match v1 behaviour 2018-09-21 10:35:43 +01:00
James Allen
c0dee4508e Merge pull request #949 from sharelatex/jel-blog-style-tag-figure 
Blog tag and <figure> styling
 2018-09-21 10:34:00 +01:00
Alasdair Smith
4b9038ed50 Don't let caption titles overflow 2018-09-21 10:19:40 +01:00
Chrystal Griffiths
5f665252d5 Add margin-bottom to tags 2018-09-21 10:16:03 +01:00
James Allen
2d9cadb487 Merge pull request #935 from sharelatex/as-teams-redirect 
Add route to handle /teams similar to v1
 2018-09-21 08:37:10 +01:00
James Allen
4d00227924 Merge pull request #945 from sharelatex/sk-disable-public-registration 
Add the enableLegacyRegistration option to acceptance test settings
 2018-09-21 08:37:02 +01:00
Jessica Lawshe
51ed62851c Style <figures> on blog 
Mimic v1 styling
 2018-09-20 19:50:31 -05:00
Jessica Lawshe
87b047e368 Add padding-bottom to blog tags 2018-09-20 19:36:14 -05:00
Jessica Lawshe
987451aba9 Content pages link color 2018-09-20 17:30:50 -05:00
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Alasdair Smith
6f794c32e1 Fix tab link hover styles applying to all children 2018-09-20 15:41:41 +01:00
Alasdair Smith
bc1a8953a1 Remove fixed heights, moving to masonry layout 2018-09-20 15:41:41 +01:00
Jessica Lawshe
89c381086b Remove fixed height and add masonry-based layout 2018-09-20 15:41:41 +01:00
Chrystal Griffiths
6cbab69444 Remove style covered by autoprefixer 2018-09-20 15:41:41 +01:00
Alasdair Smith
ed7c5f32b0 Move styles on element to class 2018-09-20 15:41:41 +01:00
Alasdair Smith
630f15e8ea Fix flex links not overflowing correctly and refactor 2018-09-20 15:41:41 +01:00
Chrystal Griffiths
6576d95e27 Don't stretch images 2018-09-20 15:41:41 +01:00
Chrystal Griffiths
82cd857e83 Set fixed height for portal titles 2018-09-20 15:41:41 +01:00
Shane Kilkelly
eff7b4d59e Add the enableLegacyRegistration option to acceptance test settings 2018-09-20 15:34:14 +01:00
Jessica Lawshe
488886c1d2 Merge pull request #929 from sharelatex/jel-homepage 
Add Homepage
 2018-09-20 09:01:13 -05:00
Jessica Lawshe
d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates 
Plans page updates
 2018-09-20 09:00:58 -05:00
Jessica Lawshe
50e53a57a3 Add advocate image 2018-09-20 08:57:07 -05:00
Jessica Lawshe
c408b14bc5 Homepage images 2018-09-20 08:57:07 -05:00
Jessica Lawshe
d023150b0f Add v2 homepage 
Specific homepage filenames and redirect to login when not found

Move variables to shared file

Move circle image styling to shared file

Leaving float on plans page because of some layout differences
 2018-09-20 08:57:07 -05:00
Jessica Lawshe
4640756fb8 Add .btn-xl styling 2018-09-20 08:57:06 -05:00
Jessica Lawshe
f60f48e396 Add .alert-alt styling 2018-09-20 08:57:06 -05:00
Ersun Warncke
256e374af0 update shrinkwrap 2018-09-19 12:13:14 -04:00
Ersun Warncke
48eb49a763 add sso passport modules 2018-09-19 10:20:27 -04:00
Brian Gough
5c69b6d12c temporarily disable syntax checking 2018-09-19 14:30:30 +01:00
Shane Kilkelly
7781181ab9 Merge pull request #941 from sharelatex/sk-fix-removed-js-module 
This module has been removed. Remove from the main frontend bundle too
 2018-09-19 14:11:23 +01:00
Shane Kilkelly
eb128e6d1b This module has been removed. Remove from the main frontend bundle too 2018-09-19 14:01:06 +01:00
Hugh O'Brien
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00