hugh-obrien
a39bcdb0f0
add border-radius to overbox on submit modal
2018-07-02 17:30:17 +01:00
Douglas Lovell
260f927980
Merge pull request #719 from sharelatex/dcl-test-fix
...
Small repair to SubscriptionController Test
2018-07-02 13:16:10 -03:00
Paulo Reis
80b7641652
Update UserEmails acceptance tests to use the new POST-based email deletion endpoint.
2018-07-02 12:31:36 +01:00
Alasdair Smith
04a98c4d91
Merge pull request #697 from sharelatex/pr-user-affilitations
...
User affiliations
2018-07-02 11:36:04 +01:00
Alasdair Smith
cf2aa76fcb
Merge pull request #712 from sharelatex/as-fix-shrinkwrap
...
Fix missing packages in shrinkwrap
2018-07-02 11:35:37 +01:00
Alasdair Smith
ec1dbc47bf
Merge pull request #703 from sharelatex/as-cm-pos-assertion
...
Add assertion method for CodeMirror Pos objects
2018-07-02 11:35:26 +01:00
Michael Mazour
8436b67260
Include project's v1 ID in export requests
...
If a project was imported from v1, include its v1 ID when making an export request back to v1.
Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.
2018-07-02 11:12:42 +01:00
Douglas Lovell
1df5b0b942
Fixup mixed indentation
2018-06-29 19:36:59 -03:00
Douglas Lovell
20835a79e2
Repair not logged in subscription controller test
2018-06-29 19:36:40 -03:00
Alasdair Smith
673e9155ba
Add CodeMirror search styles
2018-06-29 15:33:50 +01:00
Alberto Fernández Capel
d76a6ae710
Ensure overleaf settings is defined before linking to the v1 subscription page
2018-06-29 15:33:03 +01:00
Alasdair Smith
ae26237c2b
Fix styling for line numbers
...
Need to use .CodeMirror to override specificity of CM styles. This
should mean that CM styles use serifed font not monospaced
2018-06-28 17:04:26 +01:00
Paulo Reis
2e46111b4b
Add explanation about using template cache directly.
2018-06-28 17:02:04 +01:00
Paulo Reis
d021cd8e3f
Add role hints and deparment hints (when not provided by the uni).
2018-06-28 16:37:36 +01:00
Alberto Fernández Capel
18ded60619
Fix unit tests
2018-06-28 15:28:44 +01:00
Alasdair Smith
cb2c470325
Fix missing packages in shrinkwrap
2018-06-28 15:19:19 +01:00
Alberto Fernández Capel
193579070c
Ensure features are updated for users but not for stubs
2018-06-28 13:25:04 +01:00
Tim Alby
fe0fdd11bf
call v1 affiliation deletion endpoint with POST instead of DELETE
2018-06-28 13:48:28 +02:00
Tim Alby
1d80878bf8
delete affiliations on user deletion
2018-06-28 13:47:19 +02:00
Tim Alby
837f614df4
refactor affiliation requests
2018-06-28 13:47:16 +02:00
Alberto Fernández Capel
4366a0ea2c
Remove trailing whitespace
2018-06-28 11:08:20 +01:00
Tim Alby
8c70ba88b7
Add missing greater-than character in tests
2018-06-28 10:15:55 +02:00
Jessica Lawshe
49cf2a8dee
Use the MathJax Safe.js extension to prevent XSS
2018-06-27 17:57:07 -05:00
Jessica Lawshe
a739348146
Move MathJax directive to a shared directory
...
MathJax parsing now on learn pages, and soon to be on the blog, so move
out of the `ide/chat` directive.
2018-06-27 17:46:35 -05:00
Jessica Lawshe
3e8168d32f
Remove MathJax dependency injection
2018-06-27 17:31:11 -05:00
Jessica Lawshe
a34dcef8b7
Use express local for MathJax path
2018-06-27 17:27:27 -05:00
Jessica Lawshe
90986c1ade
Express local for MathJax path
2018-06-27 17:26:39 -05:00
Paulo Reis
270c67df5f
Move affiliations form and table into specific file.
2018-06-27 17:08:25 +01:00
Paulo Reis
d1467784bb
Avoid showing a comma when the user only has department info.
2018-06-27 14:21:03 +01:00
Paulo Reis
82392978a7
Improve input suggestions template readability.
2018-06-27 13:47:49 +01:00
Alberto Fernández Capel
c19fc6d245
Fetch the whole user doc
...
Other attributes are needed to calculate features.
2018-06-27 12:52:47 +01:00
Alberto Fernández Capel
8b8742d60f
Fix ReferalFeatures tests
2018-06-27 12:28:22 +01:00
Paulo Reis
522084a504
Add Keys enum; use it when detecting keystrokes in the input suggestions component.
2018-06-27 12:21:26 +01:00
Alberto Fernández Capel
7e5ababe66
Ensure we can import both user and user stubs to teams
2018-06-27 12:09:58 +01:00
Alasdair Smith
3a90a2d004
Add custom assertion method to chai for comparing CM Pos objects
2018-06-27 11:28:29 +01:00
Tim Alby
bebbc433bf
proxy static institutions URLs in dev env
2018-06-27 09:59:55 +02:00
Tim Alby
60009c6346
fix delete endpoint
2018-06-26 19:50:12 +02:00
Paulo Reis
3e0ad47873
Avoid suggesting blacklisted emails as university domains.
2018-06-26 16:50:55 +01:00
Paulo Reis
76d8ab11e5
Make sure we infer the university when the user finishes typing his email.
2018-06-26 16:18:53 +01:00
Jessica Lawshe
9f5e976539
Merge pull request #681 from sharelatex/jel-cms-meta-and-btn
...
CMS: control of metadata
2018-06-26 08:19:57 -05:00
Ersun Warncke
193d497d66
fix undefined last name
2018-06-26 07:50:31 -04:00
James Allen
6838904d65
Add in option to sync all users
2018-06-26 11:30:27 +01:00
James Allen
156c417df0
Don't consider current features when assignin bonus
2018-06-26 11:26:07 +01:00
James Allen
de519f545f
Add in check to see if user was out of sync
2018-06-26 11:07:13 +01:00
Shane Kilkelly
c5defc9203
Update wording, tell user to create another project
2018-06-26 09:54:58 +01:00
James Allen
fbfb0d6472
Remove conflicting .modal class from upload alerts
2018-06-26 09:09:10 +01:00
Paulo Reis
70b3df5a0e
Remove logs.
2018-06-25 17:32:39 +01:00
Paulo Reis
e7f819fbdd
Hide affiliations UI behind feature flag.
2018-06-25 17:06:23 +01:00
Paulo Reis
8ac6f4d6f4
Use v1 proxy; even more style adjustments.
2018-06-25 16:13:43 +01:00
James Allen
3a8b5d23d8
Merge pull request #696 from sharelatex/ja-fix-right-click-new-file
...
Fix right click new and upload file options
2018-06-25 16:10:15 +01:00
James Allen
80d7c39044
Fix right click new and upload file options
2018-06-25 15:01:27 +01:00
Paulo Reis
b92dc98b99
Merge branch 'master' into pr-user-affilitations
2018-06-25 14:13:26 +01:00
Paulo Reis
00dfcf66c6
More styling adjustments.
2018-06-25 13:44:43 +01:00
Henry Oswald
c1a8d8b31a
Merge branch 'master' into ho-clsi-double-backend
2018-06-25 13:43:40 +01:00
Tim Alby
7a3fcf6d2c
change error message on email update failure
2018-06-25 13:47:22 +02:00
Tim Alby
c6de896bb5
decorate emails list with affiliation data
2018-06-25 13:47:04 +02:00
Tim Alby
c81f9c24ed
mock affiliations API in acceptance tests
2018-06-25 13:45:46 +02:00
Tim Alby
e41391fb4a
ignore affiliations if v1 is not configured
2018-06-25 13:45:46 +02:00
Tim Alby
d3b2a2650f
add/remove affiliations when adding/removing emails
2018-06-25 13:45:46 +02:00
Shane Kilkelly
04be842b30
Fix validation of project-output-file, no build_id for imported v1 projects
2018-06-25 12:27:56 +01:00
Shane Kilkelly
b3d17fc753
Add a warning message when there are no other projects to choose.
2018-06-25 11:48:05 +01:00
Tim Alby
b65ba388ba
replace OldAssetProxy
2018-06-25 12:36:51 +02:00
Shane Kilkelly
f6424ada40
Merge pull request #655 from sharelatex/sk-linked-files-output-redux
...
Linked files from project output
2018-06-25 10:28:29 +01:00
Jessica Lawshe
f7a1ded6e1
More general class and visible preview
2018-06-22 13:42:08 -05:00
Jessica Lawshe
af2417bdc5
Move metadata to separate file and update metadata existence check
2018-06-22 13:42:01 -05:00
Paulo Reis
a1da24a86d
Styling adjustments.
2018-06-22 16:07:54 +01:00
James Allen
76de9c05f2
Merge pull request #688 from sharelatex/ja-fix-upgrade-prompt-contrast
...
Set font colour at entire side bar level
2018-06-22 16:00:05 +01:00
James Allen
0a2fe7e941
Merge pull request #687 from sharelatex/ja-fix-subscription-upsell
...
Fix check for hasSubscription
2018-06-22 15:59:51 +01:00
James Allen
be13ed7beb
Merge pull request #689 from sharelatex/ja-use-app-name-in-upgrade
...
Remove hardcoded ShareLaTeX reference in upgrade blurb
2018-06-22 15:59:41 +01:00
James Allen
89d5605874
Add script that refreshes all v1 users' features in v2
2018-06-22 15:33:02 +01:00
Nate Stemen
ab159a5169
Merge remote-tracking branch 'origin' into ns-dropdown-on-completion
2018-06-22 10:25:18 -04:00
Nate Stemen
e9f8cceabb
fix syntax error
2018-06-22 10:23:33 -04:00
James Allen
c004cdb200
Remove hardcoded ShareLaTeX reference in upgrade blurb
2018-06-22 14:24:41 +01:00
James Allen
9194e25742
Set font colour at entire side bar level
2018-06-22 14:23:43 +01:00
James Allen
0edd2b5fe7
Fix check for hasSubscription
2018-06-22 14:10:20 +01:00
Shane Kilkelly
d76c6c2c22
Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone
...
Copy linkedFileData when cloning a project
2018-06-22 13:22:45 +01:00
Shane Kilkelly
a8222f2e31
Fix tests after sync with master
2018-06-22 13:20:13 +01:00
Shane Kilkelly
096d3f28a1
Move the handleError function into the LinkedFilesController
2018-06-22 13:09:18 +01:00
Shane Kilkelly
ebe828aa62
Refactor, and remove the source_project_display_name prop from linkedFileData
2018-06-22 13:09:18 +01:00
Shane Kilkelly
dfb4898be5
Move getFileById to the LinkedFilesHandler module
2018-06-22 13:09:18 +01:00
Shane Kilkelly
c8012f2968
Cleaner import of errors
2018-06-22 13:09:18 +01:00
Shane Kilkelly
6058f3ef9b
Refactor the LinkedFiles/Agent system, and track build_id for output files
2018-06-22 13:09:18 +01:00
Shane Kilkelly
d93eb448e3
Move Clsi logic to ClsiManager
2018-06-22 13:09:18 +01:00
Shane Kilkelly
54cdbd738c
If selecting 'output.pdf', set the filename to project-name.pdf
2018-06-22 13:09:18 +01:00
Shane Kilkelly
67dcbff450
Remove linked-files items from the left-menu test controls
2018-06-22 13:09:18 +01:00
Shane Kilkelly
708e809df6
Use errors from ProjectFileAgent
2018-06-22 13:09:18 +01:00
Shane Kilkelly
2ade78783b
Add acceptance test for refreshing output file from v1 project
2018-06-22 13:09:18 +01:00
Shane Kilkelly
a313184c71
Handle linked-output-files from v1 imports
2018-06-22 13:09:18 +01:00
Shane Kilkelly
28257462ae
Acceptance tests for project-output-file
2018-06-22 13:09:18 +01:00
Shane Kilkelly
48a4f6c4c4
Fix error handling for failing to get output file
2018-06-22 13:08:13 +01:00
Shane Kilkelly
2cfc2b4738
Only show output files which are images or pdfs
2018-06-22 13:08:13 +01:00
Shane Kilkelly
7fc99a38f8
Better styling on the output-files toggle
2018-06-22 13:08:13 +01:00
Shane Kilkelly
6672a20c2b
Enable switching between source and output files
2018-06-22 13:08:13 +01:00
Shane Kilkelly
64ec90f34f
Move the isOutputFilesMode flag onto the scope
2018-06-22 13:08:13 +01:00
James Allen
5717496685
Create unified new file modal with linked files
2018-06-22 13:08:13 +01:00
Shane Kilkelly
2da1d57948
Clean up logging
2018-06-22 13:08:13 +01:00
Shane Kilkelly
87474ce060
Remove commentary
2018-06-22 13:08:13 +01:00
Shane Kilkelly
d4beba24b6
Backend for project output file agent
2018-06-22 13:08:13 +01:00
Shane Kilkelly
e916d96792
WIP: basic backend for project-output-file agent
2018-06-22 13:08:13 +01:00
Shane Kilkelly
ead245721b
Mostly working selection of output files from another project
2018-06-22 13:08:13 +01:00
Shane Kilkelly
60ca298db3
WIP
2018-06-22 13:08:13 +01:00
Paulo Reis
9bc70d479c
Use university-provided list of departments when available.
2018-06-22 11:24:14 +01:00
Shane Kilkelly
fadbd72837
Add unit test for copying project with linked files
2018-06-22 10:52:49 +01:00
Shane Kilkelly
5abb745e05
Copy linkedFileData when cloning a project
2018-06-22 10:00:39 +01:00
Alberto Fernández-Capel
d36dbfda07
Merge pull request #665 from sharelatex/afc-import-team-invites
...
Add method to import invites
2018-06-22 09:55:19 +01:00
Paulo Reis
62ab9dbb98
Rearrange layout to have the new affiliation form within the affiliations table.
2018-06-21 17:18:01 +01:00
Paulo Reis
b16ebc1843
Read user email from the URL in DELETE requests.
2018-06-21 17:16:42 +01:00
Timothée Alby
caee25d85d
Revert "Replace OldAssetsProxy"
2018-06-21 15:52:20 +02:00
Timothée Alby
c30cdf955b
Merge pull request #666 from sharelatex/ta-smart-proxy
...
Replace OldAssetsProxy
2018-06-21 14:35:16 +02:00
James Allen
de45c08585
Restrict token look ups by id to not conflict with other tests
2018-06-21 11:00:25 +01:00
James Allen
c07ce3bd89
Merge pull request #675 from sharelatex/ja-fail-on-acceptance-tests
...
Bail out with exit code on acceptance test failure
2018-06-21 10:28:41 +01:00
James Allen
46fbf0c641
Merge pull request #672 from sharelatex/ja-refactor-email-templating
...
Refactor email templating
2018-06-21 10:28:26 +01:00
James Allen
4608a59e3d
Store OneTimeTokens in mongo rather than redis
2018-06-21 10:22:08 +01:00
James Allen
0dcbc5facb
Send out confirmation emails on register and record confirmedAt date
2018-06-21 10:21:15 +01:00
James Allen
74ca0c4220
Refactor email template system
2018-06-21 10:19:12 +01:00
Paulo Reis
147d74d92a
Integrate e-mails table with backend.
2018-06-20 14:22:06 +01:00
Henry Oswald
4cb78a5797
move start time inside each clsi request as they are run in series now
2018-06-20 14:15:42 +01:00
Henry Oswald
5a7b8f4887
fix broken test for compile controller
2018-06-20 13:44:07 +01:00
Paulo Reis
917776aede
Change the UI to gradually show needed fields for affiliations.
2018-06-20 11:37:55 +01:00
Paulo Reis
f3806faeb2
Make git ignore compiled Coffeescript Angular components.
2018-06-20 11:37:34 +01:00
Alasdair Smith
6c1994e25b
Stub errors in tests to cache
2018-06-20 11:19:23 +01:00
Henry Oswald
e60157094b
improve logging for 2 compile backends
2018-06-20 11:07:34 +01:00
Tim Alby
bbed5fca9a
simplify proxy
2018-06-20 10:58:19 +02:00
Paulo Reis
c0241df15c
Rewrite service and controller code to send the correct payload according to use case (no uni; known uni; new uni).
2018-06-19 17:10:55 +01:00
Paulo Reis
82f359e735
Support more input configuration attributes in the input suggestions component.
2018-06-19 17:10:02 +01:00
Alasdair Smith
8de9e9fae4
Use error type instead of error message to check v1 connection error
2018-06-19 16:25:56 +01:00
Alasdair Smith
82a8e37071
Handle V1 connection refused when getting v1 subscription
2018-06-19 16:25:31 +01:00
Alasdair Smith
8492373a14
Add V1ConnectionError
2018-06-19 16:24:27 +01:00
Henry Oswald
b5581c4d40
Merge branch 'master' into ho-clsi-double-backend
2018-06-19 14:55:18 +01:00
Jessica Lawshe
ad50db858e
Merge pull request #664 from sharelatex/jel-pricing-plans-event
...
Plans and Pricing Google Analytics events
2018-06-19 08:48:12 -05:00
Henry Oswald
ab0f258c03
don't make request to google cloud clsi if there is no url
2018-06-19 14:22:34 +01:00
James Allen
99728d8f18
Bail out with exit code on acceptance test failure
2018-06-19 13:56:34 +01:00
Michael Mazour
0246631443
Add public API endpoints to reach CLSIs
...
- `/api/clsi/compile/:submission_id`
- `/api/clsi/compile/:submission_id/build/:build_id/output/:file`
Also per review:
- DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest
- Include submission_id in a log message
- Don't include timeout in limits when getting file
2018-06-19 12:04:02 +01:00
James Allen
0c86a7dc9b
Revert "Simplify package metadata check"
2018-06-19 08:43:27 +01:00
James Allen
b5e976f8a7
Merge pull request #663 from sharelatex/as-simplify-metadata-check
...
Simplify package metadata check
2018-06-19 08:38:03 +01:00
James Allen
a3e92a8867
Merge pull request #658 from sharelatex/ja-enable-subscriptions
...
Add message explaining Collaborator subscription to v1 users
2018-06-19 08:37:50 +01:00
Nate Stemen
e7038f0a57
remove trailing } for all commands rather than relying on Helpers module
2018-06-18 15:08:25 -04:00
Tim Alby
3d272ca297
replace OldAssetProxy
2018-06-18 18:37:58 +02:00
Nate Stemen
9f309e22a7
refactor AutoCompleteManager
2018-06-18 12:26:45 -04:00
Alberto Fernández Capel
81c102b501
Add method to import invites
2018-06-18 14:48:27 +01:00
Alasdair Smith
f9c074a31e
Simplify check for when we are editing lines with metadata commands
2018-06-18 10:52:27 +01:00
Jessica Lawshe
fe225fbbd3
Include event label when features table viewed
2018-06-15 16:29:42 -05:00
Jessica Lawshe
3de1721aa2
Send event to Google Analytics when variant selected
2018-06-15 16:11:45 -05:00
Nate Stemen
b1c0552214
add ref command to snippets
2018-06-15 16:59:35 -04:00
Nate Stemen
4b1bc291cb
misspelled variable completionAfterCursor
2018-06-15 10:31:51 -04:00
Nate Stemen
b8787e6e68
modify dropdown to trigger on command completion if possible
2018-06-15 08:56:03 -04:00
Paulo Reis
3ddb8d0bef
Add affiliations UI.
2018-06-15 11:33:47 +01:00
Paulo Reis
5ada231d15
Add basic affiliations styles, data services and controller.
2018-06-15 11:33:47 +01:00
Paulo Reis
a8cb126c4b
Add UI Select (enhanced select boxes) components.
2018-06-15 11:33:47 +01:00
Paulo Reis
1df8c044ee
Add component for auto-completing inputs.
2018-06-15 11:33:47 +01:00
Henry Oswald
5f8985811d
mvp to send requests to 2 backends
2018-06-14 17:41:30 +01:00
Timothée Alby
55112dc7dc
Merge pull request #648 from sharelatex/hb-export-status
...
Export status endpoint
2018-06-14 13:59:11 +02:00
Timothée Alby
984d81f5b8
Merge pull request #649 from sharelatex/ta-emails-endpoints
...
Add Emails Endpoints
2018-06-14 13:59:00 +02:00
Timothée Alby
3374aa6c9d
Merge pull request #660 from sharelatex/ja-no-legacy-nodemon
...
Don't use the legacy watch option in nodemon
2018-06-14 13:58:38 +02:00
James Allen
dc3fea74f9
Don't use the legacy watch option in nodemon
2018-06-14 10:41:18 +01:00
James Allen
32e14527c6
Make links readable in v2 alerts
2018-06-14 10:31:06 +01:00
James Allen
eda031023c
Update subscription thank you page to remove ShareLaTeX references
2018-06-14 10:15:20 +01:00
hugh-obrien
0321780eba
adding tests for exports status checker
2018-06-14 09:44:05 +01:00
hugh-obrien
fb9ca430de
export status endpoint
2018-06-14 09:44:05 +01:00
James Allen
45fbcfecb3
Merge pull request #659 from sharelatex/ja-fix-subscription-dash
...
Add null check to subscription dash
2018-06-14 09:11:45 +01:00
James Allen
c60b74a2b1
Merge pull request #652 from sharelatex/ja-fix-front-end-test
...
Fix frontend HistoryV2ManagerTests
2018-06-14 09:11:32 +01:00
James Allen
e162ff6256
Merge pull request #654 from sharelatex/ja-explain-error-on-crash
...
Explain error if web crashes in acceptance tests
2018-06-14 09:09:26 +01:00
James Allen
1e7601d647
Add null check to subscription dash
2018-06-14 09:03:14 +01:00
James Allen
e5bd7ce551
Add message explaining Collaborator subscription to v1 users
2018-06-13 17:22:34 +01:00
James Allen
82c6d9b293
Merge pull request #629 from sharelatex/ja-display-subscriptions
...
Link subscriptions to v1
2018-06-13 13:55:57 +01:00
Henry Oswald
b24b110037
Merge pull request #647 from sharelatex/ho-clsi-domain
...
PDF download takes optional domain paramater
2018-06-13 11:30:17 +01:00
Henry Oswald
406bf1f5fc
Don't set pdfDownloadDomain by default
2018-06-13 11:23:33 +01:00
James Allen
76d10e6402
Improve error message readability
2018-06-13 10:40:36 +01:00
Henry Oswald
02110064f7
Merge branch 'master' into ho-clsi-domain
2018-06-13 10:32:51 +01:00
James Allen
f57290382d
Explain error if web crashes in acceptance tests
2018-06-13 10:11:38 +01:00
Shane Kilkelly
3baf0836bc
Support project-linked-files originating from imported v1 projects
2018-06-13 10:02:54 +01:00
Jessica Lawshe
baa321fa1a
Merge pull request #628 from sharelatex/ns-only-one-doc-env
...
only suggest one document environment per project
2018-06-12 08:44:14 -05:00
James Allen
b00a79ff1c
Redirect to v1 plans page from v2
2018-06-12 13:52:47 +01:00
James Allen
a417dc8ff4
v1Subscription -> v1Subscriptions
2018-06-12 13:52:47 +01:00
James Allen
6e2ec2f982
Update remaining unit tests
2018-06-12 13:52:47 +01:00
James Allen
28f51cd4b4
Update SubscriptionController unit tests
2018-06-12 13:52:47 +01:00
James Allen
606419476f
Update LimitationsManager unit tests
2018-06-12 13:52:47 +01:00
James Allen
034e50760e
Add flag that can disable plans page
2018-06-12 13:52:47 +01:00
James Allen
ce60e6941c
Check with v1 before allowing a new subscription
2018-06-12 13:52:47 +01:00
James Allen
9d84263463
Fetch subscription details from v1 and display to user
2018-06-12 13:52:46 +01:00
James Allen
1d7accabdd
Update group notification for new group invite URL
2018-06-12 09:54:54 +01:00
James Allen
f7532e5854
Merge pull request #619 from sharelatex/afc-email-tokens
...
Use emails with tokens for team invites
2018-06-12 08:30:23 +01:00
James Allen
d4efdb3ede
Fix frontend HistoryV2ManagerTests
2018-06-11 15:47:23 +01:00
James Allen
dbd6ea30e9
Improve robustness of email validation
2018-06-11 15:22:42 +01:00
James Allen
ed5bc70350
Tweak front-end layout
2018-06-11 14:20:46 +01:00
James Allen
155102df64
Use Error classes, and ensure invited_emails is cleared on new invite
2018-06-11 14:20:35 +01:00
James Allen
b716f59442
Remove deprecated removeEmailInviteFromGroup
2018-06-11 14:19:47 +01:00
Tim Alby
97c145433e
use EmailHelper.parseEmail on registration
...
Also changed EmailHelper to use the regexp already used in
UserRegistrationHandler rather than the `mimelib` package as it is
deprecated.
2018-06-11 12:31:18 +02:00
Tim Alby
e614ed9248
add emails endpoints
2018-06-11 10:35:23 +02:00
Henry Oswald
75c9489c06
PDF Downloads work, not tested on large pdf's yet
2018-06-08 17:17:00 +01:00
Tim Alby
5438a565b9
use multiple emails when relevant
2018-06-08 17:53:45 +02:00
Tim Alby
31827ae6b5
add emails attribute on user creation
2018-06-08 17:53:45 +02:00
Jessica Lawshe
07aedaa92b
Merge pull request #645 from sharelatex/jel-add-cms
...
Existence check for data from CMS
2018-06-08 10:14:23 -05:00
Jessica Lawshe
43da34098e
Existence check
2018-06-08 10:07:44 -05:00
Jessica Lawshe
ba5b3bb06a
Merge pull request #581 from sharelatex/jel-add-cms
...
Add CMS
2018-06-08 07:18:03 -05:00
Jessica Lawshe
d57660aeb5
Merge pull request #632 from sharelatex/jel-plans-pricing-fix
...
Plans and Pricing fixes
2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-08 12:21:17 +01:00
Alberto Fernández-Capel
e7e429a963
Merge pull request #605 from sharelatex/afc-update-user-references
...
Add method to update user references
2018-06-08 11:29:25 +01:00
Alberto Fernández Capel
57775e60b1
Merge remote-tracking branch 'origin/master' into afc-update-user-references
2018-06-08 11:28:58 +01:00
Alberto Fernández-Capel
10da4fc5f7
Merge pull request #585 from sharelatex/afc-team-overleaf-id
...
Add overleaf id to the Subscription (team) schema
2018-06-08 11:27:15 +01:00
Alasdair Smith
c53ff0fa84
Merge pull request #618 from sharelatex/as-toolbar-btns
...
Rich text toolbar styles
2018-06-08 10:09:27 +01:00
Alberto Fernández Capel
c45b4463bb
Fix unit test
2018-06-08 10:05:26 +01:00
Alberto Fernández Capel
5159f6f33d
Check the subscription is in a group plan before adding new members
2018-06-08 09:58:51 +01:00
Timothée Alby
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
Alberto Fernández Capel
c4250e601e
Minor copy change Registered -> Accepted invite
2018-06-07 16:53:19 +01:00
Alberto Fernández Capel
85f4a31585
Proper coffee syntax
2018-06-07 16:49:17 +01:00
Jessica Lawshe
6c92238f37
Fix analytics event label for when shouldABTestPlans: false
2018-06-07 10:30:21 -05:00
Jessica Lawshe
484ee9ad61
Should not AB test when signed up before 2018-06-06
2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755
Honour invited_emails for the team being
...
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f
Simplify method name
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
30b935befd
Prevent double rendering error
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299
Do not include the Licence ending in domain invites
...
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
88d12b43ac
Make CTA message match regular message
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94
Rename view variable to invite
...
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
Hugh O'Brien
6f5c777163
Merge pull request #622 from sharelatex/hb-take-emis-names-as-input
...
Take user entered first and last names for EMIS
2018-06-07 15:52:33 +01:00
Timothée Alby
0516a7ed79
Merge pull request #630 from sharelatex/ta-multi-emails-script
...
Script to Backfill Secondary Emails
2018-06-07 15:40:55 +02:00
Timothée Alby
f422b7242d
Merge pull request #603 from sharelatex/ta-use-multi-emails
...
Use Multiple Emails
2018-06-07 15:40:43 +02:00
Alasdair Smith
c4c9441995
Adjust caret down
2018-06-07 14:13:19 +01:00
Alasdair Smith
ad13eccfa7
Flatten rules for readability
2018-06-07 14:13:19 +01:00
Alasdair Smith
9ae92dbeef
Small icon & math icon styling
2018-06-07 14:13:19 +01:00
Alasdair Smith
ea18d606c4
Nicer v2 styles
2018-06-07 14:13:19 +01:00
Alasdair Smith
12d7eb8a46
Adjust styling to work with wrapper
2018-06-07 14:13:19 +01:00
Alasdair Smith
611a6f9c0b
Reduce width of overflowed button menu
2018-06-07 14:13:19 +01:00
Alasdair Smith
c5f62d3aa3
Style dropdown & clean up naming
2018-06-07 14:13:19 +01:00
Alasdair Smith
aaf5da877e
Style different buttons
2018-06-07 14:10:33 +01:00
Alasdair Smith
7384cfba1a
Style wrapped buttons so the toolbar can be resized
2018-06-07 14:09:02 +01:00
Alasdair Smith
bfaa6d8dcc
Improve styling of buttons
2018-06-07 14:05:21 +01:00
Alberto Fernández Capel
6639f61a43
Remove extra space between rows
2018-06-07 14:05:10 +01:00
James Allen
c2ef93b212
Merge pull request #610 from sharelatex/ja-sync-from-v2
...
Tell v1 when refreshing features in v2
2018-06-07 13:30:34 +01:00
hugh-obrien
c684fc3383
fix first/last name check bug
2018-06-07 12:57:01 +01:00
Alberto Fernández Capel
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
Alasdair Smith
3fa6f4743d
Merge pull request #637 from sharelatex/as-fix-clone-owner
...
Set the owner object to the current user when cloning a project
2018-06-07 11:54:09 +01:00
Hayden Faulds
87f6c65b99
Merge pull request #625 from sharelatex/hof-container-teardown-timeout
...
reduce acceptance test container teardown timeout to 0
2018-06-07 11:50:16 +01:00
Alasdair Smith
f3c871a972
Merge pull request #640 from sharelatex/as-fix-leave-quick-action
...
Show leave quick action instead of archive for unowned projects
2018-06-07 11:44:36 +01:00
Alasdair Smith
89ecb9f01b
Merge pull request #641 from sharelatex/as-fix-autocomplete-blur
...
Fix blurry autocomplete highlight on Chrome
2018-06-07 11:44:25 +01:00
Alberto Fernández Capel
566c41cafd
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-07 11:40:03 +01:00
Alasdair Smith
4a1c2cf0e0
Set cloned project's owner to current user
...
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
2018-06-07 11:19:11 +01:00
Tim Alby
458650d456
create script to backfill secondary emails
2018-06-07 11:26:56 +02:00
Alasdair Smith
0900559579
Fix blurrly autocomplete highlight on Chrome
...
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.
I've replaced with font-weight: bold, which visually has the same appearance
2018-06-06 17:19:12 +01:00
Alberto Fernández Capel
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
Alasdair Smith
8f71b104c5
Fix bug where unowned project would show archive quick action instead of leave
...
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
2018-06-06 16:59:13 +01:00
Alberto Fernández Capel
4885b70016
Better translation key
2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b
Replace hardcoded string
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
b308dcef63
Clean up markup
...
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
8a317b5bfe
Better wording
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5
Invite users in the invited_emails array
...
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
2018-06-06 15:36:53 +01:00
Tim Alby
3cb499a3c2
add comment
2018-06-06 15:46:41 +02:00
Tim Alby
7726314e7c
add test to explicitely check filter
2018-06-06 15:45:12 +02:00
Tim Alby
e4da748257
add filter to query on emails attribute
2018-06-06 14:52:09 +02:00
Tim Alby
813289f5de
use multiple emails when relevant
2018-06-06 11:45:01 +02:00
Tim Alby
c5530163f5
add emails attribute on user creation
2018-06-06 11:45:01 +02:00
Tim Alby
1f6fcafce6
remove default emails attribute on user model
2018-06-06 11:11:57 +02:00
Jessica Lawshe
679d91c4d2
Update default plans view conditional
...
Fixes a flash of unwanted content on Firefox
2018-06-05 12:58:18 -05:00
Nate Stemen
26385718e6
only suggest thebibliography once
2018-06-05 11:02:03 -04:00
Alberto Fernández Capel
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
Tim Alby
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02:00
Jessica Lawshe
b63384cbf1
Merge pull request #537 from sharelatex/jel-pricing-plans
...
Plans and pricing variant
2018-06-05 09:30:43 -05:00
Nate Stemen
863128a030
only suggest one document environment in project
2018-06-05 10:08:27 -04:00
Paulo Jorge Reis
1f19e0e7da
Merge pull request #627 from sharelatex/hof-fix-tk-in-tests
...
move tk call to before sandboxed module call
2018-06-05 14:15:34 +01:00
Paulo Reis
bfad95ae61
File restore button needs to be smaller to fit the new toolbar height.
2018-06-05 13:59:27 +01:00
Hayden Faulds
0bb37d4991
move tk call to before sandboxed module call
2018-06-05 13:42:26 +01:00
Hayden Faulds
be0fd9a446
reduce container teardown timeout to 0
2018-06-05 11:30:48 +01:00
Paulo Reis
4088c164c9
Update translations; use underscores for keys.
2018-06-05 11:15:39 +01:00
Paulo Reis
8e5032fb34
Merge branch 'master' into pr-v2-history-ui
2018-06-05 10:55:42 +01:00
Paulo Reis
1624639bc8
Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui
2018-06-05 10:32:06 +01:00
Paulo Reis
f858786f2d
Add i18n.
2018-06-05 10:14:16 +01:00
Jessica Lawshe
8b672dea0d
Add unit tests
2018-06-04 14:42:26 -05:00
Jessica Lawshe
b1c988e4c1
Add hover and scroll events
2018-06-04 14:42:26 -05:00
Jessica Lawshe
10cf5825a5
Add plans variant
...
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “
Also, move repeated elements to partials
2018-06-04 14:42:26 -05:00
Jessica Lawshe
b4a989f0b7
Add contentful
2018-06-04 09:51:40 -05:00
Jessica Lawshe
64ead238e4
Add meta tags
2018-06-04 09:51:35 -05:00
hugh-obrien
54ce196500
test custom first and last name for exports
2018-06-04 13:16:21 +01:00
hugh-obrien
b02eea1e7e
update tests for exports name options
2018-06-04 13:16:21 +01:00
hugh-obrien
4c5f186ca2
take custom first and last names from export UI
2018-06-04 13:16:21 +01:00
Hugh O'Brien
63482e0ea0
Merge pull request #617 from sharelatex/hb-check-for-folders-clientside
...
Add function to check for existence of folders
2018-06-04 12:07:25 +01:00
Alasdair Smith
7898a1deca
Fix missed snake_case to camelCase, causing bug where projects couldn't be restored
2018-06-04 10:45:23 +01:00
Alberto Fernández Capel
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03
I can haz some grammar
2018-06-01 16:17:11 +01:00
Alberto Fernández Capel
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
89735f4b8e
Keep method name for compatibility
2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24
Remove some dead code
2018-06-01 14:55:07 +01:00
Hugh O'Brien
a79c9b94a8
Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web
...
Extract v1 templates code to web
2018-06-01 11:29:36 +01:00
Alberto Fernández Capel
9b18e58b68
Choose a better method name
...
This method is now only notifying users about a potential domain
licence
2018-06-01 11:28:06 +01:00
Alberto Fernández Capel
385fec1914
Clean up code that uses invited_emails
2018-06-01 11:23:25 +01:00
hugh-obrien
063187b5fc
add function to check for existance of folders
2018-05-31 17:03:41 +01:00
Alberto Fernández Capel
1c485c1884
Improve error handling
2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
Brian Gough
fef667a738
Merge pull request #614 from sharelatex/ja-restrict-restore
...
Don't allow read-only users to restore
2018-05-31 15:52:40 +01:00
Brian Gough
c4f3a12ce5
add missing locking to copyFileFromExistingProject
2018-05-31 14:51:32 +01:00
Alberto Fernández Capel
39c8595c27
Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
...
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
James Allen
f5367985c3
Don't allow read-only users to restore
2018-05-31 13:44:37 +01:00
hugh-obrien
d47e845367
add v1 template tests
2018-05-31 13:26:54 +01:00
Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c
extract v1 templates code to web
2018-05-31 11:12:31 +01:00
Shane Kilkelly
d3ae276091
Merge pull request #579 from sharelatex/sk-linked-files-from-project
...
Linked Files from Project
2018-05-31 11:08:08 +01:00
Alasdair Smith
57c56a0853
Merge pull request #565 from sharelatex/as-dash-action-btns
...
Add action buttons to v2 dash
2018-05-31 10:11:20 +01:00
Alasdair Smith
cc9d18d991
Merge pull request #600 from sharelatex/as-refactor-rt-load
...
Refactor loading rich text
2018-05-31 10:11:01 +01:00
Alasdair Smith
00808dfc9a
Merge pull request #599 from sharelatex/sk-less-border-radius-on-selects-v2
...
On v2, use smaller (default) border radius on select inputs
2018-05-31 10:10:49 +01:00
Alasdair Smith
5ec238cae8
Switch archive button with restore button for archived projects
2018-05-31 10:05:39 +01:00
Alasdair Smith
7dffc56804
Clone project action button
2018-05-31 10:05:04 +01:00
Alasdair Smith
2354f4156b
Download project action button
2018-05-31 10:04:59 +01:00
Alasdair Smith
ffc06f2a3b
Archive project action button
2018-05-31 10:04:50 +01:00
Alasdair Smith
a2dff4bfbb
Right align actions header
2018-05-31 09:59:35 +01:00
Alasdair Smith
83c62c8ab1
Only show action buttons on v2
2018-05-31 09:58:39 +01:00
Alasdair Smith
2d1bcda9ff
Style action buttons, and hide on smaller screens
2018-05-31 09:58:39 +01:00
Alasdair Smith
20cca0fcd4
Add action buttons to project list
2018-05-31 09:58:18 +01:00
Jessica Lawshe
be35e37d29
Style for CMS pages
2018-05-30 15:54:10 -05:00
James Allen
4f5148e668
Wrap text like normal
2018-05-30 17:55:47 +01:00
Paulo Reis
6e7e76a3ce
Margin and padding adjustments.
2018-05-30 17:34:46 +01:00
Henry Oswald
a747480425
add references host into settings
2018-05-30 15:28:59 +01:00
Paulo Reis
7cb4280a4d
Remove commented-out code.
2018-05-30 15:18:15 +01:00
Paulo Reis
66d7bdb26b
Change buttons copy.
2018-05-30 15:03:22 +01:00
Paulo Reis
aec4ea79ad
Make history file tree more like the editor file tree in SL.
2018-05-30 15:00:20 +01:00
Paulo Reis
4c4a4f10c1
Rename history file tree and move it around.
2018-05-30 14:21:01 +01:00
Alberto Fernández Capel
9aa95cb0d5
Show team invites
2018-05-30 13:06:27 +01:00
James Allen
e0e88b25fe
Make agrument checking more robust
2018-05-30 12:48:08 +01:00
Alasdair Smith
d0b160d9a2
Rename flag for clarity
2018-05-30 11:55:09 +01:00
Alasdair Smith
c6d2b4f1e7
Use single rich text include instead of split toolbar & body includes
2018-05-30 11:44:27 +01:00
Alberto Fernández Capel
7e09c0e0b1
First stab at email token invites (WIP)
2018-05-30 11:29:21 +01:00
Paulo Reis
637c492e6e
Merge branch 'master' into pr-v2-history-ui
2018-05-30 11:24:33 +01:00
James Allen
c5b553d4a6
Notify v1 by default
2018-05-29 17:31:15 +01:00
James Allen
301ae80f99
Allow refreshFeatures to notify v1 to update its features
2018-05-29 17:21:42 +01:00
Timothée Alby
6db3bf59a6
Merge pull request #586 from sharelatex/ta-refactor-user-getter
...
Canonical Way to Get Users by Email
2018-05-29 17:56:59 +02:00
Timothée Alby
eeff32bf4f
Merge pull request #584 from sharelatex/ta-remove-deprecated-method
...
Remove getUserOrCreateHoldingAccount Function
2018-05-29 17:56:42 +02:00
Paulo Reis
8d2189f843
Support using both point-in-time and compare modes.
2018-05-29 16:50:15 +01:00
Alberto Fernández Capel
b52fbdbfa4
Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups
2018-05-29 15:37:04 +01:00
Jessica Lawshe
85ee5a36c8
Merge pull request #587 from sharelatex/jel-contact
...
Move contact form to modules
2018-05-29 09:20:05 -05:00
Alberto Fernández Capel
259d690f7c
Add method to update user references
2018-05-29 12:00:22 +01:00
Shane Kilkelly
9e65e5e813
Fix loading of Rich Text page in Test Controls
2018-05-29 10:46:22 +01:00
Shane Kilkelly
14898acd7f
Update linked-file acceptance tests
2018-05-29 10:40:38 +01:00
Shane Kilkelly
dccac6302e
Use a decorateLinkedFileData function on server to add project name
2018-05-29 10:07:31 +01:00
Shane Kilkelly
92fb83e665
Use the correct linkedFileData var
2018-05-29 10:05:50 +01:00
Tim Alby
5fbe5c5537
remove UserLocator
...
Use UserGetter instead
2018-05-28 14:11:13 +02:00
Tim Alby
bbaca91e57
add UserGetter#getUserByMainEmail
...
Use only that method to find users by email.
2018-05-28 14:11:09 +02:00
Tim Alby
5a590aa021
remove getUserOrCreateHoldingAccount function
...
The function is deprecated
2018-05-28 14:09:13 +02:00
Shane Kilkelly
ce147b012f
Cleaner unpacking of data from scope
2018-05-25 16:03:45 +01:00
Shane Kilkelly
bc7d6a64ed
Add a trailing comma
2018-05-25 16:01:37 +01:00
Shane Kilkelly
c8a8fe6af7
Use Agent.handleError in case checkAuth produces an error
2018-05-25 16:01:11 +01:00
Jessica Lawshe
868083676f
Move contact form
2018-05-25 08:50:38 -05:00
Shane Kilkelly
2a11a70cd3
Use smaller border-radius on textarea inputs, on v2
2018-05-25 14:48:37 +01:00
Shane Kilkelly
c4da8701c8
On v2, use smaller (default) border radius on select inputs
2018-05-25 13:38:19 +01:00
Hayden Faulds
09ddc75126
Merge pull request #583 from sharelatex/ta-create-unit-test-app-task
...
Add test_unit_app task
2018-05-25 13:22:25 +01:00
Hayden Faulds
29f7ce0bbf
Merge pull request #576 from sharelatex/mm-handle-export-error
...
Handle error in ExportsController
2018-05-25 13:22:18 +01:00
Shane Kilkelly
105d858155
Move waitFor into an angular service
2018-05-25 13:02:58 +01:00
Shane Kilkelly
cfc17d56e8
Use a promise (with Angular's $q) in waitFor
2018-05-25 11:42:13 +01:00
Shane Kilkelly
8be4279165
Fix a broken if-else-if statement
2018-05-25 10:56:32 +01:00
Shane Kilkelly
f5f253ad01
Add an optional pollInterval parameter to waitFor
2018-05-25 10:56:08 +01:00
Shane Kilkelly
e33b7b1a49
Use waitFor when restoring a file in v2 history
2018-05-25 10:37:04 +01:00
Shane Kilkelly
19d8700947
Use waitFor when refreshing the binary file view
2018-05-25 10:36:39 +01:00
Shane Kilkelly
3849bcfb40
Add a waitFor helper to the ide object
2018-05-25 10:36:20 +01:00
Shane Kilkelly
0cb5beb689
Merge branch 'master' into sk-linked-files-from-project
2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911
Merge pull request #582 from sharelatex/sk-add-test-controls-panel
...
Add a "Test Controls" section to the left-panel
2018-05-24 11:41:10 +01:00
Shane Kilkelly
73a45b15ce
Make string replace op safer
2018-05-24 11:35:55 +01:00
Shane Kilkelly
de1f33a720
Remove 'private' methods from the controller scope
2018-05-24 11:32:44 +01:00
Shane Kilkelly
16419847ae
Fix linked-file-types check when opening modal
2018-05-24 11:32:20 +01:00
Shane Kilkelly
656d40ac39
Better view refresh after refreshing linked file
2018-05-24 11:31:50 +01:00
Shane Kilkelly
578d667efa
Disable the 'select a project/file' options in project-linked-file modal
2018-05-24 11:30:53 +01:00
Shane Kilkelly
8766b5d487
DRY up writing to dump-folder in FileWriter
2018-05-24 11:30:29 +01:00
Shane Kilkelly
b5e8ed81b9
Better sanitization and validation for project-linked-file
2018-05-24 11:30:03 +01:00
Shane Kilkelly
1cbc901492
Add a checkAuth function to linked-file agents
2018-05-24 11:29:37 +01:00
Alasdair Smith
81fdca91c1
Fix failing test
2018-05-24 10:27:36 +01:00
Shane Kilkelly
3181f624a7
Remove obsolete auth check
2018-05-24 10:22:17 +01:00
Alasdair Smith
1849fcb70a
Merge pull request #588 from sharelatex/ja-restrict-front-widget
...
Add Dropbox test for Front widget too
2018-05-24 10:09:18 +01:00
James Allen
7bcd285bb1
Add Dropbox test for Front widget too
2018-05-24 09:51:29 +01:00
Alberto Fernández Capel
8a55994f64
Ensure a team overleaf id is unique
2018-05-23 16:11:28 +01:00
Alasdair Smith
5ecb02bd66
Set size of RT when review panel is expanded
2018-05-23 16:11:26 +01:00
Alasdair Smith
0918e7e694
Fix CodeMirror not scrolling correctly
...
CM has a hard-coded 300px height in it's stylesheet. Because of the way we
absolutely position the editor (to work with the dividers) we need to work a
bit to set the CM height to 100%
2018-05-23 16:11:26 +01:00
Alberto Fernández Capel
c8977ab9d6
Add overleaf id to user schema
2018-05-23 15:23:46 +01:00
Shane Kilkelly
78f87c0ecf
Add acceptance test for the project-list and project-entities endpoints
2018-05-23 15:02:45 +01:00
Tim Alby
a9f1989eca
add test_unit_app task
2018-05-23 15:47:28 +02:00
Shane Kilkelly
ba9143fc3c
Show test-controls for admin users by default
2018-05-23 12:55:49 +01:00
Shane Kilkelly
561b62f7db
Add a hidden 'Test Controls' section to the left-menu.
...
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
2018-05-23 12:37:42 +01:00
Paulo Reis
fb33fc6c30
Add loading indicators; handle binary files; keep selected file across points in time.
2018-05-23 12:14:27 +01:00
Shane Kilkelly
f5dd94ca1d
Remove test code from FileTreeManager
2018-05-23 11:46:37 +01:00
James Allen
103ddd79ef
Merge pull request #580 from sharelatex/ja-fix-trials
...
Use intelligent /user/trial v2 URL for v2 trials
2018-05-23 11:46:17 +01:00
Shane Kilkelly
295425e791
Check that user can read a project on entities-json route
2018-05-23 11:34:55 +01:00
Shane Kilkelly
6a5af88e12
Remove stray comment
2018-05-23 11:32:00 +01:00
Alberto Fernández Capel
a5b608a502
Merge remote-tracking branch 'origin/master' into afc-metrics-spike
2018-05-23 09:38:22 +01:00
James Allen
2ff5ecb342
Use intelligent /user/trial v2 URL for v2 trials
2018-05-22 16:59:59 +01:00
Shane Kilkelly
4daf062be9
Add unit test for ProjectController.projectEntitiesJson
2018-05-22 16:40:39 +01:00
Shane Kilkelly
b1c1cdecef
Add unit test for ProjectController.userProjectsJson
2018-05-22 16:17:59 +01:00
Jessica Lawshe
6a84fb374f
Merge pull request #567 from sharelatex/jel-remove-wiki-page-btn
...
Remove suggest new wiki doc
2018-05-22 10:07:47 -05:00
Shane Kilkelly
bc5769cd73
Stub out the ProjectEntityHandler in ProjectController tests
2018-05-22 15:56:01 +01:00
Paulo Reis
f4f3a4375b
Add history toolbar (just scaffolding); show files at point in time.
2018-05-22 15:40:57 +01:00
Shane Kilkelly
691eec48ba
Merge branch 'master' into sk-linked-files-from-project
2018-05-22 15:39:09 +01:00
Shane Kilkelly
e34131ed45
Add acceptance test for project linked files
2018-05-22 15:01:51 +01:00
Shane Kilkelly
73184c063e
Be more specific about the source-file-not-found error case
2018-05-22 11:36:35 +01:00
James Allen
701a803da7
Fix ProjectInvite tests since the user no longer had the features
2018-05-22 10:19:47 +01:00
James Allen
1d0be569a6
Fix SubscriptionUpdater -> FeaturesUpdater miscall
2018-05-22 10:05:08 +01:00
James Allen
50bd60dd51
Split FeaturesUpdater out of SubscriptionUpdater
2018-05-22 10:05:08 +01:00
James Allen
0830c473ad
Update unit tests and refactor to make more testable
2018-05-22 10:05:08 +01:00
James Allen
4deaf7865d
Guard against no apis.v1 setting
2018-05-22 10:05:08 +01:00
James Allen
b1f378208d
Properly merge subscriptions from different places
2018-05-22 10:05:08 +01:00
Paulo Reis
81c93e11d0
History file tree integration with the backend.
2018-05-21 15:13:34 +01:00
Paulo Reis
a501e7dc85
History file tree styles.
2018-05-21 15:13:16 +01:00
Paulo Reis
a716f9ccd3
Integrate history file tree in the UI.
2018-05-21 15:12:47 +01:00
Paulo Reis
6701b4413b
Add history file tree components.
2018-05-21 15:12:03 +01:00
Paulo Reis
2a52eab8d6
Proxy history filetree requests through web.
2018-05-21 15:10:46 +01:00
Alasdair Smith
5b3fbe47db
Merge pull request #528 from sharelatex/as-cm-spelling
...
Rich text spelling
2018-05-21 11:50:30 +01:00
Shane Kilkelly
1f2ee4e3fc
Show error if refresh fails
2018-05-21 11:02:12 +01:00
Alasdair Smith
309792401f
Re-focus editor after clicking suggestion
2018-05-21 10:35:43 +01:00
Shane Kilkelly
7d8c7bebe2
Remove commented-out code
2018-05-21 10:17:00 +01:00
Shane Kilkelly
ee1b32eee1
Check for case where the source file is not found
2018-05-21 10:12:41 +01:00
Hugh O'Brien
346f37011f
Merge pull request #546 from sharelatex/ns-allow-latexmkrc
...
Allow for latexmkrc files in project zip upload
2018-05-21 09:03:40 +01:00
Hugh O'Brien
5474ec3f70
Merge pull request #557 from sharelatex/hb-compile-react-production
...
Compile react in production mode
2018-05-21 09:03:24 +01:00
Michael Mazour
19e07485bc
Handle error in ExportsController
2018-05-18 15:08:33 +01:00
Alasdair Smith
c2d7809e05
Add removeWord so that learning word removes all highlights for given word
2018-05-18 14:23:36 +01:00
Alasdair Smith
a719ac6e6e
IE11 doesn't support Array.find so use underscore instead
2018-05-18 13:33:06 +01:00
Alasdair Smith
681e67ecea
Be more consistent with naming
2018-05-18 11:29:27 +01:00
Alasdair Smith
846f27f0ad
Clear highlights that are "touching" the cursor on change
...
This means that correcting a mistake won't wait until the request has resolved and that only the word at the end of the line will have it's spelling
highlight removed instead of the entire row
2018-05-18 11:29:27 +01:00
Alasdair Smith
2be023c731
Prevent spell error marker adding newly typed characters
2018-05-18 11:29:27 +01:00
Alasdair Smith
9fa85400b3
HighlightedWordManager is more naive about tracking position
...
We are relying entirely on Ace's tracking of markers with the anchor trick.
This means that we don't have to apply changes to ensure that the word manager
data structure tracks which row the highlights are on. This is traded off
against slightly less efficient searching/removing
2018-05-18 11:29:27 +01:00
Alasdair Smith
ebf1b7c84c
Extract SpellCheckAdapter to separate file
2018-05-18 11:29:27 +01:00
Alasdair Smith
d2bba0eb60
Fix firefox not closing contextmenu correctly
2018-05-18 11:29:27 +01:00
Alasdair Smith
9c56f6c2fc
Add init test for SpellCheckManager
2018-05-18 11:29:27 +01:00
Alasdair Smith
034531d323
Replace word with suggestion and learn word
2018-05-18 11:29:27 +01:00
Alasdair Smith
cf123ce857
Extract spellMenu component and use when showing spell suggestions
2018-05-18 11:29:27 +01:00
Alasdair Smith
e6ffaaa489
Handle contextmenu for spelling
2018-05-18 11:29:27 +01:00
Alasdair Smith
abcc2cc11b
Style codemirror spelling errors
2018-05-18 11:29:27 +01:00
Alasdair Smith
8de2267824
Adapt aceEditor to use new spell check manager with adapter
2018-05-18 11:29:27 +01:00
Alasdair Smith
22e41cdce7
Simplify word manager to use Range + Anchor to automatically keep marker positions up-to-date
...
Re-implement highlighted word manager to be simpler
2018-05-18 11:29:16 +01:00
Alasdair Smith
37ca7b54a6
Re-implement spell check manager with adapter to abstract away editor
2018-05-18 11:29:16 +01:00
Shane Kilkelly
2b99080ed3
Fix rendering of long previews, stop cutting off last line in short ones
2018-05-18 11:25:01 +01:00
Shane Kilkelly
4acd55b1c6
More tidy unpacking of data
2018-05-18 11:07:59 +01:00
Shane Kilkelly
16106df2f0
Remove obsolete code
2018-05-18 11:05:20 +01:00
Shane Kilkelly
94a599d530
Fix the reloading of file view after refreshing linked file
2018-05-18 10:35:02 +01:00
Hugh O'Brien
24b4f9c46f
Merge pull request #436 from sharelatex/mm-project-export
...
Project exports spike
2018-05-18 10:31:15 +01:00
Jessica Lawshe
0fd29d4819
Remove missing wiki controller
2018-05-17 09:43:19 -05:00
James Allen
8b533841d4
Merge pull request #563 from sharelatex/ja-hide-timeout-upgrade
...
Put the compile timeout upgrade behind an enableSubscriptions flag
2018-05-17 11:55:28 +01:00
James Allen
e7a4aeaf79
Merge pull request #560 from sharelatex/ja-enable-v2-for-all
...
Enable the v2 banner for everyone if showV2Banner is set
2018-05-17 11:55:21 +01:00
James Allen
3724edfc10
Fix translation string interpolation
2018-05-17 11:25:14 +01:00
Shane Kilkelly
2345b77ea7
Validate project-linked-file data before doing import
2018-05-17 10:51:58 +01:00
Michael Mazour
3922b8b916
Add project export acceptance tests
...
- Add acceptance tests
- Add `MockV1Api` helper
- Add flush endpoint to `MockProjectHistoryApi` helper
2018-05-16 14:58:34 +01:00
Michael Mazour
e34dd90a1f
Add project export route and controller
2018-05-16 14:58:34 +01:00
Michael Mazour
a661084485
Add ExportsHander for project exports performed via v1
2018-05-16 14:58:34 +01:00
Michael Mazour
859858c02c
Add V1 API to settings file
2018-05-16 14:17:48 +01:00
Alberto Fernández Capel
ddb53e0272
Pin translations-sharelatex to master
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
15c52af0aa
Remove unused dependency
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
1fd923bf27
Add some comments to the webpack config
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
de645afff9
Move handlebars loader to dev dependencies
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
1087fa6797
Make jQuery version match the one statically linked
...
In 14148648e6/app/views/layout.pug (L60)
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
156263115b
Styles for the metrics app
...
Imported from v1 with minimal changes.
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
cc530666ab
Configure handlerbars loader in webpack
...
Needed for the metrics app.
2018-05-16 13:59:33 +01:00
Alberto Fernández Capel
fe75936ff7
Add dependencies needed for metrics app
2018-05-16 13:59:33 +01:00
Michael Mazour
b9c479c245
Update README description of acceptance tests.
2018-05-16 13:56:20 +01:00
Shane Kilkelly
c626446aad
Tidy up the project/file display in project-linked-file
2018-05-16 13:52:54 +01:00
Shane Kilkelly
9624e2a290
Record the source project display name, to render with the file
2018-05-16 13:44:21 +01:00
Shane Kilkelly
f533674dbd
Clean up
2018-05-16 13:26:59 +01:00
Shane Kilkelly
7292602167
More fine-grained loading spinners
2018-05-16 11:49:10 +01:00
Shane Kilkelly
e3bc6cac9e
Auto-set filename based on selected file
2018-05-16 11:12:00 +01:00
Shane Kilkelly
74d8e67a05
Remove leading slash from path names, for display
2018-05-16 10:58:56 +01:00
Shane Kilkelly
f2702c7b0a
Show the linked-files UI for project-linked-files
2018-05-16 10:41:21 +01:00
Shane Kilkelly
103832af7d
Functioning project-linked-file importer
2018-05-16 10:29:51 +01:00
Shane Kilkelly
9c33f3f8bc
WIP: Project Linked File modal
2018-05-15 16:22:47 +01:00
Shane Kilkelly
33b4a1768b
Merge branch 'master' into sk-linked-files-from-project
2018-05-15 10:53:59 +01:00
James Allen
66846cc68c
Put the compile timeout upgrade behind an enableSubscriptions flag
2018-05-15 10:17:04 +01:00
Shane Kilkelly
06c0b45ef7
Merge branch 'master' into sk-fix-references-full-index
2018-05-14 13:45:12 +01:00
Shane Kilkelly
43d00a2e5f
Account for the new referencesSearch flag when deciding to do fullIndex
2018-05-14 11:31:59 +01:00
Hayden Faulds
3fb3daaee7
Merge pull request #529 from sharelatex/sk-remove-templates-from-v2
...
Add `templates` to the `Features.hasFeature` function
2018-05-14 10:57:28 +01:00
James Allen
58b5d67bdd
Enable the v2 banner for everyone if showV2Banner is set
2018-05-14 10:29:42 +01:00
James Allen
ed7b68169e
Revert accidental dev changes to UndoManager
2018-05-11 17:05:39 +01:00
hugh-obrien
d1756436e8
compile react in production mode
2018-05-11 15:34:22 +01:00
James Allen
35dc518d05
Merge pull request #553 from sharelatex/ja-configurable-fonts
...
Allow font family and line height to be user configurable
2018-05-11 13:50:03 +01:00
James Allen
1469fd8693
Merge pull request #547 from sharelatex/ns-update-readme-for-testing
...
remove old test instructions
2018-05-11 13:49:48 +01:00
James Allen
87d8eed1c8
Merge pull request #555 from sharelatex/as-archived-dash
...
Switch "deleted" projects to "archived" project
2018-05-11 13:49:38 +01:00
James Allen
3b786e389f
Merge pull request #541 from sharelatex/ja-add-overleaf-editor-theme
...
Add Overleaf v1 theme
2018-05-11 13:49:19 +01:00
Alasdair Smith
df9294816e
Show archive or leave icon based on selected projects
2018-05-11 13:46:15 +01:00
Alasdair Smith
64061f0079
Switch name of deleted projects to archived projects to reduce confusion
2018-05-11 13:45:33 +01:00
James Allen
049fe6e176
Update bracket border colour
2018-05-11 10:24:58 +01:00
Nate Stemen
d108b11bc0
Add latexmkrc in FileTypeManager
2018-05-10 16:59:58 -04:00
James Allen
331f9ea9df
Translate default
2018-05-10 18:04:30 +01:00
James Allen
dee96920b0
Allow font family and line height to be user configurable
2018-05-10 18:03:54 +01:00
Hayden Faulds
9ccdf073c4
accept attributes rather than projectHistoryId to ProjectCreationHandler
2018-05-10 11:39:23 +01:00
James Allen
78aefc2871
Merge pull request #542 from sharelatex/ja-match-front-to-v1
...
Update font and line spacing in Ace to match OL v1
2018-05-09 12:24:37 +01:00
James Allen
1e0e006eef
Merge pull request #534 from sharelatex/ja-recompile-on-w
...
Recompile one Cmd-S, :w and Ctrl-. for v1 compatibility
2018-05-09 12:24:29 +01:00
Nate Stemen
c131dcd84d
remove old test instructions
2018-05-08 10:15:55 -04:00
Brian Gough
2bb2d9615f
added comment about using a project entity iterator
2018-05-08 13:37:33 +01:00
Brian Gough
f34ce5b12b
rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity
2018-05-08 13:37:33 +01:00
Brian Gough
1278e2da45
fix project structure version when deleting folder
2018-05-08 13:37:33 +01:00
Brian Gough
24764f66ff
Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager
...
improve locking in web
2018-05-08 11:11:32 +01:00
Hugh O'Brien
57f07fb5fe
Merge pull request #518 from sharelatex/hob-publish-modal-qs
...
Publish modal accessible from query string
2018-05-08 09:40:41 +01:00
James Allen
b7be63f3a8
Import Overleaf v1 theme from sharelatex/ace
2018-05-04 15:12:47 +01:00
Brian Gough
afd4a10a19
retry lock with exponential backoff
2018-05-04 15:02:36 +01:00
James Allen
1aadd7d369
Configure line height and font family separately for v2
2018-05-04 14:05:20 +01:00
James Allen
b847638ed1
Clean up comments and callbacks
2018-05-04 13:31:26 +01:00
Brian Gough
e414100c41
add support for unique lock values
2018-05-04 13:22:33 +01:00
Shane Kilkelly
30beb098ab
Sort the project entities by path
2018-05-04 11:06:59 +01:00
Shane Kilkelly
08263180fa
Add project_id to the entities payload
2018-05-04 11:03:54 +01:00
Shane Kilkelly
3c3ce2010a
Add endpoint to list entities within a project
2018-05-04 10:45:13 +01:00
Shane Kilkelly
4925bfe536
Add an endpoint to get users projects as json
2018-05-04 09:44:13 +01:00
James Allen
7e250be66d
Update font and line spacing in Ace to match OL v1
2018-05-03 17:04:49 +01:00
James Allen
42ac8faaae
Add dependency mapping for vim keybindings
2018-05-03 17:01:34 +01:00
Shane Kilkelly
87fb226c3e
Fix invocation of getFileStream
2018-05-03 15:30:44 +01:00
Shane Kilkelly
5cb85c0332
WIP: Add ProjectFileAgent
2018-05-03 14:29:03 +01:00
James Allen
8ecd073efc
Support Ctrl-. to compile for v1 compabitility
2018-05-03 12:28:14 +01:00
James Allen
09486f2eea
Recompile on Cmd-S and :w
2018-05-03 12:20:53 +01:00
Hayden Faulds
7c93c92c6a
Merge pull request #531 from sharelatex/hof-custom-retry
...
add V1HistoryNotSyncedError
2018-05-02 14:01:07 +01:00
Hayden Faulds
ba0e06d0fe
add V1HistoryNotSyncedError
2018-05-02 13:18:43 +01:00
Paulo Reis
9f6dc12658
Add custom styling; add code to handle point-in-time selection.
2018-05-01 17:27:51 +01:00
Shane Kilkelly
1c31012135
Merge branch 'master' into sk-fix-chat-link-color-in-v2
2018-05-01 15:23:42 +01:00
Shane Kilkelly
af70ef0dc4
Add templates to the hasFeature function
2018-05-01 14:01:52 +01:00
Shane Kilkelly
387108da48
Make links in chat messages white (same as text), with underline
2018-05-01 10:16:56 +01:00
James Allen
40da785363
Fix test for sampling front users
2018-05-01 09:02:43 +01:00
James Allen
dfc2b8631b
Merge pull request #521 from sharelatex/as-watch-modules-coffee
...
Add modules public/coffee dir to nodemon frontend watch
2018-05-01 08:50:31 +01:00
James Allen
d2e54c5e0c
Merge pull request #504 from sharelatex/afc-show-group-export-csv
...
Show export user CSV even if the group has reached max capacity
2018-05-01 08:50:04 +01:00
James Allen
4c7364fd01
Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits
...
Re-order compile rate limits
2018-05-01 08:48:22 +01:00
James Allen
a294fe795c
Merge pull request #519 from sharelatex/ja-relative-dates-in-v2
...
Display last modified as a relative date in v2
2018-05-01 08:48:14 +01:00
James Allen
d454be8053
Bring down proportion to 10%
2018-04-30 17:19:21 +01:00
James Allen
6399621d1f
Show front widget for paid and sampled free users
2018-04-30 17:13:57 +01:00
Alasdair Smith
b2e3997e83
Add modules public/coffee dir to nodemon frontend watch
2018-04-30 10:18:06 +01:00
James Allen
5c87a2aa90
Display last modified as a relative date in v2
2018-04-27 16:50:46 +01:00
Paulo Reis
6e6bc91130
Style the history entries components.
2018-04-27 15:59:28 +01:00
hugh-obrien
157efa6d96
make publish modal accessible from query string
2018-04-27 15:50:11 +01:00
Hugh O'Brien
5a580b6ef9
Merge pull request #517 from sharelatex/hob-publish-menu-style
...
Remove ol-variables which cause style problems in SL
2018-04-27 14:54:30 +01:00
hugh-obrien
e76a15e4e0
remove ol core variables
2018-04-27 14:50:52 +01:00
Hugh O'Brien
780b377cf2
Merge pull request #515 from sharelatex/hob-publish-menu-style
...
Basic publish menu styling
2018-04-27 14:25:34 +01:00
hugh-obrien
ea2e585699
basic publish menu styling
2018-04-27 13:37:08 +01:00
Paulo Reis
8249f4e17e
Wrap copies of existing history UI elements in components.
2018-04-27 11:22:20 +01:00
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
Jessica Lawshe
820f9c7acc
Merge pull request #506 from sharelatex/as-document-event-emitter
...
Add documentation and tests of EventEmitter implementation
2018-04-23 11:33:40 -05:00
Alasdair Smith
152c816b5c
Add documentation and tests of EventEmitter implementation
2018-04-23 11:01:19 +01:00
Alberto Fernández-Capel
5fb368d1f2
Merge pull request #505 from sharelatex/afc-travisci
...
Fix build in travisci
2018-04-23 10:50:59 +01:00
Alasdair Smith
ad1df3532f
Merge pull request #490 from sharelatex/hof-deleted-project-history
...
Pass project history id with updates
2018-04-23 10:05:07 +01: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
Alasdair Smith
61648e1f19
Merge pull request #497 from sharelatex/as-naming-consistency
...
Include snake_case named file in frontend tests
2018-04-23 10:03:54 +01:00
Alberto Fernández Capel
4db146dd51
Do not specify node version in .travis.yml
...
That way, travis uses the version specified in .nvmrc
2018-04-19 12:30:31 +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
Alasdair Smith
d524249fc8
Include snake_case named tests
2018-04-17 15:03:52 +01:00
James Allen
d9a7b1248a
Re-order compile rate limits to do project/user check before everyone check
2018-04-17 14:43:54 +01:00
Henry Oswald
b5e6181c49
added .capitalised style
2018-04-17 11:26:02 +01:00
James Allen
37f009c3cd
Remove blank test causing race condition
2018-04-17 10:00:06 +01:00
James Allen
87cc08569a
Fix bad if statement sending doc open into infinite loop
2018-04-16 17:03:18 +01:00
James Allen
d6605610f5
Fix HistoryV2Manager front end tests
2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c
Fix RestoreManager unit tests
2018-04-16 16:27:24 +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
Alasdair Smith
3af10733cc
Replace hard coded rich text hashed file path with registration system
2018-04-16 14:14:49 +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
985d05a297
remove .has-error class, not used
2018-04-16 10:56:03 +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
903a9db936
upgrade static recurly lib to 4.8.5 for plans page
2018-04-16 10:10:43 +01:00
Henry Oswald
a1be0e95b4
remove the dead validation
2018-04-16 10:10:25 +01:00
Alasdair Smith
4a12754d90
Mark visible toggle switch as hidden from screen readers
2018-04-16 10:07:46 +01:00
Alasdair Smith
0f70d526d9
Remove unused toggleRichText method
2018-04-16 09:42:26 +01:00
Alasdair Smith
a8c6ac1367
Style toggle switch
2018-04-16 09:36:32 +01:00
Alasdair Smith
591f341f5f
Add switch-toggle directive
2018-04-16 09:36:10 +01:00
Henry Oswald
b1ee05de3e
better styling, close to being deployable
2018-04-13 17:32:20 +01:00
Henry Oswald
e19a118ef4
poorly styled but almost viable
2018-04-13 17:26:05 +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
Paulo Jorge Reis
9e40555c89
Merge pull request #487 from sharelatex/pr-fix-v2-togglers
...
Control the visibility of the custom toggler
2018-04-13 13:46:55 +01:00
Hayden Faulds
7755a7cc1f
add overleaf to projections for project structure updates
2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca
send projectHistoryId with resync requests
2018-04-13 13:45:03 +01:00
Hayden Faulds
3006d018d9
send projectHistoryId with project structure updates
2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3
return projectHistoryId in DocumentController.getDoc
2018-04-13 13:45:02 +01:00
Jessica Lawshe
8d2c3ca6a1
Remove undefined controller
2018-04-12 11:53:31 -05:00
Jessica Lawshe
49222f11db
Merge pull request #480 from sharelatex/jel-remove-old-exp
...
Remove old A/B experiments
2018-04-12 11:23:41 -05:00
Paulo Reis
35d7c96d04
Control the visibility of the custom toggler when panes are hidden externally.
2018-04-12 16:41:49 +01:00
Alberto Fernández Capel
1b8f4bff2f
Ensure dump folder exists before running LinkedFiles tests
...
The folder is also created in another test, so it will work the second
time the tests are executed, but it fails the first time.
2018-04-12 10:29:24 -05:00
Jessica Lawshe
f9a56f7b37
Remove unknown experiments
2018-04-12 10:18:15 -05:00
Jessica Lawshe
be5f95ba69
Remove "history-discount" experiment
2018-04-12 10:18:15 -05:00
Jessica Lawshe
2301b83f22
Remove "teaser-dropbox-text" experiment
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
Hayden Faulds
50686090c8
push doc pathname logic into DocController
2018-04-12 16:16:44 +01:00
Hugh O'Brien
2d3f169c49
Merge pull request #473 from sharelatex/hob-publish-modal-setup
...
Publish modal web setup
2018-04-12 14:01:18 +01:00
Alasdair Smith
c87cb1d361
Basic styles for editor toolbar
2018-04-12 13:46:19 +01:00
Brian Gough
4115a35773
Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking
...
replace files and separate uploads and locking (connects to overleaf/sharelatex#422 )
2018-04-12 09:52:02 +01:00
Alasdair Smith
d3d7bde6ef
Merge pull request #482 from sharelatex/as-fix-hashed-files
...
Fix hashed file path for rich text
2018-04-11 12:12:30 +01:00
Alasdair Smith
60a28f7173
Fix hashed file path for rich text
2018-04-11 12:00:36 +01:00
Paulo Jorge Reis
68ee3f7449
Merge pull request #474 from sharelatex/pr-fix-z-index-v2-resizers
...
Remove forced z-index from v2 splitters
2018-04-11 11:31:05 +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
35cc5bf19c
Add defensive check for req.query, fixing tests
2018-04-10 10:38:40 +01:00
Alasdair Smith
f0bcb332bb
Merge pull request #479 from sharelatex/as-rt-feature-flag
...
Switch to runtime flag for RT instead of feature flag
2018-04-10 10:24:58 +01:00
Brian Gough
882b555433
create new file on replace
2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4
rename internal method uploadFile to _uploadFile
2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c
clean up whitespace
2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a
preserve original callback signature for addFile
2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9
fix indentation
2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c
fix indentation of comment
2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757
refactor addFile and addFileWithOutUpdatingHistory
2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4
separate out file uploads
2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d
add comment about upsert and locking
2018-04-09 12:05:07 +01:00
Brian Gough
baec4eb195
move uploads outside the lock
2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3
Remove unused feature flag
2018-04-06 17:00:27 +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
Alasdair Smith
d433a88158
Pass rich text flag if query string is set
2018-04-06 16:58:12 +01:00
Alasdair Smith
315b2f24ee
Always include RT styles
2018-04-06 16:01:59 +01:00
James Allen
2c0bd94fa7
Use mkdirp when restoring a file if the folder doesn't exist
2018-04-06 15:20:51 +01:00
James Allen
11d47fcc31
Use updated project-history response format
2018-04-06 15:20:18 +01:00
Alasdair Smith
fba5e4f80a
Disable webpack source map
2018-04-06 11:28:21 +01:00
James Allen
1e8439a2c6
Fix restore of docs from old deleted docs
2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664
Add unit tests for RestoreManager
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
075db1e5b9
Remove stray console.log
2018-04-06 10:30:13 +01:00
James Allen
3832850be6
Implement restore end point with acceptance tests
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
3fecb4f180
Forcing z-index is not needed anymore.
2018-04-05 11:54:53 +01:00
Alasdair Smith
8ff1492962
Merge pull request #471 from sharelatex/as-karma-css
...
Serve CSS when running karma tests
2018-04-05 09:27:58 +01:00
Alasdair Smith
1d6dd06b88
Serve underscore in karma tests
...
Because of the way that we're using underscore in the ES bundle (using the
global), we need to include underscore globally
2018-04-04 13:19:21 +01:00
Paulo Reis
2e898bcf13
Use LESS to conditionally hide SL assets.
2018-04-03 09:01:43 -05:00
Paulo Reis
4ee81b3b44
Undo unintended SL changes.
2018-04-03 09:01:42 -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
James Allen
0a00dea610
Merge pull request #469 from sharelatex/ja-feature-flag-rename
...
Split references feature flag into mendeley and referencesSearch
2018-04-03 11:53:58 +01:00
Alasdair Smith
b417516c7f
Add CSS to karma
...
This is useful for rich text tests which rely on DOM structure/CSS layout of
rich text
2018-04-03 11:12:17 +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
Alasdair Smith
3668912102
Merge pull request #470 from sharelatex/pr-fix-v2-resizers-width
...
Configure splitter width in v2
2018-04-03 10:24:31 +01:00
Alasdair Smith
fa7e64adbb
Wrap RT styles in .rich-text to prevent clashes
2018-04-03 09:47:35 +01:00
Alasdair Smith
4511cfa92f
Add RT styles
2018-04-03 09:47:35 +01:00
Paulo Reis
bd3c12cf90
Make sure the layout lib knows about the resizer width in v2.
2018-03-29 10:35:17 +01:00
James Allen
f80962b74b
Split references feature flag into mendeley and referencesSearch
2018-03-28 17:11:41 +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 Jorge Reis
ab6abb2a4c
Merge pull request #465 from sharelatex/revert-464-as-hotfix-rt
...
Bring back editor toolbar
2018-03-28 15:15:44 +01:00
Paulo Reis
8d2db3b31e
V2 styling for system messages.
2018-03-28 14:46:07 +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
James Allen
f13c7fd573
Revert "Replace references feature flag with mendeley and referencesSearch"
...
This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.
2018-03-28 13:47:34 +01:00
Paulo Reis
2dde810a1d
Adjust styling.
2018-03-28 12:05:47 +01:00
Paulo Reis
b8049f3c46
Move system messages into the project list page (only).
2018-03-28 12:05:32 +01:00
James Allen
28aef4e72b
Merge pull request #457 from sharelatex/as-silent-webpack-exit
...
Exit webpack without error if no entry points found
2018-03-28 11:18:18 +01:00
James Allen
e0facd40da
Merge pull request #461 from sharelatex/ja-feature-flag-rename
...
Replace references feature flag with mendeley and referencesSearch
2018-03-28 11:16:56 +01:00
Alasdair Smith
2e93e0bf23
Revert "Hotfix RT button showing up when it isn't enabled"
2018-03-28 10:13:23 +01:00
Henry Oswald
a998d738ee
Merge pull request #460 from sharelatex/ho-null-check-docs
...
null check map on files and docs inside logger
2018-03-28 10:01:49 +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
dc2d7a9c7e
Replace references feature flag with mendeley and referencesSearch
2018-03-27 16:20:21 +01:00
Henry Oswald
3b3b404288
Update LoggerSerializers.coffee
2018-03-27 14:45:47 +01:00
Henry Oswald
eeb76441c0
null check map on files and docs inside logger
2018-03-27 14:41:56 +01:00
Alasdair Smith
7520174288
Silently exit webpack process if no entry points are found in src or modules
...
This better supports the community edition which currently has no code or
modules that match and throws an error.
2018-03-27 12:30:40 +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
Alasdair Smith
19e0aab49c
Fix module compile_full failing if module don't have app/coffee
2018-03-26 14:15:02 +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
f544cebb0a
Compile modules ES code with webpack
...
Allows for bundling of third-party modules and prevents error when using
import/export syntax outside of type="module" script
2018-03-26 11:31:15 +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
e9de83789a
Rename tests to match their purpose better
2018-03-23 12:37:47 +00:00
Alasdair Smith
4ad0416f24
Extract cmEditor tests to RT module
2018-03-23 12:37:47 +00:00
Alasdair Smith
96b1d8c812
Compile frontend tests into web test directory and include module ES tests in karma
2018-03-23 12:37:47 +00:00
Alasdair Smith
3f8eda2223
Extract rich text code to module
2018-03-23 12:37:16 +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
Alasdair Smith
fe65137c05
Check app/coffee existence before compiling
2018-03-23 12:34:11 +00:00
James Allen
0c89f488bd
Merge pull request #440 from sharelatex/afc-fix-read-announcements-count
...
Fix read announcements count
2018-03-23 12:06:49 +00:00
Paulo Reis
6c8ffcd055
Remove extra hit area.
2018-03-23 11:54:17 +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
1893eb297e
Merge pull request #433 from sharelatex/ja-v2-references-app
...
Add in default config for third-party-references service
2018-03-23 11:51:54 +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
d04107ddcd
Merge pull request #435 from sharelatex/as-fix-modules-ignore
...
Remove unnecessary gitignore
2018-03-23 11:51:38 +00:00
Alasdair Smith
98e2e3ada1
Ignore everything in modules except gitkeep, to ensure directory exists
2018-03-23 11:39:46 +00:00
Paulo Reis
a1545a688e
Make resizers lighter; make chevron smaller; hide ellipsis when panes are collapsed.
2018-03-23 11:16:41 +00:00
Paulo Reis
89d9a43652
Make resizer bar larger; add a chevron inside the toggler; make the toggler itself darker.
2018-03-23 10:16:03 +00:00
Alberto Fernández Capel
fef7601433
Early return only applies to fault tolerant request
...
We need to return the data to other requests like getLastOccurrence.
2018-03-23 10:02:11 +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
James Allen
363ab86b24
Merge pull request #375 from sharelatex/as-clean-up-sharejs
...
Clean up ShareJS
2018-03-22 16:32:52 +00:00
Alasdair Smith
3e4b8cd409
Clean up change listeners on sharejs
2018-03-22 16:32:25 +00:00
Paulo Reis
2447e85f3f
Remove stray console.log().
2018-03-22 14:08:16 +00:00
Paulo Reis
9ddd4543e1
More style adjustments; remove commented code.
2018-03-22 13:50:48 +00:00
Jessica Lawshe
ffbdb760c6
Merge pull request #417 from sharelatex/subscription-analytics
...
Subscription analytics
2018-03-22 08:47:42 -05:00
Paulo Reis
906f4899aa
Only use custom togglers in v2.
2018-03-22 12:10:34 +00:00
Paulo Reis
38f95359e1
Style adjustments.
2018-03-22 11:48:34 +00:00
Paulo Reis
db68134f81
Add i18n.
2018-03-22 11:48:14 +00:00
Alasdair Smith
b74e5dbf04
Remove unnecessary gitignore
2018-03-22 10:59:29 +00:00
Jessica Lawshe
f37c34db19
Remove expressions used for debugging
2018-03-21 16:50:37 -05:00
James Allen
c5b29bd1c7
Add in default config for third-party-references service
2018-03-21 15:27:47 +00:00
Henry Oswald
01d66ec208
Merge pull request #418 from sharelatex/ho-recaptcha-muli-email
...
validate captcha on every email addition
2018-03-21 14:09:05 +00:00
Shane Kilkelly
135854a0e0
Merge branch 'master' into ta-add-publisher-hub-analytics-proxy
2018-03-21 10:32:04 +00:00
Tim Alby
643f687640
Add recentV1TemplateIdsActivity proxy to AnalyticRouter
2018-03-20 17:32:45 -05:00
Paulo Reis
3f073c2341
Rename attributes and vars for clarity
2018-03-20 16:11:09 +00:00
Paulo Reis
fb7d902038
Make custom togglers react to opening and closing panes. Dynamically add CSS classes.
2018-03-20 16:11:09 +00:00
Paulo Reis
a3034fc79f
Enable custom togglers.
2018-03-20 16:11:09 +00:00
Paulo Reis
fc0be22c6d
Extend layout directive to support custom togglers.
2018-03-20 16:11:09 +00:00
Paulo Reis
78eb56a262
Increase resizer width; decrease hit area.
2018-03-20 16:11:09 +00:00
James Allen
27fac4029c
Make margins consistent with col margins
2018-03-20 14:46:15 +00:00
James Allen
01343b8419
Remove console.log line
2018-03-20 14:21:34 +00:00
Henry Oswald
a4c6cd208c
validate captcha on every email addition
2018-03-20 13:53:16 +00:00
James Allen
a023512872
Collapse panel with v1 info
2018-03-20 13:50:51 +00:00
Jessica Lawshe
5cc6fb8843
Send analytics event after submitting group inquiry form
2018-03-20 08:31:35 -05:00
Jessica Lawshe
89cfd98af3
Add details to analytics label
2018-03-20 08:31:35 -05:00
Jessica Lawshe
d7756ea2de
Add event tracking for upgrade button
2018-03-20 08:31:34 -05:00
Jessica Lawshe
47696ea3f1
Correct analytics label and send event when group modal opened
2018-03-20 08:31:34 -05:00
Shane Kilkelly
e50fef151f
Add uniExternalCollaboration proxy to AnalyticRouter
2018-03-20 13:19:51 +00: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
c6fd5daf02
Remove rich text from OSS
2018-03-20 11:23:15 +00:00
Alberto Fernández-Capel
f73c3c6e1d
Merge pull request #413 from sharelatex/afc-npm-shrinkwrap
...
Clean up npm-shrinkwrap.json
2018-03-20 09:56:28 +00:00
Alberto Fernández-Capel
f9ba4ea467
Merge pull request #414 from sharelatex/afc-retries-with-exp-backoff
...
Use exponential backoff in request retries to analytics
2018-03-20 09:55:07 +00:00
Alasdair Smith
e9ba73138e
Fix webpack config so that it's more consistent
2018-03-19 14:47:25 +00:00
Alberto Fernández Capel
132b31c39f
Increase timeout
2018-03-19 14:46:18 +00:00
Alberto Fernández Capel
f2fc999ce4
Extract method to add common params
2018-03-19 10:30:06 +00:00
Alberto Fernández Capel
07b0f37579
Log errors in requests to analytics
2018-03-19 09:56:44 +00:00
Hayden Faulds
57de597e60
404 when resyncing deleting projects
2018-03-16 15:26:19 +00:00
Hayden Faulds
482d140716
add overleaf to projection
2018-03-16 13:29:22 +00:00
Alberto Fernández Capel
6609c10d36
Use exponential backoff to retry request to analytics
2018-03-15 17:14:50 +00:00
Hayden Faulds
d22d8324af
disable history resync when project-history is not enabled
2018-03-15 16:57:39 +00:00
Alberto Fernández Capel
a2ec6849dd
Clean up npm-shrinkwrap.json
...
I followed these steps (from master, in the docker dev env):
- rm -rf node_modules/*
- npm install
- npm shrinkwrap --dev
2018-03-15 12:23:40 +00:00
Alasdair Smith
2e0804c728
Fix opts not passed to buildJsPath
2018-03-15 12:15:00 +00:00
Alasdair Smith
4d79c68f41
Rename webpack prod compile to minify_es and run as part of minify step
...
Fixes issue where webpack prod files were wiped after running minify on CI
2018-03-15 11:29:36 +00:00
Alasdair Smith
7e990dc67e
Use global var for underscore
...
This is simpler than extracting as an external, though less explicit, as
getting webpack & AMD to play nice is hard
2018-03-15 09:42:26 +00:00
Alasdair Smith
fe3636c714
Ignore compiled es directory
2018-03-15 09:42:26 +00:00
Alasdair Smith
44998c05df
Prod webpack outputs to minjs dir
2018-03-15 09:42:26 +00:00
Alasdair Smith
408c195c6a
Instead of using webpack chunk hashing, use existing system
2018-03-15 09:42:26 +00:00
Alasdair Smith
8537c7b9b6
Add production webpack npm script
2018-03-15 09:42:26 +00:00
Alasdair Smith
4a801d266e
Copy paste some prod webpack config from v1
2018-03-15 09:42:26 +00:00
James Allen
de94e33b5d
Merge pull request #397 from sharelatex/ja-fix-project-upload
...
Add files to project in series to avoid lock contention
2018-03-13 13:33:16 +00:00
James Allen
371caa41ca
Merge pull request #378 from sharelatex/hof-history-resync
...
resync project history endpoint
2018-03-13 13:33:08 +00:00
James Allen
d9b301023a
Use eachSeries rather than a job array
2018-03-13 13:30:06 +00:00
James Allen
33904fe7be
Add files to project in series to avoid lock contention
2018-03-13 13:21:48 +00:00
Alasdair Smith
1f7ef3ad6e
Merge pull request #393 from sharelatex/as-fix-cm-sharejs
...
Fix CM/ShareJS adapter from throwing error when deleting
2018-03-13 11:21:52 +00:00
Alasdair Smith
458506ff66
Merge pull request #394 from sharelatex/as-karma-fake-img
...
Handle fake images in karma, preventing 404 warnings
2018-03-13 11:21:22 +00:00
Alasdair Smith
41d8a50a8e
Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy
...
Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`
2018-03-13 11:20:55 +00:00
Alasdair Smith
8abf3593fb
Prevent CM/Sharejs adapter from overwriting value in editor
2018-03-13 11:16:56 +00:00
Alasdair Smith
9cf9a7e4fc
Fix CM/ShareJS adapter using old CM api
...
Fixes bug where deleting text in CM would throw an error in some
circumstances
2018-03-13 11:16:49 +00:00
Alasdair Smith
ef0b550234
Handle fake images in karma, preventing 404 warnings
2018-03-12 15:06:58 +00:00
Shane Kilkelly
2ceb7daa97
Merge pull request #361 from sharelatex/ta-record-new-project-event
...
Record New Project Event
2018-03-12 13:11:20 +00:00
Shane Kilkelly
9dc8600588
Add a unit test for the analytics events sent from project-creation
2018-03-12 10:50:15 +00:00
Hayden Faulds
a7945e9b96
extra logging for DocumentUpdaterHandler
2018-03-09 11:16:35 +00:00
Hayden Faulds
75f5fbcdbf
refactor DocumentUpdaterHandler
2018-03-09 11:15:18 +00:00
Hayden Faulds
af9cc28419
additional logging
2018-03-09 11:11:06 +00:00
Hayden Faulds
792e8bbd7e
fix route name
2018-03-09 11:11:06 +00:00
Hayden Faulds
9ab0ded8f1
update project history resync url
2018-03-09 11:11:06 +00:00
Hayden Faulds
5b2e7d981a
resyncProject -> resyncProjectHistory
2018-03-09 11:11:06 +00:00
Hayden Faulds
50fdfec6e8
add unit tests for project history resync
2018-03-09 11:11:06 +00:00
Hayden Faulds
926f91dd3b
wrap project resync in project structure lock
2018-03-09 11:11:06 +00:00
Hayden Faulds
4d2f0218af
add resync project history endpoint
2018-03-09 11:11:06 +00:00
Henry Oswald
5b51d190c7
Update navbar.less
2018-03-08 09:56:23 +00:00
Henry Oswald
2abafdbf64
added padding-top for system messages
2018-03-07 17:27:32 +00:00
Alasdair Smith
8bde5120dd
Change frontend test commands so its easier to run locally in debug mode
2018-03-07 09:52:08 +00:00
Alasdair Smith
9ed4f121b1
Append fixture el to actual DOM
2018-03-07 09:51:54 +00:00
Tim Alby
d5109d22d2
record both project-created and project-imported events
2018-03-06 18:26:25 -05:00
Tim Alby
4b291fab2a
Record new project event
2018-03-06 18:13:24 -05:00
Shane Kilkelly
f6e66b9346
Add a proxy to AnalyticsRouter for /recentTeamActivity
2018-03-06 16:21:28 +00:00
Alasdair Smith
8781023b80
Merge pull request #380 from sharelatex/as-eslint-warning
...
Remove eslint from webpack compile
2018-03-06 14:41:04 +00:00
Shane Kilkelly
84fff5e9b7
Merge pull request #379 from sharelatex/sk-geolocate-user-sessions
...
Geolocate user, and pass country-code to editing-sessions
2018-03-06 11:33:50 +00:00
Alasdair Smith
2453e55ebb
Remove eslint loader
...
After using the webpack set up a bit more, having linting block compiles in
dev is more annoying than helpful. Linting pre commit is more valuable
2018-03-06 11:18:40 +00:00
Shane Kilkelly
7d81c42b9c
More explicit handling of empty-string country-code
2018-03-06 10:32:28 +00:00
Shane Kilkelly
feee992b43
Reverse an un-necessary re-arrangement of tests
2018-03-06 10:13:39 +00:00
Alasdair Smith
6d9a7e90f5
Add simple fixtures support
2018-03-06 10:11:04 +00:00
Shane Kilkelly
97d181c3f9
Reverse an un-necessary change
2018-03-05 13:24:54 +00:00
James Allen
f94105b1e9
Remove debug lines
2018-03-05 11:31:24 +00:00
James Allen
e77168d791
Don't render URL section if not linked file
2018-03-05 11:21:31 +00:00
Shane Kilkelly
b3f47ea44a
Remove obsolete segmentation payload in editing-session request
2018-03-05 11:15:41 +00:00
Shane Kilkelly
f625b22ec5
Move the geolocation out of login, to the editingSession action
2018-03-05 10:46:51 +00:00
James Allen
d92c3e8b55
Logging and error message tweaks
2018-03-05 10:37:53 +00:00
James Allen
d4025908b7
Add in enabledLinkedFileTypes setting
2018-03-05 10:37:53 +00:00
James Allen
a99f55891f
Use external proxy
2018-03-05 10:37:53 +00:00
James Allen
cae09028ff
Fix tests
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
01d84bd983
Handle error cases when downloading URL
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
James Allen
85f25b810c
First pass at URL based linked files
2018-03-05 10:37:00 +00:00
Brian Gough
3bbd49c7eb
Merge pull request #377 from sharelatex/bg-add-project-structure-version-number
...
add project structure version number
2018-03-05 08:41:14 +00:00
Shane Kilkelly
bbe15a3ff3
Remove stray log
2018-03-02 12:06:18 +00:00
Shane Kilkelly
1629f68d5e
Geolocate user on login, and pass country-code to editing-sessions
2018-03-02 12:02:45 +00:00
Alasdair Smith
87a0942b3c
Copy paste LatexMode tests from v1 and switch assertions to chai
2018-03-02 10:43:56 +00:00
Alasdair Smith
68d85f03c2
Clean up frontend stub
2018-03-02 10:41:58 +00:00
Alasdair Smith
40678cd91a
Remove erroneous reporter config, missing during merge conflict
2018-03-02 10:41:58 +00:00
Alasdair Smith
ec5b31663f
Configure babel to not compile ES6 imports/exports
...
Webpack can automatically handle the transpilation of ES6 imports to ES5. It
can also better optimize transpilation as raw ES6 imports can be tree-shaken
better.
2018-03-02 10:41:58 +00:00
Alasdair Smith
3677dc9a8b
Rename to use CM naming consistently
2018-03-02 10:41:58 +00:00
Alasdair Smith
027ab1250a
Configure CM with latex parser
2018-03-02 10:41:58 +00:00
Brian Gough
14713aa393
added comment about project version
2018-03-01 15:15:09 +00:00
James Allen
a5480e5f9e
Merge pull request #376 from sharelatex/ja-restrict-backslash
...
Don't allow backslashes in file names
2018-03-01 15:10:05 +00:00
Brian Gough
af494dedf2
check project structure version in unit tests
2018-03-01 12:32:09 +00:00
Brian Gough
e6020e2e9b
update acceptance tests to include project structure version
...
this tests the version sent to the docupdater
2018-03-01 12:32:09 +00:00
Brian Gough
389f2d64ef
prepare tests for versioning
2018-03-01 12:32:09 +00:00
Brian Gough
792c0135a0
update acceptance tests helper to include version
2018-03-01 12:32:09 +00:00
Brian Gough
f7e70e8228
add acceptance tests
2018-03-01 12:32:09 +00:00
Brian Gough
12911598de
send current project structure version to docupdater
2018-03-01 12:32:08 +00:00
Brian Gough
98f50919e8
comment about file replacements
2018-03-01 12:32:08 +00:00
Brian Gough
67d784a74a
increment project version on every structure change
2018-03-01 12:32:08 +00:00
Brian Gough
470d67a3aa
avoid exception in error message when project undefined
2018-03-01 12:31:51 +00:00
Brian Gough
cb35da3cf7
increment a project version number on every change in folder structure
2018-03-01 12:17:33 +00:00
James Allen
becb76d69b
Don't allow backslashes in file names
2018-03-01 11:42:44 +00:00
Alasdair Smith
7ea164ef77
Add max line length rule, defaults to 80 chars
2018-02-28 12:15:53 +00:00
Alasdair Smith
6f58c60026
Configure eslint to be more friendly to chai assertions
2018-02-28 12:15:53 +00:00
Alasdair Smith
45e7482335
Install chai-expect and chai-friendly eslint plugins
2018-02-28 11:45:10 +00:00
Alasdair Smith
1f450085e9
Fix mocha complaining about returning Promise-like object
2018-02-27 15:57:40 +00:00
Alasdair Smith
f11f208772
Revert "Revert "Upgrade to mocha 5.0.1""
2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c
Revert "Upgrade to mocha 5.0.1"
2018-02-27 12:25:42 +00:00
Alasdair Smith
4524b3c9f6
Use mocha environment and expect global to fix linting in tests
2018-02-27 11:34:02 +00:00
Alasdair Smith
4c2790a71b
Merge pull request #366 from sharelatex/as-upgrade-mocha
...
Upgrade to mocha 5.0.1
2018-02-27 11:06:34 +00:00
Alasdair Smith
864bf771a4
Merge pull request #362 from sharelatex/as-linting
...
Linting new ES code
2018-02-27 11:06:11 +00:00
Alasdair Smith
2a2eb23c78
Fix bug where tests from new ES code being included in requirejs wrapped code
2018-02-26 16:56:04 +00:00
Alasdair Smith
19cec9451d
Switch to using scoped variable instead of variables on context
...
Changes to mocha mean that a new context is passed to each describe block
instead of it persisting between them.
This means that this test cannot be parallelised, however this was the case
beforehand (subsequent tests are dependent on earlier tests).
2018-02-26 15:31:41 +00:00
Alasdair Smith
3217a3fbf0
Fix mocha complaining about returning Promise-like object
2018-02-26 15:31:34 +00:00
Alasdair Smith
bd7e4908a2
Force mocha to exit after tests run
2018-02-26 15:30:56 +00:00
Alasdair Smith
46ac74a160
Fix incorrectly scoped variable
2018-02-26 14:26:04 +00:00
Alasdair Smith
2247e4d465
Fix scoping issues where stubs were defined in wrong describe blocks
2018-02-26 14:21:14 +00:00
Alasdair Smith
abf53625fe
Fix scope not being applied through callback
2018-02-26 14:02:08 +00:00
Alasdair Smith
136fd84810
Fix module stub in incorrect scope
2018-02-26 13:52:58 +00:00
Alasdair Smith
be6fa346d5
Fix bug where incorrect variable was used
2018-02-26 13:37:17 +00:00
Alasdair Smith
ec7237b7e8
Fix callback stub being defined in wrong scope
2018-02-26 12:33:48 +00:00
Alasdair Smith
2529ed756a
Fix callback being defined in wrong describe block
2018-02-26 12:27:54 +00:00
Alasdair Smith
fd8c61985f
Fix bug where stubs were attached to undefined variables
2018-02-26 12:19:56 +00:00
Alasdair Smith
5d017beac5
Fix stub incorrectly overriding top level beforeEach
2018-02-26 11:46:06 +00:00
Brian Gough
38cb2885d8
Merge pull request #364 from sharelatex/bg-support-debug-mode
...
add support for debugging
2018-02-26 11:34:29 +00:00
Alasdair Smith
cfc9dbdbb3
Fix bad scoping of user agent
2018-02-26 11:34:08 +00:00
Alasdair Smith
34b53726d4
Fix error not being defined in wrong describe block
2018-02-26 11:19:52 +00:00
Alasdair Smith
192eb8b44f
Fix error not being defined in wrong describe block
2018-02-26 11:16:04 +00:00
Alasdair Smith
d79e226a20
Fix callback defined in wrong describe block scope
2018-02-26 10:58:20 +00:00
Brian Gough
18cd5a5e54
ignore sourcemap for app.js
2018-02-26 09:51:37 +00:00
Brian Gough
bc37003769
use COFFEE_OPTIONS by default
2018-02-26 09:50:23 +00:00
Alasdair Smith
e6f624c7a0
Make sure mocha exits
2018-02-23 17:16:46 +00:00
Alasdair Smith
22b8c114a2
Upgrade mocha to latest
2018-02-23 17:00:29 +00:00
James Allen
1f62df17c8
Merge pull request #363 from sharelatex/ja-guest-track-changes
...
Tidy up logic (a bit) around guest track changes
2018-02-23 14:41:12 +00:00
Alasdair Smith
cba07f79ee
Run linting on CI
2018-02-23 11:44:43 +00:00
Brian Gough
42b701fd34
use the make automatic variable @D for the target directory name
2018-02-23 11:43:10 +00:00
Alasdair Smith
325f91ed2e
Add scripts for running linting
2018-02-23 11:41:21 +00:00
Brian Gough
d364bfc353
add support for debugging
2018-02-23 11:36:08 +00:00
Alasdair Smith
3b3f967198
Ignore some top level files
2018-02-23 11:31:47 +00:00
Alasdair Smith
94b7cdcae0
Fix linting
2018-02-23 11:29:54 +00:00
Alasdair Smith
61a60c04a6
Webpack uses eslint on compile
2018-02-23 11:25:01 +00:00
Alasdair Smith
24ddb46b95
Configure eslint
2018-02-23 11:25:01 +00:00
Alasdair Smith
45bcbf9eb1
Install eslint & standard
2018-02-23 11:25:01 +00:00
Alasdair Smith
4e4d9aee89
Configure karma to use webpack for new ES file
2018-02-23 11:09:24 +00:00
Alasdair Smith
6b0b96a357
Install karma-webpack
2018-02-23 11:06:12 +00:00
Alasdair Smith
85ceab5310
Tear down Ace session when aceEditor is destroyed
...
This cleans up the Ace worker that parses syntax, preventing a memory leak
2018-02-23 10:13:24 +00:00
Alasdair Smith
5e39e61c9b
Merge pull request #348 from sharelatex/as-fix-cm-share
...
Fix CodeMirror/ShareJS binding when switching docs
2018-02-23 10:12:12 +00:00
Alasdair Smith
92260e7b52
Merge pull request #340 from sharelatex/ja-remove-brand
...
Remove the public/brand folder
2018-02-23 10:11:47 +00:00
Alasdair Smith
25488456a5
Merge pull request #359 from sharelatex/as-mocha-reporter
...
Switch to karma-mocha-reporter
2018-02-23 10:11:23 +00:00
James Allen
1d3db923f0
Tidy up logic (a bit) around guest track changes
2018-02-23 09:55:57 +00:00
Paulo Jorge Reis
70da6ad89a
Merge pull request #355 from sharelatex/pr-fix-front-chat-widget-config
...
Update Front chat widget according to latest config changes.
2018-02-22 15:49:32 +00:00
Alasdair Smith
8fa343bc94
Uninstall unused karma-tap-reporter dependency
2018-02-22 14:04:39 +00:00
Alasdair Smith
71e17460b7
Switch to mocha reporter
2018-02-22 14:04:22 +00:00
Alasdair Smith
27bfb1f02d
Install karma-mocha-reporter
2018-02-22 14:02:14 +00:00
Alasdair Smith
29410b7aab
Fix applyAsync from not evaluating expression in tests
...
See https://github.com/angular/angular.js/issues/10788#issuecomment-70376834
which explains that applyAsync is scheduled to evaluate in the next tick, but
this is managed by $browser. Therefore we can manually flush the trigger
2018-02-22 13:28:16 +00:00
Alasdair Smith
791c126df6
Fix test to match implementation
2018-02-22 12:09:51 +00:00
Alasdair Smith
2be37795bd
TODO for cleaning up sharejs callbacks
2018-02-22 11:44:09 +00:00
Alasdair Smith
598837e17c
Use applyAsync to prevent issue when switching docs
2018-02-22 11:44:09 +00:00
Alasdair Smith
c5735a31df
Remove unused listener
2018-02-22 11:44:09 +00:00
Alasdair Smith
e1187f3d8a
Listen for changes to the CodeMirror Doc, instead of all changes to the editor
...
This prevents an issue where switching docs (i.e. files) would cause the newly
opened doc from being inserted into the old doc.
This approach is similar to Ace's sessions.
2018-02-22 11:44:09 +00:00
Alasdair Smith
c85e9ba3b1
Instead of setting value of CM, swap Docs
...
This allows for tracking changes on individual docs (i.e. files), instead of
just changes to the editor. This is similar to how Ace works with sessions
2018-02-22 11:44:09 +00:00
Alasdair Smith
eae8b5a592
Merge pull request #330 from sharelatex/as-karma-tests
...
Karma tests
2018-02-22 11:06:56 +00:00
Paulo Reis
1b7d3917ed
Update Front chat widget according to latest config changes.
2018-02-21 14:58:00 +00:00
James Allen
0371aaaf05
Merge pull request #352 from sharelatex/hof-lock-metrics
...
Improve lock metrics
2018-02-21 13:52:08 +00:00
Paulo Reis
12233a23c9
Avoid erroring if the front object is undefined.
2018-02-21 13:39:39 +00:00
Paulo Reis
f1a36919f9
Make sure the widget does not overlap the footer.
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
Hayden Faulds
adc90b68e7
use gauge not inc
2018-02-21 13:25:25 +00:00
Shane Kilkelly
b19f7a6ea3
Re-add template id fields to Project model.
...
The original pull request (/web-sharelatex-internal/pull/324) had to be reverted
because of a failing test. This just re-adds the fields
2018-02-20 14:19:54 +00:00
Hayden Faulds
584cd71173
fix exceeded lock timeout logging
...
we were logging this after failing to get the lock, this stops that
2018-02-20 14:03:45 +00:00
Alasdair Smith
f529137db0
Clean frontend tests
2018-02-20 14:01:50 +00:00
Alasdair Smith
8da5c535ec
Run frontend unit tests in separate unit tests as they spawn their own docker containers
2018-02-20 14:01:50 +00:00
Alasdair Smith
00f1450b94
Rename test files to match source directory and name
2018-02-20 14:01:50 +00:00
Alasdair Smith
c7957b8ad4
Convert existing frontend tests to run in karma
2018-02-20 14:01:50 +00:00
Alasdair Smith
3faa0556e8
Add test for cmEditor directive
2018-02-20 14:01:50 +00:00
Alasdair Smith
24ec7b77ab
Convert frontend test runs to use Docker/karma
2018-02-20 14:01:50 +00:00
Alasdair Smith
ff7e016227
Add frontend test docker config
...
Adds Dockerfile to make headless Chrome image
2018-02-20 14:01:02 +00:00
Alasdair Smith
89c9475d29
Configure karma to load angular, requirejs and test/source files
...
Use test-main.js file to configure requirejs so that AMD loader can be
used
2018-02-20 14:01:02 +00:00
Alasdair Smith
0b77e97df2
Added angular mocks for testing and stub out globals
2018-02-20 14:01:02 +00:00
Alasdair Smith
d37b238c9e
Add karma config
2018-02-20 14:01:02 +00:00
Alasdair Smith
289500082a
Install karma & it's dependencies
2018-02-20 14:00:57 +00:00
Hayden Faulds
d924dbd1ed
improve metrics
2018-02-20 13:58:09 +00:00
Shane Kilkelly
05faf06f59
Revert "Add template id fields to project model"
2018-02-20 13:51:30 +00:00
Shane Kilkelly
57d50a68f8
Merge pull request #324 from sharelatex/hob-add-template-fields-to-project
...
Add template id fields to project model
2018-02-20 13:40:11 +00:00
Alasdair Smith
ff88b0adaf
Merge pull request #346 from sharelatex/as-fix-cursor
...
Fix bug where cursor position wouldn't be saved when switching documents
2018-02-20 12:01:58 +00:00
Hayden Faulds
d750f942de
fix: stop pass milis not seconds into setTimeout
2018-02-20 10:26:24 +00:00
Hayden Faulds
e50c3837bc
add extra metrics around locking
2018-02-19 12:15:02 +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
Hayden Faulds
23c7ab0529
add locking tests
2018-02-16 16:57:12 +00:00
Hayden Faulds
dd582d1b2e
type-check ProjectGetter.getProject and getProjectWithoutLock arguments
2018-02-16 14:44:21 +00:00
Hayden Faulds
693c8e8c60
move where lock keys are defined
2018-02-16 14:44:21 +00:00
Hayden Faulds
a05d172052
clean up variable names in ProjectGetter.getProject
2018-02-16 14:44:21 +00:00
Hayden Faulds
66cd5cd24b
use ProjectGetter.getProject in other ProjectGetter methods
2018-02-16 14:44:21 +00:00
Hayden Faulds
95b82a3c9d
use ProjectGetter in ProjectLocator.findElementByPath
2018-02-16 14:44:21 +00:00
Hayden Faulds
cbc6fb232d
add mongo transaction lock when getting or updating projects
2018-02-16 14:44:21 +00:00
Brian Gough
fc1e94b14a
Merge pull request #343 from sharelatex/bg-block-javascript-property-names
...
block javascript property names being used as file names
2018-02-16 14:07:12 +00:00
Brian Gough
2ba7db603f
Merge pull request #337 from sharelatex/ja-allow-javascript-property-names
...
Use bare objects without prototypes for tracking filenames
2018-02-16 14:05:21 +00:00
Hayden Faulds
eb198cd8c3
make getSafePathname a method in CompileController rather than Project
2018-02-16 13:10:48 +00:00
Hayden Faulds
5456f4224c
Merge pull request #339 from sharelatex/hof-project-getter
...
use ProjectGetter rather than Project directly
2018-02-16 11:34:21 +00:00
Brian Gough
8a10e98b56
block javascript property names being used as file names
2018-02-16 10:31:47 +00:00
Paulo Reis
3f14a727e3
Make sure the hamburger menu plays well with the brand.
2018-02-16 10:26:26 +00:00
Hayden Faulds
304a6bc332
use ProjectGetter rather than Project directly
2018-02-16 08:55:09 +00:00
James Allen
20347da44d
Ignore public/brand
2018-02-15 14:54:58 +00:00
James Allen
6f143603a3
Remove unused brand folder
2018-02-15 14:54:34 +00:00
Paulo Reis
51b14e412f
Increase hamburguer menu max-height; 340px was less than SL menu fully expanded.
2018-02-15 11:51:45 +00:00
Paulo Reis
e2874998b3
Improve hamburguer menu in v2, still not perfect.
2018-02-15 11:46:40 +00:00
Paulo Reis
f01b027da0
Make sure the menu behaviour does not change in desktop resolutions.
2018-02-15 11:29:29 +00:00
Paulo Reis
058a58d099
Only apply horizontal paddings (to align with the header).
2018-02-15 11:12:32 +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
4754f1e78a
Use bare objects without prototypes for tracking filenames
2018-02-15 11:06:40 +00:00
Paulo Reis
f1717bfa1f
Allow header content to be on top of main content.
2018-02-15 10:58:36 +00:00
Hayden Faulds
aa89b7e70b
Merge pull request #327 from sharelatex/hof-entity-refactoring
...
Refactor ProjectEntityHandler
2018-02-14 13:28:41 +00:00
hugh-obrien
5d1c2a9cf6
rename v1 template fields on project module
2018-02-14 11:07:38 +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
Hayden Faulds
9ed2d7f971
fix excess argument pass into UpdateMerger.p.processFile
2018-02-13 14:39:38 +00:00
Hayden Faulds
e9b218fe5f
allow the updating of doc lines for deleted docs
2018-02-13 14:39:38 +00:00
James Allen
a427414920
Merge pull request #331 from sharelatex/ja-autocomplete-fix
...
Potential fix for the auto-complete bug
2018-02-13 09:41:00 +00:00
Shane Kilkelly
9c83ff5353
Merge pull request #316 from sharelatex/afc-fix-typo-in-path
...
Update analytics manager to use new path
2018-02-13 09:39:09 +00:00
Shane Kilkelly
9a7b3c2b23
Merge pull request #320 from sharelatex/sk-retry-analytics-requests
...
Add a retry to analytics requests
2018-02-13 09:38:56 +00:00
James Allen
29d2b408ad
Don't error when detaching from history with no sharejsDoc
2018-02-13 08:43:00 +00:00
James Allen
5d3ecdb924
Add explicit editor init event
2018-02-13 08:27:48 +00:00
James Allen
3802df5cfa
Use popup instance variable like Ace autocompleter does
2018-02-13 08:27:41 +00:00
Hayden Faulds
2f9f26eae2
fix logging
2018-02-12 16:05:34 +00:00
Shane Kilkelly
0efc8136cb
Use requestretry node package
2018-02-12 15:16:21 +00:00
Hayden Faulds
29018d5af6
run make clean before compile_full on CI
2018-02-12 13:34:00 +00:00
Hayden Faulds
458bbc7cfd
refactor ProjectEntityHandler
...
- moves project locking into ProjectEntityHandler
- splits ProjectEntityHandler into ProjectEntityHandler,
ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler
- adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to
EditorController and ProjectEntiyUpdateHandler
2018-02-12 13:33:59 +00:00
James Allen
5d6925921c
Fix read only links
2018-02-12 10:42:57 +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
3c9eb07848
Merge pull request #322 from sharelatex/bg-validate-filename-length-client
...
validate filename length client
2018-02-12 10:08:03 +00:00
hugh-obrien
ea736390a1
add template id fields to project model
2018-02-11 16:58:45 +00:00
James Allen
92e59f7008
Remove unneeded apply
2018-02-09 17:58:19 +00:00
James Allen
ab940fb462
Fix typo in comment
2018-02-09 17:54:58 +00:00
James Allen
9e86abbb04
Remove unneeded webkit prefix in css
2018-02-09 17:54:42 +00:00
Brian Gough
8e048bcf67
add translation for new doc/folder "already exists" error
2018-02-09 16:37:38 +00:00
Brian Gough
ecea3dd1be
add an extra test for invalid element names
2018-02-09 15:13:58 +00:00
Brian Gough
2c2b6e5f36
fix filename length check
2018-02-09 15:05:52 +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
f109d5a56c
Merge pull request #311 from sharelatex/ja-fix-template
...
Fix typo and file extension in example tex template
2018-02-09 11:23:20 +00:00
Alasdair Smith
7ff0f40477
Merge pull request #266 from sharelatex/as-cm
...
CodeMirror
2018-02-09 11:23:11 +00:00
Alasdair Smith
b7200066e9
Inject rich text variable to conditionally show rich text styles
2018-02-09 10:42:11 +00:00
Alasdair Smith
bfda9c595b
Hide rich text behind feature flag
2018-02-09 10:42:11 +00:00
Alasdair Smith
4c23a3c8f0
Fix bug where spell check cache would error when toggling between ace & cm
2018-02-09 10:42:11 +00:00
Alasdair Smith
d15efc6fb6
Create cmEditor directive to connect to ShareJS
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
7783e18a50
Allow Documents to be attached to CM
2018-02-09 10:38:51 +00:00
Alasdair Smith
09fbafa1f6
Include ShareJS CM adapter in compiled lib and fix bug with CM adapter
...
Because the CM & Ace scripts are naively concat-ed together, the Ace
applyToShareJS function would be overwritten by the CM version.
Also fixes bugs where adapter was calling old version of ShareJS api
and the old CM api
2018-02-09 10:38:51 +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
Alasdair Smith
d8e87997c1
Install codemirror
2018-02-09 10:02:36 +00:00
Henry Oswald
ccffdc3265
added blog url to config
2018-02-08 14:47:54 +00:00
James Allen
bd9f30d858
Adjust icon spacing in PDF toolbar
2018-02-08 14:41:39 +00:00
James Allen
7866a91d21
Refactor auto-compile trigger logic
2018-02-08 13:39:59 +00:00
James Allen
5bf2ff0a47
Show animated bar while auto-compile is pending
2018-02-08 13:39:56 +00:00
Shane Kilkelly
8117061674
Make the retry-on-fail behaviour optional
2018-02-08 13:04:47 +00:00
Shane Kilkelly
1c15e0966c
Add a retry to analytics requests
2018-02-08 11:42:48 +00:00
Henry Oswald
696e9d27d6
send invalid_email error type down when sharing project
2018-02-08 10:35:18 +00:00
Brian Gough
14ef9a2c49
comment out broken length check
2018-02-08 10:08:22 +00:00
Brian Gough
cba4a391a9
Merge pull request #314 from sharelatex/bg-validate-filenames-server
...
server side check for valid filenames
2018-02-08 09:16:31 +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
Brian Gough
b083e4bc5f
remove redundant MAX_PATH definition
2018-02-07 16:14:56 +00:00
Brian Gough
c14380d563
use the SafePath.coffee file in the client too
2018-02-07 15:50:29 +00:00
Brian Gough
9c36b38e2c
make SafePath.coffee shareable between client and server code
2018-02-07 15:43:56 +00:00
Brian Gough
57549d32be
remove unused path module
2018-02-07 15:28:26 +00:00
Brian Gough
2a5ed0caf5
use Errors.InvalidName instead of plain Error object
2018-02-07 15:22:00 +00:00
Brian Gough
c6f74d24f1
add missing SafePath.clean function
2018-02-07 15:21:04 +00:00
Henry Oswald
df9b866bee
remove 'script blocker' from recaptcha message
2018-02-07 14:24:15 +00:00
Henry Oswald
b387ca3b2a
change wording on recaptcha to JLM's option
2018-02-07 14:19:33 +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
Shane Kilkelly
a06c4003f9
Merge pull request #312 from sharelatex/sk-add-from-v2-flag-to-analytics
...
Add a `fromV2` flag to Analytics events, when coming from V2 instance
2018-02-07 09:48:11 +00:00
Alberto Fernández Capel
413e81f29a
Update analytics manager to use new path
...
It fixes a typo in the path.
Related to https://github.com/sharelatex/analytics-sharelatex/pull/43
2018-02-07 09:39:00 +00:00
James Allen
5edeff36b6
Vertically center caret
2018-02-06 16:22:20 +00:00
Brian Gough
76281a3d79
use extended file validation rules in frontend
2018-02-06 11:46:50 +00:00
Brian Gough
ddf1d6e65e
add valid-file directive for front-end
2018-02-06 11:46:50 +00:00
Brian Gough
7f727d434e
server side check for valid filenames
2018-02-06 10:44:58 +00:00
Alasdair Smith
e93e055b13
Merge pull request #309 from sharelatex/ja-tags-folders-tweaks
...
UX tweaks to tags/folders side bar entry
2018-02-06 10:36:15 +00:00
Alasdair Smith
e3811d33e9
Merge pull request #302 from sharelatex/msw-history-failure
...
Bail out if history API request fails
2018-02-06 10:35:57 +00:00
Shane Kilkelly
6d8b50efc4
Add a fromV2 flag to Analytics events, when coming from V2 instance
2018-02-06 10:35:15 +00:00
James Allen
fc4ffc3905
Fix typo and file extension in example tex template
2018-02-06 10:27:10 +00:00
Alasdair Smith
0c2d7e250f
Merge pull request #308 from sharelatex/as-upgrade-less
...
Update Less/grunt-contrib-less to latest version
2018-02-06 10:21:14 +00:00
James Allen
6a1597560e
Remove unused modal templates
2018-02-06 10:16:06 +00:00
James Allen
4f89506afc
Make link sharing more prominant
2018-02-06 10:06:32 +00:00
James Allen
37115b8408
Add loading indicator while server returns links
2018-02-06 10:00:59 +00:00
James Allen
e7ba75c2e5
Don't show pop-up when changing link sharing status
2018-02-06 09:56:46 +00:00
James Allen
3e5527b826
UX tweaks to tags/folders side bar entry
2018-02-05 17:04:56 +00:00
Paulo Reis
3c3bb0a892
Use globalVars strategy to do v2-specific styling.
2018-02-05 16:20:33 +00:00
Alasdair Smith
ed5f31b248
Update grunt-contrib-less to latest version
...
Note that this also updates less to 2.7.
This change is required so that variables can be injected by the Less
compiler. This is useful for allowing feature flags.
2018-02-05 15:52:56 +00:00
Alberto Fernández Capel
ae33b84289
Ignore heartbeat event handler params
...
They are not used for anything and the cause an error when
the handler is called from a scroll event.
2018-02-05 13:48:52 +00:00
James Allen
f20d36044b
Merge pull request #298 from sharelatex/as-fix-npm
...
Fix installation of babel
2018-02-02 11:04:22 +00:00
James Allen
799fe9eb8c
Merge pull request #301 from sharelatex/ja-fix-scope-issue
...
Fix undefined $scope error
2018-02-02 11:04:14 +00:00
James Allen
c89bbd7588
Merge pull request #296 from sharelatex/ja-show-v2-message
...
Show v2 message if awareOfV2 flag set
2018-02-02 11:04:06 +00:00
Michael Walker
5987d6d79c
Add unit tests for failing history API
2018-02-02 10:12:57 +00:00
Michael Walker
217940d76f
Fix failing unit tests
2018-02-02 10:12:57 +00:00
Michael Walker
e886217b85
Bail out if history API request fails
2018-02-02 10:12:54 +00:00
Hayden Faulds
9955fd570c
Merge pull request #299 from sharelatex/hof-tpds-locking
...
Project Locking: TPDS locking
2018-02-02 09:20:07 +00:00
James Allen
9e5c98dd07
Use local references to variable
2018-02-01 16:52:43 +00:00
Shane Kilkelly
6e2af763ec
Revert "Bail out if history API request fails"
2018-02-01 12:49:25 +00:00
Shane Kilkelly
19c97cb15b
Merge pull request #289 from sharelatex/afc-track-edit-sessions
...
Send editing session heartbeat to the analytics service
2018-02-01 12:31:38 +00:00
Shane Kilkelly
ba31df3dae
Merge pull request #295 from sharelatex/msw-history-failure
...
Bail out if history API request fails
2018-02-01 12:31:30 +00:00
Shane Kilkelly
b7226e6985
Add the metrics-web-module
2018-02-01 12:18:54 +00:00
Hayden Faulds
a9be50ebcd
stream request to file outside of project lock
2018-02-01 10:44:53 +00:00
Hayden Faulds
9496480a29
test project lock is taken
2018-02-01 10:44:53 +00:00
Hayden Faulds
22737e8bd6
group together tests
2018-02-01 10:44:53 +00:00
Hayden Faulds
a6666bee62
group together private in UpdateMerger tests
2018-02-01 10:44:53 +00:00
Hayden Faulds
44d4a1dbe2
replace mocks with stubs in UpdateMerger tests
2018-02-01 10:44:52 +00:00
Hayden Faulds
e214347ede
add locking around project structure updates in TPDS
2018-02-01 10:44:52 +00:00
Alasdair Smith
23de113393
Fix error type assertion
2018-02-01 10:08:10 +00:00
Alasdair Smith
ec8637ead1
Add back webpack script
2018-01-31 17:26:29 +00:00
Alasdair Smith
e01615c174
Install webpack & babel
2018-01-31 17:24:19 +00:00
Alasdair Smith
a51012c96f
Regenerate shrinkwrap after removing contentful dependency
2018-01-31 17:19:42 +00:00
Brian Gough
b7b40faefe
fix unit test
2018-01-31 13:28:11 +00:00
Alasdair Smith
c156187bab
Remove unused contentful dependency
...
This package is unused, and was causing problems with installing babel. Because
it dependended on an older version of babel, and was interpreted by npm first
(as it is a regular dep), the older version of babel would be "hoisted" to the
top level of node_modules
Then when latest versions of babel are installed they would be interpreted second
and thus would nest their dependencies within their own node_modules, filling the
disk with unnecessary copies of core-js.
Removing the unnecessary dep solves these problems
2018-01-31 12:30:39 +00:00
Brian Gough
c19acd82a4
Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion
...
fix typo in project getter exclusions
2018-01-31 11:51:01 +00:00
Brian Gough
5e52ade1ff
Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames
...
prevent duplicate filenames
2018-01-31 11:50:45 +00:00
James Allen
9a9938083c
Merge pull request #267 from sharelatex/as-remove-rollout
...
Remove rollout logic for auto compile and link sharing
2018-01-31 10:27:09 +00:00
Brian Gough
c652abf739
replace error message with Error object
2018-01-31 10:26:31 +00:00
Brian Gough
21c1ea6687
remove comment in test
2018-01-31 10:26:06 +00:00
James Allen
97c0577d8e
Merge pull request #293 from sharelatex/ja-allow-sl-login-to-v2
...
Show different message if user comes from SL instead of OL v2
2018-01-31 10:23:22 +00:00
James Allen
de7f13aea6
Use hasFeature for message about returning to v1/SL
2018-01-31 10:05:56 +00:00
James Allen
aa6c16593e
Add renamingToName override name for instant apparent renames
2018-01-31 09:42:41 +00:00
James Allen
9721dffbb6
Add missing state reset to error handler
2018-01-31 09:41:58 +00:00
Brian Gough
1c6dc66ed1
prevent double calls to rename
2018-01-29 16:45:59 +00:00
Brian Gough
6ed181d52c
fix check for name in filetree move
2018-01-29 15:27:52 +00:00
Brian Gough
63fa024d98
client-side duplicate check for move/rename/create
2018-01-29 15:24:51 +00:00
Brian Gough
2f52e6c4b4
remove comments
2018-01-29 10:38:25 +00:00
Brian Gough
b30dd22f0e
return a 400 status code for invalid moves
...
was previously returning 500
2018-01-26 17:00:55 +00:00
Brian Gough
cd2688a740
added tests for rename/move
2018-01-26 17:00:33 +00:00
James Allen
12e55fb487
Show v2 message if awareOfV2 flag set
2018-01-26 16:44:14 +00:00
Michael Walker
9303969d7b
Bail out if history API request fails
2018-01-26 15:16:37 +00:00
James Allen
7e829f6944
Fix OL v1 URL
2018-01-26 11:32:17 +00:00
Brian Gough
4bac80dfd5
Merge branch 'bg-prevent-duplicate-filenames' of github.com:sharelatex/web-sharelatex-internal into bg-prevent-duplicate-filenames
2018-01-25 17:09:43 +00:00
Brian Gough
aa5d880902
don't update project structure if file not created
2018-01-25 17:09:32 +00:00
Brian Gough
69bed6dbb2
fix MockFileStoreApi to record uploaded files
2018-01-25 17:09:31 +00:00
Brian Gough
68ac597a93
initial acceptance tests
2018-01-25 17:09:31 +00:00
Brian Gough
302bbe8893
rename checkElementName to checkValidElementName
2018-01-25 17:09:31 +00:00
Brian Gough
7ba17a8875
only need to load rootFolder from project
2018-01-25 17:09:31 +00:00
Brian Gough
8e239e0c64
only update client filetree on success
2018-01-25 17:09:31 +00:00
Brian Gough
9d74a0a2f0
handle errors normally in addFolder modal
2018-01-25 17:09:31 +00:00
Brian Gough
ea9976994a
update unit tests for duplicate checks
2018-01-25 17:09:31 +00:00
Brian Gough
e183956d16
check for duplicates on move
2018-01-25 17:09:31 +00:00
Brian Gough
e421192b5c
check for duplicates on rename
2018-01-25 17:09:31 +00:00
Brian Gough
6e0881f85d
check for duplicates in addFolder
2018-01-25 17:09:31 +00:00
Brian Gough
82a9fc97d9
check for duplicates in putElement
2018-01-25 17:09:30 +00:00
Alberto Fernández Capel
839ea496f1
Track clicks anywhere on the window as activity when the editor is open
2018-01-25 16:32:00 +00:00
Alberto Fernández Capel
a68489a604
Track session activvity if the user scrolls the editor
2018-01-25 16:10:47 +00:00
Alberto Fernández Capel
7d0d18ea5e
Use the cursor:editor:update event to track user activity
...
It is strictly a superset of the change event we were using
before: if there's a change, there will be always a cursor
update, but there can be cursor updates (like when the user
presses the arrow keys) that don't change the document.
This is coherent with what we do to track user activity at
dfb9943521/public/coffee/ide/connection/ConnectionManager.coffee (L49-L50)
2018-01-24 17:20:30 +00:00
James Allen
3ed805a65a
Show different message if user comes from SL rather than OL v2
2018-01-24 16:56:51 +00:00
James Allen
626f652c77
Update User acceptance test helper to expose methods for modules
2018-01-24 16:56:31 +00:00
Alberto Fernández Capel
e42d1f9b13
Change heartbeat backoff logic
...
Send first two heartbeats at 0 and 30 secs, then increase the backoff
interval 1min per call until a maximun of 5min.
2018-01-24 16:05:53 +00:00
Alberto Fernández Capel
dd2e9d7431
Remove unused var
2018-01-24 15:37:16 +00:00
Alberto Fernández Capel
f0777f996c
Space editing sessions heartbeats with an increasing backoff
...
We send the first heartbeat as soon as the session start.
The next ones are sent (if there's any activity)
when the editing session is about 30 and 60 seconds.
Then at 2min, 3min, 4min, 5min and later on every 5min.
The backoff is not reset, so if due to inactivity the
session expires in the server the backoff will still be
the same.
2018-01-24 15:22:41 +00:00
Brian Gough
ec93cedf27
rename checkElementName to checkValidElementName
2018-01-24 10:07:42 +00:00
Brian Gough
2a0b0d3a87
only need to load rootFolder from project
2018-01-24 10:07:42 +00:00
Brian Gough
feb02dacd4
only update client filetree on success
2018-01-24 10:07:42 +00:00
Brian Gough
9b8ce78eb9
handle errors normally in addFolder modal
2018-01-24 10:07:42 +00:00
Brian Gough
9538df1644
update unit tests for duplicate checks
2018-01-24 10:07:42 +00:00
Brian Gough
4f5a5cb677
check for duplicates on move
2018-01-24 10:07:42 +00:00
Brian Gough
3881eb1d78
check for duplicates on rename
2018-01-24 10:07:42 +00:00
Brian Gough
c6cca79737
check for duplicates in addFolder
2018-01-24 10:07:42 +00:00
Brian Gough
b537747ccd
check for duplicates in putElement
2018-01-24 10:07:42 +00:00
Brian Gough
77adb60a8a
fix typo in project getter exclusions
2018-01-24 10:06:53 +00:00
James Allen
28deb4e107
Merge pull request #292 from sharelatex/ja-v1-ownership
...
Fallback to project creator when there is no owner
2018-01-24 09:50:20 +00:00
Alberto Fernández Capel
8a1523cc03
Read project id from the global window var
2018-01-23 15:58:59 +00:00
Alberto Fernández Capel
4ca71fb379
Do not track anonymous sessions
...
And DRY the controller a bit.
2018-01-23 15:51:10 +00:00
James Allen
a558d05ac6
Only show import modal for owned projects
2018-01-23 15:12:00 +00:00
Nate Stemen
ea5063d7ea
dont return needsClosingBrace from Helpers
2018-01-23 09:35:24 -05:00
Nate Stemen
91302cfb16
move end bracket logic to helpers and remove unecessary unpacking
2018-01-23 09:35:24 -05:00
Nate Stemen
30eca714eb
fix random things with snippets
2018-01-23 09:35:24 -05:00
Nate Stemen
d2adc753aa
use helpers to see if there is '}' already
2018-01-23 09:35:24 -05:00
James Allen
d7706f642b
Show the creator as the owner if no owner present
2018-01-23 13:47:48 +00:00
Alberto Fernández Capel
8714909a9a
Build query string with style
2018-01-23 12:47:51 +00:00
James Allen
ce9a1fec87
Revert "Go back to allowing v1 projects to be imported"
2018-01-23 11:49:33 +00:00
James Allen
a5195fcbc3
Merge pull request #285 from sharelatex/hof-modal-success
...
Stop import modal button flicker
2018-01-23 10:35:37 +00:00
James Allen
d5c5d9c204
Merge pull request #268 from sharelatex/as-unsupported-project-error
...
Adds UnsupportedBrandError & UnsupportedExportRecordsError types
2018-01-23 10:30:33 +00:00
James Allen
2fb4059633
Merge pull request #258 from sharelatex/ja-allow-v1-imports
...
Go back to allowing v1 projects to be imported
2018-01-23 10:30:23 +00:00
Alberto Fernández Capel
b3b05d1af3
Disable the trailing throttle event in the editing session heartbeat
...
Throttle sends an event as soon as the function is called. Then
we wait X minutes, but we only want to send another event if
there's any activity *after* those X minutes.
2018-01-23 10:29:11 +00:00
Alberto Fernández Capel
8dbb89c09e
Add test for the updateEditingSession endpoint
2018-01-23 10:29:11 +00:00
Alberto Fernández Capel
0bef5531bb
Rename editSession -> editingSession
2018-01-23 10:29:11 +00:00
James Allen
98c620a99b
Revert "Install webpack and babel"
...
This reverts commit 5cfd0ac2d21be5ea0049ced4e522c7a57ddae0c1.
2018-01-22 17:52:39 +00:00
James Allen
a84cc16ce2
Merge pull request #287 from sharelatex/ja-fix-delete-endpoint
...
Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents
2018-01-22 16:47:05 +00:00
James Allen
77d16de759
Merge pull request #263 from sharelatex/as-fix-faq-link
...
Fix v2 faq link
2018-01-22 16:42:34 +00:00
James Allen
d79d6b4ede
Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents
2018-01-22 16:25:11 +00:00
Alberto Fernández Capel
868e32c1bc
Send edit sessions heartbeat to the analytics service
2018-01-22 15:10:52 +00:00
Alberto Fernández Capel
1a1ccc9f46
Remove trailing whitespace
2018-01-22 15:00:56 +00:00
James Allen
3ac4e4c457
Run docker-compose down before acceptance tests
2018-01-19 12:42:49 +00:00
Hayden Faulds
445ed4d604
fix ng-disabled in v1ImportModal
2018-01-18 16:44:32 +00:00
Alasdair Smith
89af8ba123
More renaming
2018-01-18 16:41:26 +00:00
Alasdair Smith
f8a068ee9e
Rename to be more explicit about the error
2018-01-18 15:42:32 +00:00
Alasdair Smith
649ca86a75
Add publisher exports error type
2018-01-18 15:41:14 +00:00
Alasdair Smith
f234e84c95
Export error
2018-01-18 12:09:33 +00:00
Alasdair Smith
950ef0cebb
Add unsupported project error
2018-01-17 17:50:09 +00:00
Alasdair Smith
06e2f0df1c
Remove unused styles for auto compile & link sharing onboarding
2018-01-17 16:04:10 +00:00
Alasdair Smith
4d29c4d769
Remove unused link sharing onboarding now at 100%
2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc
Remove unused autocompile rollout logic now that at 100%
2018-01-17 15:17:55 +00:00
Alasdair Smith
89205092b6
Fix v2 faq link
2018-01-17 11:41:25 +00:00
James Allen
c466025df4
Go back to allowing v1 projects to be imported
2018-01-16 09:40:58 +00:00
Alasdair Smith
4a0628d801
Remove unnecessary test script
2018-01-15 16:23:10 +00:00
Alasdair Smith
984ecae200
Rename directory to es to align with coffee dir
2018-01-15 16:23:10 +00:00
Alasdair Smith
dadd74e730
Move public path to dev config
2018-01-15 16:23:10 +00:00
Alasdair Smith
4642d55b7b
Add basic example script
2018-01-15 16:23:10 +00:00
Alasdair Smith
49c27c4c7a
Port webpack config from OL
2018-01-15 16:23:10 +00:00
Alasdair Smith
9fbd7f2818
Install webpack and babel
2018-01-15 16:23:10 +00:00
James Allen
6d04eeaa03
Merge pull request #256 from sharelatex/ja-display-v2-history-users
...
Inject v2 user details into project-history updates and diffs
2018-01-15 14:21:14 +00:00
James Allen
67061154fe
Merge pull request #237 from sharelatex/hof-editor-controller-locking
...
Project Locking: EditorController
2018-01-15 14:21:03 +00:00
James Allen
662122bb1c
CI and local dev environment improvements
...
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.
With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment , so it shouldn't be necessary to manually restart the container each time a coffee file changes.
At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.
**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.
As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).
This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment , where each service is running in its own docker container, with networking managed by docker.
Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.
Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.
This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.
On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment , this is no longer a problem.
2018-01-15 09:36:41 +00:00
Timothée Alby
62bc3f947f
Merge pull request #257 from sharelatex/ta-remove-proxy-headers
...
Remove headers when proxying analytics request
2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24
use LockManager.runWithLock in EditorController
2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a
rename EditorController.replaceFile -> replaceFileWithoutLock
2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149
add locking for EditorController.renameEntity
2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6
remove all headers when proxying the analytics request
2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3
Merge pull request #251 from sharelatex/fix-group-member-subscription-page
...
Fix subscription page for members of a group
2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f
Merge pull request #242 from sharelatex/rename-entity-bugfix
...
Ensure the dirname is not affected when we rename an entity
2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d
Fix next -> callback
2018-01-11 14:11:44 +00:00
James Allen
17a5dfa5a5
Inject v2 user details into project-history updates and diffs
2018-01-11 11:32:16 +00:00
James Allen
945ef25ef5
Merge pull request #244 from sharelatex/hof-lock-file-upload
...
Project Locking: ProjectUploadController
2018-01-11 08:42:36 +00:00
James Allen
0cf875bd0a
Merge pull request #170 from sharelatex/pr-fix-link-rewriting
...
Enable HTML5 mode in Angular, to allow disabling link rewriting.
2018-01-11 08:42:29 +00:00
James Allen
79055d0e8d
Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs
...
Show apology message instead of raw binary files
2018-01-11 08:42:13 +00:00
Tim Alby
c1febbeb7c
run analytics proxy on public API router
2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d
Merge pull request #241 from sharelatex/ta-analytics-proxy
...
Proxy requests to analytics service
2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f
Merge pull request #234 from sharelatex/hof-remove-unused-method
...
remove unused EditorController.getListOfDocPaths
2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5
proxy requests to analytics service
2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
0200fd66cd
Mock LimitationsManager as well
2018-01-10 10:26:16 +00:00
Alberto Fernández Capel
a81b56556f
Add test for SubscriptionViewModelBuilder
2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a
use LockManger.runWithLock
2018-01-09 16:37:34 +00:00
James Allen
c6b6b95dec
Remove some unused files
2018-01-09 14:19:23 +00:00
Nate Stemen
c43aa54bee
Merge branch 'ns-fix-package-command-meta'
2018-01-08 08:53:42 -05:00
Nate Stemen
7af615ff6c
Merge branch 'ns-no-duplicate-packages'
2018-01-08 08:53:07 -05:00
Nate Stemen
cf4d6c1165
Merge branch 'master' into ns-no-duplicate-packages
2018-01-05 11:46:44 -05:00
Alberto Fernández Capel
6d007bfe74
DRY logic to get subscription from Recurly
...
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736
Fix subscription page for members of a group
...
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.
SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
James Allen
626e0a16ef
Fix acceptance test when overleaf setting not present
2018-01-04 15:49:31 +00:00
James Allen
e58f6cab47
Merge pull request #248 from sharelatex/ja-disable-import-dialog
...
Don't show import dialog for projects, just link to v1 editor
2018-01-04 15:22:48 +00:00
James Allen
692182c784
Show apology message instead of raw binary files
2018-01-04 10:53:49 +00:00
James Allen
967353d080
Update comment to use button for import dialog for a11y
2018-01-03 17:06:51 +00:00
James Allen
bbfcff30fb
Enable project history for new projects if enabled in settings
2018-01-03 16:55:33 +00:00
James Allen
f0d7658bdd
Don't show import dialog for projects, just link to v1 editor
2018-01-03 16:46:26 +00:00
Paulo Reis
8b9f3268b1
Make plans page consistent with others, fixing header issues.
2018-01-03 13:54:33 +00:00
Paulo Reis
b73a56f70c
Take header height into account in the main page masthead; avoid margin collapsing.
2018-01-03 12:12:45 +00:00
James Allen
0f1b0be231
Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging
...
Change an erroneous `logger.error` to `logger.log`; Fixes #227
2018-01-03 11:30:46 +00:00
James Allen
7918232757
Merge pull request #240 from sharelatex/pr-v2-styling-fixes
...
v2 styling fixes
2018-01-03 11:30:39 +00:00
James Allen
ada76e820a
Merge pull request #238 from sharelatex/as-ol-emails
...
v2 themed emails
2018-01-03 11:30:28 +00:00
James Allen
882286afb1
Merge pull request #245 from sharelatex/as-autocompile-rollout-100
...
Increase autocompile rollout to 100%
2018-01-03 11:30:10 +00:00
James Allen
2dcc17ad09
Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history
...
Handle deleted and renamed files better in v2 history UI; Fixes #226
2018-01-03 11:29:59 +00:00
Alasdair Smith
b2d92ea482
Increase autocompile rollout to 100%
2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0
lock project when uploading a file
2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04
Ensure the dirname is not affected when we rename an entity
...
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
2017-12-22 14:24:00 +00:00
Nate Stemen
d2ee03d9b9
make commandNames object for fast lookups
2017-12-21 15:51:50 -05:00
Alasdair Smith
562534034f
Stub out brandPrefix for email tests
2017-12-21 17:18:10 +00:00
Paulo Reis
0484b46027
Redundancy.
2017-12-21 13:52:34 +00:00
Paulo Reis
399ebc473f
Center global alerts in v2.
2017-12-21 13:38:40 +00:00
Paulo Reis
baa57c56aa
Improve dropdown spacing in v2.
2017-12-21 13:34:11 +00:00
Paulo Reis
f5751c34a9
Make inline tags look nicer with v2 typography.
2017-12-21 12:57:33 +00:00
Paulo Reis
484d34e296
Only render announcements in SL.
2017-12-21 12:57:07 +00:00
Alasdair Smith
1be9e29f35
Switch from button to link to fit better
2017-12-21 11:10:23 +00:00
Paulo Reis
d5502fd502
Make layout work nicely without navbar (content BG now expands to the top).
2017-12-21 11:03:27 +00:00
Alasdair Smith
fb23b30c45
Merge branch 'master' into as-update-v2-copy
2017-12-21 10:57:16 +00:00
Alasdair Smith
0114ed362f
Swap out email templates based on brand prefix
2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48
Fix OL auto-linking styles
2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824
Change an erroneous logger.error to logger.log
2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146
Add OL themed email templates
2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1
Clean up whitespace
2017-12-20 17:52:49 +00:00
James Allen
e6281911f0
Add history-file-tree.pug
2017-12-20 16:42:23 +00:00
James Allen
940b22ef95
Remove debug line
2017-12-20 16:42:09 +00:00
James Allen
d0fee7e76c
Show a file tree of changed paths, so we can work with renamed and deleted files
2017-12-20 16:22:32 +00:00
Paulo Reis
70b755603d
Fix empty project list card.
2017-12-20 16:03:12 +00:00
Paulo Reis
d22a9acc76
Highlight project name a little, style renaming widget in v2.
2017-12-20 15:56:32 +00:00
Paulo Reis
cf30cfd923
Create new style for links inside alerts; apply it to the reconnection alert.
2017-12-20 15:39:50 +00:00
Hayden Faulds
8663dba37c
remove unused EditorController.getListOfDocPaths
2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e
Remove unnecessary & incorrect title
2017-12-20 14:10:05 +00:00
Shane Kilkelly
18ae27fd66
Merge branch 'sk-account-sync'
2017-12-20 14:02:45 +00:00
James Allen
c191ac2e8d
Show deleted files in v2 history
2017-12-20 13:59:17 +00:00
Henry Oswald
ec41f984e6
Merge branch 'ho-remove-groove'
2017-12-20 13:37:15 +00:00
Paulo Reis
8d1736af59
Fix forgotten conflict.
2017-12-20 09:51:32 +00:00
Paulo Reis
0a0c6c6c0c
Merge branch 'master' into pr-style-v2-chatpane
2017-12-20 09:50:49 +00:00
Paulo Jorge Reis
c8741daeb2
Merge pull request #204 from sharelatex/pr-style-v2-pdf
...
Style v2 PDF viewer, alerts and logs
2017-12-20 09:17:21 +00:00
James Allen
339b7ec14f
Merge branch 'ja-allow-importing-without-history'
2017-12-19 15:06:17 +00:00
James Allen
1653de9301
Revert "Build from module branch"
...
This reverts commit 34d4b72ddd8b16bd34013e7bea9459940fbf0032.
2017-12-19 15:01:17 +00:00
James Allen
98ff097981
Merge pull request #219 from sharelatex/as-ignore-require
...
Ignore content-addressible compiled require js
2017-12-19 15:00:50 +00:00
James Allen
1d89a535a1
Merge pull request #208 from sharelatex/ja-front-end-history
...
Add in web front end that supports v2 history; Fixes #168
2017-12-19 15:00:34 +00:00
James Allen
0a4febfce6
Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only
...
only hash the static content when minified is on
2017-12-19 15:00:15 +00:00
James Allen
e18dc1e41d
Merge pull request #214 from sharelatex/hof-version-entity-deletion
...
version entity deletion
2017-12-19 14:59:37 +00:00
James Allen
2d8b47295f
Build from module branch
2017-12-19 13:59:06 +00:00
James Allen
731cd57250
Make intermediate argument signature clearer
2017-12-19 13:59:06 +00:00
James Allen
5463b608ad
Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history
2017-12-19 13:59:06 +00:00
James Allen
ffa2e231fd
Fix up tests
2017-12-19 13:58:47 +00:00
James Allen
8311101ec0
Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps
2017-12-19 13:58:47 +00:00
James Allen
dfe6e26946
test_unit_frontend -> test_frontend in Makefile
2017-12-19 13:58:47 +00:00
James Allen
810b5e0e9a
Fix front end tests
2017-12-19 13:58:47 +00:00
James Allen
b4a5e5a041
Tidy up HistoryV2Manager
2017-12-19 13:58:47 +00:00
James Allen
b0812864ac
Clean up CI output
2017-12-19 13:58:47 +00:00
James Allen
d7a26e27e5
Run front end tests in CI
2017-12-19 13:58:47 +00:00
James Allen
d84580f12d
Label actions with text rather than icons
2017-12-19 13:58:47 +00:00
James Allen
8a3fadbfc1
Style the edit/add/rename options
2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2
Add HistoryV2Manager alongside existing HistoryManager
2017-12-19 13:58:47 +00:00
James Allen
8ea779af58
Add some front end tests for HistoryManager
2017-12-19 13:58:47 +00:00
James Allen
4691a6e85c
Get diffs showing in client
2017-12-19 13:58:47 +00:00
James Allen
a1615e6d84
Prototype of requesting history information by doc path, while tracking renames
2017-12-19 13:58:47 +00:00
Brian Gough
388a052647
Merge pull request #213 from sharelatex/bg-allow-autocompile-without-code-check
...
allow autocompile without code check
2017-12-19 13:46:12 +00:00
Nate Stemen
685595ed0a
remove comment
2017-12-19 08:44:19 -05:00
Shane Kilkelly
529d35936d
Merge pull request #203 from sharelatex/sk-prevent-archived-deletion
...
Prevent user from trying to delete archived project they don't own
2017-12-19 13:36:26 +00:00
Henry Oswald
70298ba65c
only hash the static content when minified is on
2017-12-19 13:13:31 +00:00
Paulo Reis
547c0cb79f
Use new theme red shade as the danger red; tone down compile log alerts.
2017-12-19 13:10:12 +00:00
Paulo Reis
cb83e2c1b2
Tone down chat colors.
2017-12-19 10:52:23 +00:00
Paulo Reis
88d669cbb5
Remove debugging statements.
2017-12-19 10:52:17 +00:00
Paulo Reis
91d479378b
Apply padding and font-weight changes.
2017-12-19 10:51:49 +00:00
Paulo Reis
709a4bf4fb
Adjust padding values.
2017-12-19 10:50:33 +00:00
Alasdair Smith
f3342f327d
Merge pull request #202 from sharelatex/as-v2-upgrade-redirect
...
Use V1 trial page on V2 instead of legacy SL
2017-12-19 10:07:08 +00:00
Alasdair Smith
fdd861e824
Ignore content-addressible compiled require js
2017-12-19 10:02:15 +00:00
Alasdair Smith
8453a7a910
Increase width slightly
2017-12-18 17:26:24 +00:00
Alasdair Smith
dc2ddf7e09
Check for OL free trial instead of host as it may be fragile indicator
2017-12-18 16:53:58 +00:00
Paulo Reis
4e02033c82
Use Lato as the sans-serif font for v2.
2017-12-18 16:19:10 +00:00
Hayden Faulds
ac36de9629
make ProjectEntityHandler._clean* argument signatures consistent
2017-12-18 15:15:36 +00:00
Hayden Faulds
938caed4f7
set userId when deleting entities via the tpds
2017-12-18 15:15:36 +00:00
Hayden Faulds
ca15fdb6eb
pass userId to EditorHttpController.deleteEntity
2017-12-18 15:15:36 +00:00
Hayden Faulds
5f6686ed3b
pass userId to ProjectEntityHandler.deleteEntity
2017-12-18 15:15:36 +00:00
Hayden Faulds
2ac74b9adc
pass userId into _clean methods in ProjectEntityHandler
2017-12-18 15:15:36 +00:00
Hayden Faulds
99a52d48c8
acceptance test versioning entity deletions
2017-12-18 15:15:36 +00:00
Hayden Faulds
475e84b039
version entity deletions in ProjectEntityHandler
2017-12-18 15:15:36 +00:00
Hayden Faulds
81c061c6a7
acceptance test moving entities
2017-12-18 15:15:36 +00:00
Hayden Faulds
e5e75a8ccb
update DocumentUpdaterHandler.updateProjectStructure to support entity deletions
2017-12-18 15:15:36 +00:00
Shane Kilkelly
56ec81bb3e
Change 'oveleafPlanCode' to 'v1PlanCode'
2017-12-18 13:52:37 +00:00
Alasdair Smith
72ca08ae2d
Reduce margin under list
2017-12-15 16:11:31 +00:00
Nate Stemen
7d5c661b4e
make command names local array
2017-12-15 11:10:44 -05:00
Alasdair Smith
61900cc1ea
Restyle step 2 for side-by-side layout
2017-12-15 16:01:00 +00:00
Alasdair Smith
75a34024bc
Restyle step 1 for side-by-side layout
2017-12-15 13:48:53 +00:00
Henry Oswald
7aaf08da48
added no-cache endpoint
2017-12-15 13:38:34 +00:00
Alasdair Smith
8862ed383c
Fix project title & bold
2017-12-15 13:28:53 +00:00
Alasdair Smith
7130d0b270
Update v1 import modal with updated copy
2017-12-15 12:49:17 +00:00
Alasdair Smith
2b3b8b2c3b
Use hardcoded OL url instead of settings - no point in linking to staging faq
2017-12-15 12:29:39 +00:00
Alasdair Smith
96af59d6b5
Update v1 project/tag tooltips
2017-12-15 12:17:08 +00:00
Alasdair Smith
a6cd210ef6
Update v1 dash pane with new copy & restyle to fit correctly
2017-12-15 12:02:11 +00:00
Henry Oswald
4955fb373b
ignore hashed requirejs path
2017-12-15 10:10:13 +00:00
Henry Oswald
7693d274b7
Merge pull request #209 from sharelatex/ho-hash-static
...
Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified
2017-12-15 09:52:23 +00:00
Alasdair Smith
da2c0b3fea
Switch redirectToOLFreeTrialUrl to calculate trial url
...
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
2017-12-14 17:09:11 +00:00
Alasdair Smith
7322522323
Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl
2017-12-14 17:05:12 +00:00
Brian Gough
8d91cd2748
allow autocompile without code check
2017-12-14 16:19:43 +00:00
Shane Kilkelly
b6d6ac8304
Ignore select-all events for disabled check-boxes
2017-12-14 16:18:01 +00:00
Henry Oswald
bf276b0814
ripped file fingerprinting out
2017-12-14 12:11:13 +00:00
Paulo Reis
d89aa0ca02
Remove commented out code.
2017-12-14 11:52:41 +00:00
Henry Oswald
507503fe89
remove old .gitignore paths
2017-12-14 11:36:33 +00:00
Paulo Reis
df5254d603
Remove LESS vars from other branch.
2017-12-14 11:29:41 +00:00
Paulo Reis
d5c000d761
Use correct SL color for the chat textarea.
2017-12-14 11:26:13 +00:00
Paulo Reis
907654747b
Style the chat input box.
2017-12-14 11:25:50 +00:00
Henry Oswald
cbf656518f
remove versioned files from fingerprinting
2017-12-14 11:24:47 +00:00
Paulo Reis
36c79979bd
More color adjustments.
2017-12-14 11:24:06 +00:00
Paulo Reis
c03ce6fdf7
Configure chat messages colors per brand.
2017-12-14 11:24:05 +00:00
Paulo Reis
e47b20390b
Add per brand UI specific chat message styles.
2017-12-14 11:24:05 +00:00
Paulo Reis
ca68f01a9d
Build chat message styles on the controller side (allowing for extra parameters).
2017-12-14 11:23:22 +00:00
Paulo Reis
9deddcf2a8
Disable dark theme handling for v2, for now.
2017-12-14 11:23:22 +00:00
Paulo Reis
c5e2560b43
Basic colors for chat.
2017-12-14 11:22:57 +00:00
Henry Oswald
d947da26d7
Merge branch 'ho-hash-static' of https://github.com/sharelatex/web-sharelatex-internal into ho-hash-static
2017-12-14 11:03:20 +00:00
Henry Oswald
288af6772a
write hashes for all files we fingerprint
2017-12-14 10:59:46 +00:00
Henry Oswald
bbbba701b0
Update editor.pug
2017-12-14 10:21:53 +00:00
Henry Oswald
490c56c692
libs -> libraries
...
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald
716b309208
remove todo statments
2017-12-13 16:50:18 +00:00
Henry Oswald
f021f21f11
only hash when minified
2017-12-13 16:37:51 +00:00
Alasdair Smith
b7a43d95e0
Remove unused method, now handled by FreeTrialModalController
2017-12-13 15:55:32 +00:00
Henry Oswald
ccbb15c82e
remove fingerprint from ide
2017-12-13 14:54:08 +00:00
Alasdair Smith
e7992e65e4
Merge branch 'master' into as-v2-upgrade-redirect
2017-12-13 14:45:51 +00:00
Alasdair Smith
4a9c9c563a
Merge branch 'master' into as-autocompile-rollout-60
2017-12-13 14:44:31 +00:00
Henry Oswald
dd6bd3b91e
Merge branch 'master' into ho-hash-static
2017-12-13 14:25:32 +00:00
Henry Oswald
357617d952
works with libs compiled into it
2017-12-13 14:19:19 +00:00
Henry Oswald
88334959d7
added remove extension
2017-12-13 14:13:45 +00:00
Henry Oswald
65efbbce53
seems to work now.
2017-12-13 13:06:38 +00:00
Alasdair Smith
4c81cd874f
Remove unnecessary method - handled by FreeTrialModalController
2017-12-13 11:09:46 +00:00
Shane Kilkelly
6fe937bcad
Finish unit tests for SubscriptionUpdater
2017-12-13 10:57:56 +00:00
Alasdair Smith
60b00d2b94
Merge pull request #196 from sharelatex/as-clean-up-failed-import
...
Add unsupported file type error
2017-12-13 10:31:02 +00:00
Nate Stemen
618f04ea7a
allow package manager to have access to metadata
2017-12-12 15:14:24 -05:00
Nate Stemen
68b57f8d95
check current commands against package commands
2017-12-12 14:33:11 -05:00
Henry Oswald
80e6a660be
wip, this does not work minified yet
...
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
Shane Kilkelly
603252f3b4
Prevent user from trying to delete archived project they don't own
...
This change disables the select-project checkbox if the user
is on the 'archived' project pane and they don't own the project.
The request to delete would fail anyway, but this prevents UI confusion
2017-12-12 16:23:24 +00:00
Paulo Reis
d8153f9fdb
Merge branch 'master' into pr-style-v2-pdf
2017-12-12 14:19:22 +00:00
Alasdair Smith
5c62ac4f8a
Change error type for consistency
2017-12-12 12:59:10 +00:00
Alasdair Smith
4126e9bd31
Merge branch 'master' into as-v1-dash-link
2017-12-12 09:55:48 +00:00
Alasdair Smith
f5c914ed6c
When upgrading track changes on V2, redirect to V1 trial page
2017-12-11 18:03:09 +00:00
Paulo Reis
edfc259c53
Fix missing border on SL.
2017-12-11 16:55:50 +00:00
Paulo Reis
59e675797e
Merge branch 'master' into pr-style-v2-resizers
2017-12-11 15:55:50 +00:00
Paulo Reis
ab46e3930a
Configure toggler cursors for v2.
2017-12-11 15:41:07 +00:00
Paulo Reis
0652fc62a0
Configure resizer cursors for v2.
2017-12-11 15:33:00 +00:00
James Allen
de484e1a08
Remove unused reference to e
2017-12-11 13:31:16 +00:00
James Allen
f465a962d4
Put recaptcha css in a base location
2017-12-11 13:01:21 +00:00
James Allen
53dc8cddfc
Refactor captcha into middleware and angular service
2017-12-11 12:58:55 +00:00
James Allen
69499847e4
Refactor front end code into validateCaptcha service
2017-12-11 12:32:43 +00:00
James Allen
0b03bbc7c3
Don't inject recaptcha element if recaptcha is not enabled
2017-12-11 12:04:33 +00:00
James Allen
83086e4a79
Add recaptch to share endpoint
2017-12-11 11:57:59 +00:00
Henry Oswald
314dcd1901
added null checks to mandrill
2017-12-11 11:48:31 +00:00
Alasdair Smith
89bdb6eff9
Increase autocompile rollout to 60%
2017-12-11 11:45:53 +00:00
Henry Oswald
3e2c997e8b
added stubs for nodemailer into unit tests
2017-12-11 11:40:25 +00:00
Henry Oswald
bd7e2d956d
add mandrill as email option
2017-12-11 11:05:04 +00:00
Paulo Reis
97129b5dda
Make the togglers more obvious when panes are closed.
2017-12-08 15:29:05 +00:00
Shane Kilkelly
eefe56d0f7
Fix up error handling in SubscriptionUpdater
2017-12-08 11:37:24 +00:00
Alasdair Smith
6198491e5f
Add unsupported file type error
2017-12-08 11:31:44 +00:00
Shane Kilkelly
a675e774b8
Fix how the getOverleafPlanCode integration is done
2017-12-08 11:29:11 +00:00
Paulo Reis
9575e80291
Pseudo elements in togglers where causing artifacts in v2; only allow those in SL.
2017-12-08 10:31:31 +00:00
Paulo Reis
5bea196b8f
Style logs, log hints and alerts in general.
2017-12-07 16:35:39 +00:00
Shane Kilkelly
3adbc52089
Add a method to explicitely refresh subscription feature
2017-12-07 16:28:07 +00:00
Shane Kilkelly
4e86a03b46
Fix a problem with the order of module initialization
2017-12-07 15:06:32 +00:00
Nate Stemen
d224e09b5e
Merge pull request #192 from sharelatex/ns-remove-labels
...
removing labels service
2017-12-07 09:38:00 -05:00
Paulo Reis
1a6e831b9e
Basic PDF viewer colors for v2.
2017-12-07 14:14:42 +00:00
Shane Kilkelly
a1f1c25294
Merge branch 'master' into sk-account-sync
2017-12-07 11:51:41 +00:00
Paulo Reis
09dcbcf3b7
Fix missing variables.
2017-12-07 10:35:43 +00:00
Paulo Reis
7c5a7880b0
Merge branch 'master' into pr-style-v2-resizers
2017-12-06 15:49:18 +00:00
Alasdair Smith
48cd048e5c
Merge branch 'master' into as-v1-dash-link
2017-12-06 15:12:29 +00:00
Paulo Jorge Reis
37a571283a
Merge pull request #194 from sharelatex/as-autocompile-rollout-40
...
Increase autocompile rollout to 40%
2017-12-06 11:22:40 +00:00
Paulo Jorge Reis
a5f99ccce3
Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling
...
V2 editor styling
2017-12-06 11:22:28 +00:00
Paulo Reis
2ccf0750f2
Run SVGs through SVGOMG.
2017-12-06 11:21:02 +00:00
Alasdair Smith
fa89b91ac6
Increase rollout to 40%
2017-12-06 09:58:38 +00:00
Nate Stemen
9bf5d1e14c
removing labels service
2017-12-05 13:57:36 -05:00
Alasdair Smith
2d66fd7280
Merge pull request #169 from sharelatex/as-import-v1
...
V1 Import Modal
2017-12-05 13:19:49 +00:00
Alasdair Smith
ab6830976e
Merge branch 'master' into as-show-v1-warnings
2017-12-05 11:13:25 +00:00
Alasdair Smith
9f4aef76ea
Merge branch 'master' into as-import-v1
2017-12-05 10:43:07 +00:00
Paulo Reis
5dffdf3efc
Add a small a11y fix.
2017-12-05 10:23:28 +00:00
Paulo Reis
a88538c3fd
Make the back to projects button closer to current SL.
2017-12-05 10:20:25 +00:00
Paulo Reis
aab43f5916
Smaller line-height in the file tree.
2017-12-05 10:07:45 +00:00
Alasdair Smith
6a185a838d
Increase height & margin
2017-12-04 17:20:53 +00:00
Paulo Reis
7498ead1f5
Make sure SL synctex controls remain the same.
2017-12-04 15:58:40 +00:00
Paulo Reis
963ad4fece
Style resizer togglers.
2017-12-04 15:48:23 +00:00
Shane Kilkelly
44c289d8dd
Fix unit tests for SubscriptionUpdater
2017-12-04 15:34:46 +00:00
Alasdair Smith
c84c00d56d
Change query param for nicer api on OL side
2017-12-04 15:19:03 +00:00
Shane Kilkelly
e7d8848a6a
Include possible overleaf subscription in feature setting
2017-12-04 15:12:26 +00:00
Paulo Reis
0bad7d8549
Adjustments to synctex controls.
2017-12-04 15:12:13 +00:00
Alasdair Smith
77dc7adf1f
Revert "Move to sidebar template"
...
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
2017-12-04 14:53:18 +00:00
Paulo Reis
9fda8e62fa
Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers
2017-12-04 13:48:52 +00:00
Paulo Reis
fd852004fe
Refactor synctex controls z-index handling.
2017-12-04 12:25:40 +00:00
Alasdair Smith
ab78cea48d
Move to sidebar template
2017-12-04 12:24:21 +00:00
Alasdair Smith
1fd518ec58
Add query param to mark as explicitly using V1 dash
2017-12-04 12:22:27 +00:00
Alasdair Smith
65b7b242d9
Merge remote-tracking branch 'origin' into as-v1-dash-link
2017-12-04 12:02:41 +00:00
Alasdair Smith
a25464d925
Add check for OL host
2017-12-04 11:34:00 +00:00
Alasdair Smith
f595009911
Switch to existing v1 dash flag
2017-12-04 11:23:09 +00:00
James Allen
eb5ba2814e
Merge branch 'master' into as-import-v1
2017-12-04 10:41:07 +00:00
James Allen
d3b4567a5c
Merge branch 'master' into as-v1-dash-link
2017-12-04 10:40:49 +00:00
James Allen
9e0f5424d0
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:40:28 +00:00
James Allen
c09bf0a04d
Merge branch 'master' into pr-fix-link-rewriting
2017-12-04 10:17:15 +00:00
James Allen
5da7d170a1
Merge branch 'master' into pr-ol-beta-editor-styling
2017-12-04 10:17:00 +00:00
James Allen
e03dcd3bae
Merge branch 'master' into pr-style-v2-resizers
2017-12-04 10:15:43 +00:00
James Allen
52b414498c
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:03:38 +00:00
James Allen
0b0fd576eb
Merge branch 'master' into as-v1-dash-link
2017-12-04 10:02:42 +00:00
James Allen
0602fed6e5
Merge branch 'master' into as-import-v1
2017-12-04 10:02:21 +00:00
James Allen
158b0d56cf
Merge branch 'master' into pr-style-v2-resizers
2017-12-04 10:01:45 +00:00
James Allen
f21870aac2
Merge branch 'master' into pr-ol-beta-editor-styling
2017-12-04 10:01:27 +00:00
James Allen
849861073d
Merge branch 'master' into pr-fix-link-rewriting
2017-12-04 10:01:08 +00:00
Hayden Faulds
4094801f18
pass object to DocumentUpdater.updateProjectStructure instead of separate arrays
2017-12-04 09:42:10 +00:00
Hayden Faulds
1405b645f3
fix acceptance tests after rebase
2017-12-04 09:42:10 +00:00
Hayden Faulds
19643f4bb5
pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger
2017-12-04 09:42:10 +00:00
Hayden Faulds
497c6facd5
fix ProjectEntityHandler.replaceFile
2017-12-04 09:42:10 +00:00
Hayden Faulds
77eac423c7
add tpds project structure acceptance tests
2017-12-04 09:42:09 +00:00
Hayden Faulds
9736513f59
fix ProjectEntityHandler.replaceFile
2017-12-04 09:42:09 +00:00
Hayden Faulds
3466db0aae
add acceptance tests
2017-12-04 09:42:09 +00:00
