Commit graph

7932 commits

Author SHA1 Message Date
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
Timothée Alby
abd1331673 Merge pull request #1012 from sharelatex/ta-subscription-no-currency-fix
Gracefully Handle Subscriptions Without Currency
2018-10-11 10:41:26 +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
e4a3f838de Merge pull request #1016 from sharelatex/spd-missing-translation
Fix missing string in modals.pug
2018-10-10 17:33:54 +01: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
Ersun Warncke
1b50f0ced8 Merge pull request #1011 from sharelatex/ew-add-account-merge-error
add account merge error
2018-10-09 12:54:54 -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
Jessica Lawshe
6c5cf571da Merge pull request #1007 from sharelatex/jel-social-image
Add default Twitter and OG images
2018-10-08 16:04:13 +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