Commit Graph

1935 Commits

Author SHA1 Message Date
Shane Kilkelly 67dcbff450 Remove linked-files items from the left-menu test controls 2018-06-22 13:09:18 +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 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
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
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 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
Jessica Lawshe fe225fbbd3 Include event label when features table viewed 2018-06-15 16:29:42 -05:00
James Allen eda031023c Update subscription thank you page to remove ShareLaTeX references 2018-06-14 10:15:20 +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
Shane Kilkelly 3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
James Allen a417dc8ff4 v1Subscription -> v1Subscriptions 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 ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01: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 c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +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
Alberto Fernández Capel 6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +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
Jessica Lawshe 679d91c4d2 Update default plans view conditional
Fixes a flash of unwanted content on Firefox
2018-06-05 12:58:18 -05: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
Paulo Reis bfad95ae61 File restore button needs to be smaller to fit the new toolbar height. 2018-06-05 13:59:27 +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 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 64ead238e4 Add meta tags 2018-06-04 09:51:35 -05: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 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 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