Paulo Reis
d1467784bb
Avoid showing a comma when the user only has department info.
2018-06-27 14:21:03 +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
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
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
Paulo Reis
a1da24a86d
Styling adjustments.
2018-06-22 16:07:54 +01:00
James Allen
c004cdb200
Remove hardcoded ShareLaTeX reference in upgrade blurb
2018-06-22 14:24:41 +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
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
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
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
Paulo Reis
3ddb8d0bef
Add affiliations UI.
2018-06-15 11:33:47 +01: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
