7302 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Paulo Reis	02701a996d	Merge branch 'master' into pr-history-labels-part-2	2018-08-16 11:56:36 +01:00
Paulo Reis	652be9efe6	Slightly adapt the markup for the generic history error.	2018-08-16 11:41:19 +01:00
Henry Oswald	5ed95694da	Merge pull request #801 from sharelatex/ho-mailchimp ... Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.	2018-08-16 11:40:39 +01:00
Paulo Reis	23bb866988	Show an error message when history fails to load updates.	2018-08-16 11:26:34 +01:00
Henry Oswald	1e1f26b350	Merge pull request #818 from sharelatex/ho-backendgroup-config ... configure backend group name via config files	2018-08-16 10:37:14 +01:00
Henry Oswald	af6e7758d3	configure backend group name via config files	2018-08-15 15:26:22 +01:00
Jessica Lawshe	42426c8fb8	Merge pull request #811 from sharelatex/jel-portals-analytics ... Add analytics option to link mixins	2018-08-14 12:08:14 -05:00
Jessica Lawshe	2c9977d26e	Add analytics to link mixins	2018-08-14 12:06:28 -05:00
Jessica Lawshe	cf532b93d8	Merge pull request #784 from sharelatex/jel-portals ... Add styling and mixins for portals	2018-08-14 12:00:36 -05:00
Timothée Alby	5e488dcab7	Merge pull request #813 from sharelatex/ta-enable-affiliations-ui ... Enable Affiliations UI	2018-08-14 16:40:35 +02:00
Paulo Reis	6b31268bfa	Scroll to selected history update when coming back from the labels view.	2018-08-14 15:27:07 +01:00
Brian Gough	791d395655	Merge pull request #812 from sharelatex/bg-allow-changing-texlive-image ... allow changing texlive image (connects to overleaf/sharelatex#756)	2018-08-14 15:00:08 +01:00
Paulo Reis	663ca275cb	Add i18n.	2018-08-13 17:09:18 +01:00
Timothée Alby	918f067ec0	Merge pull request #815 from sharelatex/ta-script-start ... require minilist package	2018-08-13 17:26:27 +02:00
Tim Alby	4a65a526ce	require minilist package	2018-08-13 17:03:48 +02:00
Tim Alby	bfb2f636cd	enable affiliations UI	2018-08-13 14:59:39 +02:00
Paulo Reis	2ee42af1de	Change strategy to store selected label; improve the history toolbar layout to accomodate larger labels; fix issues with layout not being updated when changing history view modes.	2018-08-13 13:39:25 +01:00
Brian Gough	c2828c8ca5	add unit tests	2018-08-13 10:53:43 +01:00
Brian Gough	19dfe5fc8b	intial version of user setting for texlive imageName	2018-08-13 10:53:43 +01:00
Alasdair Smith	d7a341f59b	Merge pull request #808 from sharelatex/ta-import-affiliations ... Allow confirmed_at date to be specified	2018-08-13 09:47:10 +01:00
Alasdair Smith	8f4fe5ec67	Merge pull request #805 from sharelatex/ns-autocomplete-w-escaped-percent ... autocomplete escaped % issue	2018-08-13 09:46:38 +01:00
Alasdair Smith	4e484912bb	Merge pull request #804 from sharelatex/as-update-project-import-modal ... Update copy in v1 import modal now that more features are supported	2018-08-13 09:46:18 +01:00
Alasdair Smith	5a0853d894	Merge pull request #807 from sharelatex/ta-affiliations-segmentation ... Create InstitutionsGetter	2018-08-13 09:45:50 +01:00
James Allen	0f8fe53bc9	Allow confirmed_at date to be specified	2018-08-10 17:48:43 +02:00
Paulo Reis	a5c6f81573	Merge branch 'master' into pr-history-labels-part-2	2018-08-10 15:57:32 +01:00
Paulo Reis	035ff0a1f0	More bugfixing.	2018-08-10 15:57:10 +01:00
Paulo Reis	c13e0264e5	Fix a few bugs related to keeping the selection when moving from labels to full history.	2018-08-10 14:07:35 +01:00
Tim Alby	197e7ce8ab	refactor institutions getter	2018-08-10 13:40:25 +02:00
Paulo Reis	7e86218b21	Allow multiple events to trigger layout external resizes.	2018-08-10 11:28:17 +01:00
Nate Stemen	e80b52509b	fix silly paren issue for index var	2018-08-09 08:53:49 -04:00
Alasdair Smith	7830a5f69d	Update copy in v1 import modal now that more features are supported	2018-08-09 13:21:11 +01:00
Paulo Jorge Reis	e760d97cf3	Merge pull request #803 from sharelatex/pr-history-labels-bugfixing ... Pr history labels bugfixing	2018-08-09 12:27:02 +01:00
Paulo Reis	64a66aafd5	Protect against reading the project members list too soon.	2018-08-09 12:16:36 +01:00
Paulo Reis	4f4ab57958	Use controller binding in the label tooltip.	2018-08-09 12:05:00 +01:00
Paulo Reis	d6ab993519	Dont hide history entries while loading.	2018-08-09 12:00:53 +01:00
Paulo Reis	d59fe61a83	Handle sorting of labels; keep selection between view changes.	2018-08-09 11:03:00 +01:00
James Allen	69e8eddff0	Merge pull request #796 from sharelatex/pr-history-labels-ui ... History labels UI	2018-08-09 10:50:28 +01:00
James Allen	3546e842b0	Merge pull request #787 from sharelatex/ns-autocomplete-w-escaped-percent ... still trigger autocomplete if % is escaped	2018-08-09 10:50:17 +01:00
Hugh O'Brien	0af23718ba	Merge pull request #749 from sharelatex/hb-activate-submit-modal ... Activate publish modal	2018-08-09 09:44:41 +01:00
James Allen	9cbb51bbbc	Merge pull request #793 from sharelatex/sk-sl-login-v2 ... If we're creating v1 accounts, don't allow login for users already linked up	2018-08-08 15:51:25 +01:00
Henry Oswald	df161d3ece	change newsletter log to info on process boot	2018-08-08 14:32:36 +01:00
Henry Oswald	c68366155e	remove sanitize = require('sanitizer') not used anywhere	2018-08-08 14:14:56 +01:00
Henry Oswald	687637eec7	change email address in newsletter when changing default email ... put mongo_id into mailchimp merge fields	2018-08-08 13:50:03 +01:00
Paulo Reis	f2b957e5b3	Add history labels view.	2018-08-08 13:46:43 +01:00
Paulo Reis	cd853abb3c	Load labels list from the backend.	2018-08-08 11:02:14 +01:00
Paulo Reis	7e8e2a89ae	Create history labels list component.	2018-08-08 11:01:51 +01:00
Paulo Reis	9a27a39f55	Make tooltip optional in the label component.	2018-08-08 11:01:20 +01:00
Henry Oswald	6208e9f2d0	add changeEmail function to newsletter manager ... not actually called	2018-08-07 21:38:31 +01:00
Henry Oswald	88f2b3670b	remove unneed style	2018-08-07 16:50:52 +01:00
Nate Stemen	c26a85c02c	get rid of confusing regex	2018-08-07 09:53:38 -04:00