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

3553 commits

Author SHA1 Message Date
Nate Stemen
2dcd2339ed still trigger autocomplete if % is escaped 2018-07-26 15:03:55 -04:00
hugh-obrien
4a22129aa0 add missing v1 metrics styling for graphs and updates 2018-07-26 17:01:47 +01:00
hugh-obrien
96a49a7fe6 cleaning up date range picker icons and buttons 2018-07-26 17:01:47 +01:00
Jessica Lawshe
d990ae1a1a Style for portals 2018-07-26 10:35:41 -05:00
James Allen
7dc82597e1 Merge pull request #765 from sharelatex/ja-update-email-in-v1 
Update email in v1 when setting as default in v2
 2018-07-26 10:58:57 +01:00
James Allen
de6a790f3d Merge pull request #780 from sharelatex/ns-autocompile-w-syntax-error 
dont stop compiling if user has turned off syntax validation
 2018-07-24 10:06:03 +01:00
Alasdair Smith
9af906b7dc Copy across some mathjax config from v1, seems to fix artefacts in rendering 2018-07-23 17:11:55 +01:00
Nate Stemen
8d83da2535 add check to make sure user hasnt turned of syntax validation before stopping autocompile 2018-07-23 12:07:05 -04:00
Alasdair Smith
db518e16aa Don't set config unless needed in directive 
Updates mathjax directive to only set config if it is needed. The main
config is now set in base.coffee so isn't needed
 2018-07-23 15:32:17 +01:00
Alasdair Smith
99e24db075 Move MathJax config to base so it is always run 
This prevents an issue where using MathJax would not be configured
correctly unless using the mathjax directive.
 2018-07-23 15:30:58 +01:00
Hugh O'Brien
37a7d24d77 Merge pull request #773 from sharelatex/hb-submit-button-wrap 
Fixing button wrapping in the publish modal
 2018-07-19 11:40:07 +01:00
hugh-obrien
ef0532a54b replace wrapping button with new class name 2018-07-18 10:47:39 +01:00
hugh-obrien
00bf50906d fixing button wrapping in the publish modal 2018-07-18 09:54:52 +01:00
Alasdair Smith
85313f1b5a Check if rich text is enabled before using stored mode 2018-07-18 09:26:03 +01:00
Alasdair Smith
fff8e37bc7 Merge pull request #772 from sharelatex/as-fix-review-panel-style 
Fix rich text toolbar throwing off track changes underlines
 2018-07-18 08:43:11 +01:00
Alasdair Smith
1e7911adaf Merge pull request #767 from sharelatex/as-fix-rt-delete-itemize 
Fix left padding on empty nested list environments
 2018-07-18 08:43:01 +01:00
Alasdair Smith
fba0cd04f5 Fix TC underlines being offset because review panel above editor toolbar 2018-07-17 17:34:09 +01:00
Jessica Lawshe
b9a63fe216 Merge pull request #768 from sharelatex/jel-mathjax-wiki 
Add MathJax to wiki pages and max-width for images
 2018-07-17 09:37:28 -05:00
Jessica Lawshe
fa2f703c44 Define CMS module controller 2018-07-17 09:36:21 -05:00
Jessica Lawshe
6c9403df0f Merge pull request #758 from sharelatex/jel-mathjax-delimiter 
Optional $ MathJax delimiter
 2018-07-17 09:32:43 -05:00
Jessica Lawshe
64a257dae2 Merge pull request #708 from sharelatex/jel-mathjax 
MathJax - library path, directive, and use `Safe` extension
 2018-07-17 09:32:06 -05:00
Jessica Lawshe
83b3904fca Set max-width on Wiki images 
Fixes images expanding outside of parent container
 2018-07-17 09:10:03 -05:00
Jessica Lawshe
ddca090cd7 Add Wiki controller with MathJax directive 2018-07-17 09:09:07 -05:00
Alasdair Smith
8f4c5d6122 Fix left padding on empty nested list environments 2018-07-17 11:53:42 +01:00
James Allen
4435eab423 Update affiliations UI to show specific errors for conflicting emails 2018-07-17 11:12:47 +01:00
Alasdair Smith
ea2a229050 Add line padding to indented padding 
Fixes bug where itemize and enumerate envs weren't correctly indented
 2018-07-16 11:28:53 +01:00
Alberto Fernández-Capel
f08b64eeac Merge pull request #757 from sharelatex/as-rt-styling 
Rich text styling
 2018-07-16 10:10:49 +01:00
James Allen
b150a7b4ae Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments 
Affiliations UI, second round
 2018-07-16 10:08:47 +01:00
Jessica Lawshe
120acf4918 Optional $ MathJax delimiter 2018-07-13 15:02:52 -05:00
Alasdair Smith
5013d13587 Reduce box-shadow slightly to look better with horizontal padding 2018-07-13 16:30:42 +01:00
Alasdair Smith
304eac3024 Deemphasise line numbers in rich text 2018-07-13 15:57:43 +01:00
Alasdair Smith
4d611ca399 Add horizontal padding to RT lines 
This is to emulate a manusript better
 2018-07-13 15:57:18 +01:00
Alasdair Smith
f95fb38056 Switch to serif font for rich text 
Makes rich text ressemble a manuscript more closely
 2018-07-13 15:13:22 +01:00
James Allen
a238c74440 Remove inline style 2018-07-13 11:19:49 +01:00
Alasdair Smith
5eb2410f5d Add event to trigger syncToPdf so can be triggered by key bind 2018-07-13 09:18:28 +01:00
James Allen
d7e0b8c369 Show unconfirmed email status in UI and add link to resend confirmation 2018-07-12 17:13:26 +01:00
Paulo Reis
67e2f6f942 Better handling of affiliation change submission. 2018-07-12 16:37:09 +01:00
Paulo Reis
59008b4a51 Show university custom departments when changing affiliations; fix Features typo. 2018-07-12 16:37:09 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
c817094a2d Add i18n keys; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
4d1b6c6ba8 Add error handling. 2018-07-12 16:37:09 +01:00
Paulo Reis
c630c5d952 Preemptively remove front-end data when removing user emails. 2018-07-12 16:37:09 +01:00
Paulo Reis
19b57571bf Basic affiliation change implementation. 2018-07-12 16:37:08 +01:00
Paulo Reis
a64910d409 Make sure to specify which email to set as default. 2018-07-12 16:37:08 +01:00
Paulo Reis
1514e5e071 Isolate affiliations form in a component. 2018-07-12 16:37:08 +01:00
Paulo Reis
3517db8348 SL styling adjustments. 2018-07-12 16:37:08 +01:00
Alasdair Smith
2100633ea1 Merge pull request #748 from sharelatex/as-rt-review-panel-warning 
Show warning in review panel when using rich text mode
 2018-07-12 11:30:29 +01:00
Alasdair Smith
d33c7f0149 Use string key to initialise editor mode instead of boolean 2018-07-12 10:55:27 +01:00
Alasdair Smith
25b995d3b8 Initialise editor mode from localStorage 2018-07-12 10:55:27 +01:00
Alasdair Smith
3806d2bda7 Add right margin to toolbar if review panel open 
This fixes bug where the toolbar would be measured incorrectly if the
review panel was open
 2018-07-11 15:15:23 +01:00
Alasdair Smith
b1a47ddae4 Improve copy 2018-07-11 15:15:22 +01:00
Alasdair Smith
b4dd047371 Fix unnecessary right marging being applied to review panel when rich text is open 2018-07-11 15:15:22 +01:00
Alasdair Smith
538aba323a Add first pass at unsupported message and style 2018-07-11 15:15:22 +01:00
Alasdair Smith
00c089448e Add review panel unsupported message 2018-07-11 15:15:22 +01:00
Alasdair Smith
9d81cf20f9 Add new unsupported class to control visibility while rich text is open 2018-07-11 15:15:22 +01:00
Timothée Alby
05bc4cc9e9 Merge pull request #729 from sharelatex/as-cursor-position 
Abstract cursor position tracking so that it is not bound to Ace
 2018-07-11 10:21:42 +02:00
Alasdair Smith
5806101bd0 Trigger events instead of calling cursor manager 
This improves readability and prevents race conditions in compat
between Ace/CM
 2018-07-10 16:05:01 +01:00
Alasdair Smith
da77c06774 Refactor saving cursor position to not use Ace event 
This is will help with triggering CM correctly
 2018-07-10 16:05:01 +01:00
Alasdair Smith
ba9fa9a0be Store first visible line instead of scrollTop 
scrollTop is affected by changing viewport size and switching between
Ace and CM
 2018-07-10 16:05:01 +01:00
Alasdair Smith
6c7e942470 Unbind unload listener when destroying editor 2018-07-10 16:05:01 +01:00
Alasdair Smith
e5ad2a8724 Abstract Ace-specific code to adapter 2018-07-10 16:05:01 +01:00
Paulo Reis
418d7d515a Add light theme root file; add light theme variables file. 2018-07-10 13:14:58 +01:00
Alasdair Smith
2dc509f43d Fix memory leak setting up spell check 
Switching docs would set up event listeners on Ace without tearing down
any old listeners, which could lead to a memory leak. This tears down
old listeners when detaching from the "old" doc
 2018-07-10 12:25:13 +01:00
Paulo Reis
2ef1b4904d Bootstrap the light theme. 2018-07-09 15:45:09 +01:00
Hayden Faulds
158cb58e29 Merge pull request #734 from sharelatex/sk-handle-403-linked-files 
When refreshing or creating linked files, exempt from 403-error-catcher
 2018-07-06 15:09:28 +01:00
Shane Kilkelly
b6880550d5 When refreshing or creating linked files, exempt from 403-error-catcher 2018-07-06 11:29:21 +01:00
James Allen
dad4bad9eb Merge pull request #700 from sharelatex/ew-fix-undefined-last-name 
fix undefined last name
 2018-07-06 11:06:12 +01:00
Hugh O'Brien
3a33fef42c Merge pull request #722 from sharelatex/hb-publish-layout-updates 
Add border-radius to overbox on submit modal
 2018-07-05 12:12:15 +01:00
Alasdair Smith
b2abcfc3f2 Extract debounced load to service, so can be injected 2018-07-04 15:14:29 +01:00
Alasdair Smith
1f9c1ca6c6 Extracts envs to separate file so they can be exported to rich text 2018-07-04 15:14:29 +01:00
Alasdair Smith
33742d447d Move top hundred snippets to snippets directory 
Allows for more snippets in future. Also makes file name consistent
 2018-07-04 15:14:29 +01:00
Alasdair Smith
88dd233624 Add stylesheet for CodeMirror autocomplete 2018-07-04 15:14:29 +01:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Alberto Fernández-Capel
e22d2c8da7 Merge pull request #721 from sharelatex/as-rt-search 
Add CodeMirror search styles
 2018-07-03 13:39:47 +01:00
Alberto Fernández-Capel
a1c49b0cf9 Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects 
Add a warning message when there are no other projects to choose.
 2018-07-03 13:38:33 +01:00
Alasdair Smith
1db937cd50 Merge pull request #714 from sharelatex/as-line-nos 
Add rich text line numbers
 2018-07-03 11:11:17 +01:00
hugh-obrien
a39bcdb0f0 add border-radius to overbox on submit modal 2018-07-02 17:30:17 +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
673e9155ba Add CodeMirror search styles 2018-06-29 15:33:50 +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
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
Paulo Reis
82392978a7 Improve input suggestions template readability. 2018-06-27 13:47:49 +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
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
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
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
Shane Kilkelly
b3d17fc753 Add a warning message when there are no other projects to choose. 2018-06-25 11:48:05 +01: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
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
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
9194e25742 Set font colour at entire side bar level 2018-06-22 14:23:43 +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
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
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
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
Paulo Reis
62ab9dbb98 Rearrange layout to have the new affiliation form within the affiliations table. 2018-06-21 17:18:01 +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
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
Paulo Reis
147d74d92a Integrate e-mails table with backend. 2018-06-20 14:22:06 +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
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
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
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
Nate Stemen
9f309e22a7 refactor AutoCompleteManager 2018-06-18 12:26:45 -04: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
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
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
James Allen
32e14527c6 Make links readable in v2 alerts 2018-06-14 10:31:06 +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
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +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
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
Henry Oswald
75c9489c06 PDF Downloads work, not tested on large pdf's yet 2018-06-08 17:17:00 +01: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
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
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01: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
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
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
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
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
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
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
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 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
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
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
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +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
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +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
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +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
2d1bcda9ff Style action buttons, and hide on smaller screens 2018-05-31 09:58:39 +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
Paulo Reis
7cb4280a4d Remove commented-out code. 2018-05-30 15:18:15 +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
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +01:00