5060 commits

Author	SHA1	Message	Date
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
Paulo Reis	0484b46027	Redundancy.	2017-12-21 13:52:34 +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
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	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	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	0a0c6c6c0c	Merge branch 'master' into pr-style-v2-chatpane	2017-12-20 09:50:49 +00:00
James Allen	339b7ec14f	Merge branch 'ja-allow-importing-without-history'	2017-12-19 15:06:17 +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	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	8311101ec0	Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps	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	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
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	cb83e2c1b2	Tone down chat colors.	2017-12-19 10:52:23 +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	dc2ddf7e09	Check for OL free trial instead of host as it may be fragile indicator	2017-12-18 16:53:58 +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	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	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	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
Henry Oswald	bf276b0814	ripped file fingerprinting out	2017-12-14 12:11:13 +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
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
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	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
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
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	0652fc62a0	Configure resizer cursors for v2.	2017-12-11 15:33:00 +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	bd7e2d956d	add mandrill as email option	2017-12-11 11:05:04 +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
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
Shane Kilkelly	a1f1c25294	Merge branch 'master' into sk-account-sync	2017-12-07 11:51:41 +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
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
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	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
Hayden Faulds	4094801f18	pass object to DocumentUpdater.updateProjectStructure instead of separate arrays	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	9736513f59	fix ProjectEntityHandler.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	61a1336ec6	pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	feee582368	pass user_id into EditorController.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	08891c7a7f	pass userId into ProjectEntityHandler.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	088ce33cbc	version ProjectEntityHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	60ee78704a	return url from FileStoreHandler.copyFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	4ec0d07aae	remove unused ProjectEntityHandler.copyFileFromExistingProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	90e3b71c1c	version replacing files	2017-12-04 09:42:09 +00:00
Hayden Faulds	980e43e478	pass user_id into EditorController.addDoc	2017-12-04 09:42:09 +00:00
Hayden Faulds	e4ca3bc5ad	pass user_id into EditorController.addDocWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	7d63939f79	pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator	2017-12-04 09:42:09 +00:00
Hayden Faulds	300f76bc5c	pass user_id into ProjectEntityHandler.addDoc / addDocWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	bfd22899a0	fix DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Hayden Faulds	62f88402e8	fix DocumentUpdaterHandler casing	2017-12-04 09:42:09 +00:00
Hayden Faulds	acda4c2295	remove inline requires from ProjectEntityHandler	2017-12-04 09:42:09 +00:00
Hayden Faulds	ef68c6a531	avoid N+1 lookups in DocumentUpdaterHandler	2017-12-04 09:42:09 +00:00
Hayden Faulds	953dba0ede	pass userId into Editorcontroller.addFile / addFileWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	42a1deaaca	pass userId into ProjectEntityHandler.addFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	c1481d596f	call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile ... pass in user_id as null	2017-12-04 09:42:09 +00:00
Hayden Faulds	6e84c635cf	return url from FileStoreHandler.uploadFileFromDisk	2017-12-04 09:42:09 +00:00
Hayden Faulds	0178f78249	handle file additions in DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Henry Oswald	aaa908187d	added layout.pug back in	2017-12-02 13:38:23 +00:00
Henry Oswald	c020e4e6bd	moment and fineuploader are loaded seperately in editor, not packaged up	2017-12-02 12:29:06 +00:00
Alasdair Smith	7f622e2e6b	Conditionally show V1 dash link	2017-12-01 17:14:53 +00:00
Alasdair Smith	9a073cdaf0	Add link to V1 dash	2017-12-01 16:58:19 +00:00
Shane Kilkelly	3ee6f5d4be	Update fineuploader on project page	2017-12-01 11:27:06 +00:00
Shane Kilkelly	2ea3caf08b	Properly version the fineuploader library	2017-12-01 11:22:41 +00:00
Alasdair Smith	5b8c9b2f4c	Add aria role to warning	2017-12-01 11:00:13 +00:00
Alasdair Smith	7d58427485	Show warnings on project list for some V1 data	2017-11-30 16:59:13 +00:00
Paulo Reis	3a959cccfd	Use custom chat resizer values.	2017-11-30 15:24:48 +00:00
Paulo Reis	024741ac51	Correct chat resizer values.	2017-11-30 15:24:10 +00:00
Alasdair Smith	52ad852814	Add check for OL host to prevent failure on legacy SL	2017-11-30 15:14:47 +00:00
Paulo Reis	e38c0de6b9	Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers	2017-11-30 15:13:00 +00:00
Paulo Reis	71604ebd5c	Create uiConfig Pug local; render it in the HTML.	2017-11-30 15:12:36 +00:00
Alasdair Smith	f232899f3f	Show warning symbol on second step	2017-11-30 10:16:15 +00:00
Alasdair Smith	6eae1d59ea	Use asyncForm directive to trigger import	2017-11-30 10:16:15 +00:00
Alasdair Smith	3aaf6559c8	Add image of v2 editor	2017-11-30 10:16:15 +00:00
Alasdair Smith	265e659999	Add multiple steps	2017-11-30 10:16:15 +00:00
Alasdair Smith	b68d6411ee	Basic styles for import modal	2017-11-30 10:16:15 +00:00
Alasdair Smith	0e11668a61	Change v1 project link to button which opens import modal	2017-11-30 10:16:15 +00:00
Alasdair Smith	cbba7c38df	Add basic v1 import modal template & controller	2017-11-30 10:16:15 +00:00
Alasdair Smith	dba0ab003c	Merge pull request #166 from sharelatex/as-autocompile-rollout-20 ... Increase autocompile rollout to 20%	2017-11-30 10:08:55 +00:00
Shane Kilkelly	c203a8d80a	Merge branch 'sk-use-recurly-hosted-details-page'	2017-11-29 09:45:54 +00:00
Shane Kilkelly	8b5115ff03	Merge branch 'sk-update-fineuploader'	2017-11-29 09:41:14 +00:00
Nate Stemen	2a50a18d23	Merge branch 'ns-package-aware-autocomplete'	2017-11-28 10:24:37 -05:00
Shane Kilkelly	cc9986cefd	Remove the obsolete update-billing-details page	2017-11-28 11:52:14 +00:00
Shane Kilkelly	22c163c60a	Move the recurly-billing-details link up to main subscription page	2017-11-28 11:40:48 +00:00
Alasdair Smith	bbaacb4db4	Increase autocompile rollout to 20%	2017-11-28 10:52:46 +00:00
Henry Oswald	7ce56aa3b6	add http catch onto form	2017-11-28 10:13:54 +00:00
Alasdair Smith	c5f459a531	Merge pull request #159 from sharelatex/as-show-v1-owner ... Show v1 project owner's name in project list	2017-11-28 09:51:04 +00:00
Henry Oswald	b16862fa31	add error handling for form	2017-11-27 18:03:42 +00:00
Shane Kilkelly	f7c8930b90	Convert html to pug for uploader templates	2017-11-27 13:56:49 +00:00
Henry Oswald	7eb2f0d917	move generic sales modal to use new support endpoint	2017-11-27 12:49:12 +00:00
Shane Kilkelly	661041a35d	Use template elements for file uploaders, and i18n	2017-11-27 12:06:18 +00:00
Paulo Reis	926fd69bb5	Use resizer icons in Overleaf, to switch the PDF layout.	2017-11-24 15:53:49 +00:00
Paulo Reis	f4f2fa4e19	Use Overleaf logo as the main menu icon.	2017-11-24 15:33:48 +00:00
Alasdair Smith	099305d909	Show v1 project owner name	2017-11-23 17:10:42 +00:00
Paulo Reis	2464bec280	Style the recompile button; use flexbox for the toolbar.	2017-11-23 16:42:38 +00:00
Shane Kilkelly	c121653dc4	Add error-handling to attempt to get user subscription	2017-11-23 16:22:57 +00:00
Shane Kilkelly	caa65dddc1	Send user to hosted recurly billing-details page. ... And remove our update-billing-details form, the APIs for which will be deprecated soon.	2017-11-23 16:16:13 +00:00
Brian Gough	bb2d1321d4	Merge pull request #91 from sharelatex/bg-add-project-history-flag ... route history requests based on project	2017-11-23 15:36:45 +00:00
Paulo Reis	f55ffff960	Refactor toolbar variants as mixins.	2017-11-23 15:21:06 +00:00
Brian Gough	98fe352a8c	use a separate flag for reading from history ... the overleaf.history object controls writing to the project history service, we need a separate flag to determine whether to read from it or from track changes.	2017-11-23 15:14:33 +00:00
Shane Kilkelly	10fc89c8cf	Merge pull request #142 from sharelatex/sk-fix-token-indexes ... use correct partial indexes on project token fields	2017-11-23 10:30:31 +00:00
Alasdair Smith	e1fa196de5	Merge pull request #153 from sharelatex/as-remove-old-onboarding ... Remove unused onboarding	2017-11-23 10:28:50 +00:00
Alasdair Smith	14d8d7bde3	Merge pull request #151 from sharelatex/as-v1-badge-tooltip ... Add tooltips for V1 badges	2017-11-23 10:21:37 +00:00
Alasdair Smith	e61b82c452	Remove unused link sharing rollout, but keep onboarding popup	2017-11-22 17:07:50 +00:00
Shane Kilkelly	57d0bab354	Remove commented out code, and un-used button	2017-11-22 17:00:30 +00:00
Shane Kilkelly	91e2e45029	Remove unused attributes	2017-11-22 16:49:27 +00:00
Alasdair Smith	6f8b0c6e87	Revert "Remove old unused link sharing onboarding" ... This reverts commit 66a0a7ff8b5b5081d86df333429cb0455221c81a.	2017-11-22 16:46:16 +00:00
Alasdair Smith	dde4428189	Remove unused track changes modal template	2017-11-22 16:26:10 +00:00
Alasdair Smith	de3b9d6a49	Remove old unused link sharing onboarding	2017-11-22 16:09:32 +00:00
Shane Kilkelly	fee1fc3d1f	Fix visuals of file uploader	2017-11-22 15:52:02 +00:00
Alasdair Smith	f85880ba38	Remove old unused track changes notice	2017-11-22 15:03:46 +00:00
Alasdair Smith	8f32f0d65f	Remove old unused track changes onboarding	2017-11-22 14:48:22 +00:00
Shane Kilkelly	035e0c1213	Add autoIndex: false option to mongoose connections. ... This prevents mongoose from auto-creating missing indexes on boot.	2017-11-22 13:37:57 +00:00
Alasdair Smith	b1c8e7a95a	Improve wording slightly	2017-11-22 12:19:32 +00:00
James Allen	fae2d7dbdd	Merge pull request #138 from sharelatex/ja-disable-github ... Add feature flag for github sync	2017-11-22 11:46:50 +00:00
James Allen	310aa1d49d	Merge branch 'master' into ja-turn-off-registration	2017-11-22 11:45:28 +00:00
James Allen	d3f146499c	Merge pull request #135 from sharelatex/ja-disable-account-settings-for-ol-v2 ... Enable the external auth switches when OL OAuth is in use	2017-11-22 11:44:10 +00:00
Alasdair Smith	0d4059764a	Add tooltips for V1 badges with dummy copy	2017-11-22 11:37:29 +00:00
Alasdair Smith	ba04875ddc	Increase autocompile rollout to 10%	2017-11-22 10:54:46 +00:00
James Allen	5bb06915cc	Rename setting and use Features.hasFeatures	2017-11-22 10:45:31 +00:00
James Allen	dd619f44dd	Add in setting to control whether the site has a homepage	2017-11-22 10:45:31 +00:00
James Allen	7440d8da58	Change to an 'enableGithubSync' setting	2017-11-22 10:44:57 +00:00
Shane Kilkelly	c11ea59dc1	Increase link-sharing rollout to 100%	2017-11-22 09:50:08 +00:00
Shane Kilkelly	1ddfd948d6	Update the file-upload library	2017-11-21 16:21:58 +00:00
Shane Kilkelly	bda65c0984	use correct partial indexes on project token fields	2017-11-21 10:33:02 +00:00
Alasdair Smith	5bb46a930a	Check presence of overleaf settings	2017-11-20 15:55:00 +00:00
Shane Kilkelly	81887dd4f5	wip: upgrade fineuploader	2017-11-20 14:43:13 +00:00
James Allen	4f905af078	Add feature flag for github sync	2017-11-20 11:48:06 +00:00
James Allen	a97c3ba580	Add missed Features.coffee	2017-11-20 11:43:02 +00:00
Alasdair Smith	f3583b1702	Show warning message if V1 connection fails	2017-11-20 11:23:02 +00:00
Alasdair Smith	24ceaffd3a	Rename hook for clarity	2017-11-20 11:23:02 +00:00
Alasdair Smith	119be26989	Remove unnecessary project getter ... Had bad assumption about whether ol-integration module would be available in filesystem, now replaced with Module hook	2017-11-20 11:23:02 +00:00
Alasdair Smith	621977c47c	Replace call to V1ProjectGetter with Module hook	2017-11-20 11:23:02 +00:00
Alasdair Smith	d9c19ccdc4	Fix V1 tags not showing badge correctly	2017-11-20 11:23:02 +00:00
Alasdair Smith	d5cfd34bb7	Log something useful	2017-11-20 11:23:02 +00:00
Alasdair Smith	e32406a4c4	Dynamically monkey patch impl to check integration once instead of each request	2017-11-20 11:23:02 +00:00
Alasdair Smith	3bc48a7a05	Switch to date builtin instead of moment	2017-11-20 11:23:02 +00:00
Alasdair Smith	4b2e22c257	Remove duplicate dependency	2017-11-20 11:23:02 +00:00
Alasdair Smith	4b25525e9d	Add aria labels to V1 badges	2017-11-20 11:23:02 +00:00
Alasdair Smith	08fd092f7c	Rename v1 list item template for consistency	2017-11-20 11:23:02 +00:00
Alasdair Smith	9bf74f29bd	Improve naming	2017-11-20 11:23:02 +00:00
Alasdair Smith	0724482808	Don't use brand prefix setting to mark v1	2017-11-20 11:23:02 +00:00
Alasdair Smith	8df31590a9	Switch V1 naming instead of OL	2017-11-20 11:23:02 +00:00
Alasdair Smith	8735261022	Extract V1 projects fetch to integration module ... OlProjectGetter now just detects if integration module is loaded and proxies to integration module. If module not loaded, it just bails	2017-11-20 11:23:02 +00:00
Alasdair Smith	d43863d438	Add V1 badge to tags from V1	2017-11-20 11:23:02 +00:00
Alasdair Smith	35883b6b27	Extract V1 badge styles to file	2017-11-20 11:23:02 +00:00
Alasdair Smith	ec64d1fab9	Combine tags with v1 tags	2017-11-20 11:23:02 +00:00
Alasdair Smith	020e8ab8c4	Change wording to v1	2017-11-20 11:23:02 +00:00
Alasdair Smith	c1b3cc3a69	Add v1 filter	2017-11-20 11:23:02 +00:00
Alasdair Smith	5ee52408e5	Inject v1 flag into view model	2017-11-20 11:23:02 +00:00
Alasdair Smith	7910f2109f	Switch to V1 wording	2017-11-20 11:23:02 +00:00
Alasdair Smith	3f422dc48c	Clean up OL view model	2017-11-20 11:23:02 +00:00
Alasdair Smith	dfe17d63ba	Projects removed also treated as archived	2017-11-20 11:23:02 +00:00
Alasdair Smith	20c756ec9a	Switch to v1 wording	2017-11-20 11:23:02 +00:00
Alasdair Smith	3c8dd6c421	Link to OL project	2017-11-20 11:23:02 +00:00
Alasdair Smith	fc6da2e2e4	Parse & display OL project last updated	2017-11-20 11:23:02 +00:00
Alasdair Smith	fe90ef047f	Temp OL label	2017-11-20 11:23:02 +00:00
Alasdair Smith	532a26c68f	Extract out project list item to template and add OL-specific template	2017-11-20 11:23:02 +00:00
Alasdair Smith	d072fabb25	Fix non-beta throwing error because it's expecting OL projects	2017-11-20 11:23:02 +00:00
Alasdair Smith	8c66342a04	Pull in OL projects and process for view	2017-11-20 11:23:02 +00:00
Alasdair Smith	fa0559f8d7	Fetch OL projects using OAuth	2017-11-20 11:23:02 +00:00
Alasdair Smith	f6bbf7fe3f	wip	2017-11-20 11:23:02 +00:00
James Allen	745ae8d081	Add in Features module to handle feature flags, and use it to cleanly turn off registration	2017-11-20 10:47:32 +00:00
James Allen	311ebf89c4	Refactor to always use req.externalAuthenticationSystemUsed	2017-11-20 10:10:23 +00:00
James Allen	ca0982a909	Enable the external auth switches when OL OAuth in use	2017-11-17 17:16:12 +00:00
Alasdair Smith	b6289f03e3	Conditional check	2017-11-16 15:58:32 +00:00
Alasdair Smith	8cafda8419	Merge pull request #129 from sharelatex/as-allow-force-rollout ... Allow user to force themselves to be part of autocompile rollout	2017-11-16 15:49:28 +00:00
Alasdair Smith	b889a8bb4d	Allow user to force themselves to be part of autocompile rollout	2017-11-16 15:38:51 +00:00
Alasdair Smith	a5bb76b2be	Increase rollout to 5%	2017-11-16 10:36:35 +00:00
Shane Kilkelly	2a7e68e37b	Merge pull request #109 from sharelatex/sk-token-access-redirect-fix ... Set redirect when bouncing away from token route; Fixes overleaf/sharelatex#250	2017-11-15 14:56:42 +00:00
Nate Stemen	428ae3aa53	adding labels service back	2017-11-15 09:27:46 -05:00
Alasdair Smith	b1bae4aaae	Change to 3% rollout	2017-11-15 13:47:05 +00:00
Shane Kilkelly	5df4556e9c	Set redirect when bouncing away from token route ... This ensures that when the user logs in they will be redirected back to this token, the page they wanted to access in the first place.	2017-11-15 13:30:40 +00:00
Alasdair Smith	0d566f8c39	Increase autocompile rollout to 5%	2017-11-15 12:01:47 +00:00
Shane Kilkelly	a15cb64418	Increase link-sharing rollout to 40%	2017-11-15 10:25:17 +00:00
Shane Kilkelly	a0c7295b36	Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal	2017-11-13 10:45:29 +00:00
Shane Kilkelly	bc87bceb5f	Update the linksharing rollout to 10%	2017-11-13 10:27:27 +00:00
Hayden Faulds	d084b57d5a	Merge pull request #90 from sharelatex/hof-version-renames ... version entity renames/moves	2017-11-13 10:13:34 +00:00
Shane Kilkelly	aea8e77f8a	Merge branch 'as-fix-rollout-2'	2017-11-13 09:50:46 +00:00
Shane Kilkelly	8ba9073606	Merge branch 'sk-link-sharing-onboarding'	2017-11-13 09:31:44 +00:00
Shane Kilkelly	00f095da3c	Merge branch 'master' into sk-smarter-percentage-rollout	2017-11-10 16:00:02 +00:00
Shane Kilkelly	032400905d	Fix a silly assignment mistake	2017-11-10 15:59:11 +00:00
Shane Kilkelly	df31748148	Distinguish between separate percentage rollouts	2017-11-10 15:50:17 +00:00
Shane Kilkelly	0539930906	Use the common _isInPercentageRollout function for autocompile	2017-11-10 14:16:00 +00:00
Shane Kilkelly	22d1693f38	Add option to bypass percentage-based rollouts	2017-11-10 14:15:43 +00:00
Shane Kilkelly	faf6178fa8	Restrict link-sharing onboarding popup to admins. ... Only people with admin permission to the Project can see the Share button and dialog. It doesn't make sense to alert users who can't interact with the feature anyway.	2017-11-10 11:09:46 +00:00
Shane Kilkelly	666ee0669a	Alter position of link-sharing popover, and better image	2017-11-10 10:24:36 +00:00
Shane Kilkelly	470ad36218	Add onboarding popup for link-sharing	2017-11-09 14:28:11 +00:00
Hayden Faulds	086a0829e3	use self rather than ProtectEntityHandler	2017-11-08 13:45:11 +00:00
Hayden Faulds	3ce03a40f9	send both doc update and file updates to doc-updater	2017-11-08 13:11:17 +00:00
Hayden Faulds	06116dc956	version moving entities	2017-11-08 13:11:17 +00:00
Hayden Faulds	607f0125fc	return project from _removeElementFromMongoArray and _putElement	2017-11-08 13:11:17 +00:00
Hayden Faulds	929b9996d3	version doc renames	2017-11-08 13:11:17 +00:00
Hayden Faulds	599f2cb3ae	add DocumentUpdaterHandler.updateProjectStructure	2017-11-08 13:10:48 +00:00
Alasdair Smith	80231b0c1f	1% rollout	2017-11-08 12:42:47 +00:00
Shane Kilkelly	f3d037f7bc	Merge branch 'master' into sk-unlisted-projects	2017-11-08 11:21:19 +00:00
Alasdair Smith	8174a849a1	Reset to new analytics key	2017-11-08 11:01:36 +00:00
Alasdair Smith	76e3f0ab9f	Reduce rollout to 5%	2017-11-08 11:01:20 +00:00
Paulo Jorge Reis	9d74cd6063	Merge pull request #95 from sharelatex/pr-fix-add-to-tag-dropdown ... Fix "add to folder" dropdown + folder labels	2017-11-08 10:10:45 +00:00
Shane Kilkelly	82f5bbc5c8	Merge branch 'master' into sk-unlisted-projects	2017-11-07 16:15:45 +00:00
Shane Kilkelly	484cad2ef0	Render anonymous users as '?' in top bar	2017-11-07 14:20:08 +00:00
Shane Kilkelly	9180aaff05	Remove stray space from after help (?) link	2017-11-07 11:39:02 +00:00
Paulo Reis	68336457d8	Avoid using js-prefixed classes for styling.	2017-11-07 10:54:41 +00:00
Shane Kilkelly	2b4d516353	When anon is denied access to read-write token, redirect to restricted	2017-11-06 16:46:42 +00:00
Alasdair Smith	cdbc551e01	Increase autocompile rollout to 60%	2017-11-06 10:22:50 +00:00
Brian Gough	17a180ea8e	route history requests based on project ... either to track changes or to project history service	2017-11-03 16:44:37 +00:00
Shane Kilkelly	caf6315d4d	Remove old module import	2017-11-03 15:26:38 +00:00
Shane Kilkelly	18b9aef9ae	Disable the Guests switch when tc is active for everyone	2017-11-03 13:20:09 +00:00
Shane Kilkelly	57ae935155	Set token-access-ui rollout to 0%	2017-11-02 15:54:54 +00:00
Shane Kilkelly	51ba81e431	Add percentage-based rollout for token-access ui	2017-11-02 11:17:08 +00:00
Shane Kilkelly	1cedfed1e4	Merge branch 'master' into sk-unlisted-projects	2017-11-02 10:10:09 +00:00
Shane Kilkelly	fcb04472a1	De-duplicate logic in TokenAccessController	2017-11-01 14:05:29 +00:00
Shane Kilkelly	d8486afe5d	Account for higher-access in the token read-only path too	2017-11-01 14:01:00 +00:00
Shane Kilkelly	9984ab081e	Generalise the higher-access logic for read-write token path	2017-11-01 11:50:04 +00:00
Shane Kilkelly	b36849d262	Remove a dead event	2017-11-01 11:03:07 +00:00
Alasdair Smith	773277e3a0	Merge pull request #88 from sharelatex/as-fix-rollout ... Fix autocompile rollout	2017-11-01 09:33:50 +00:00
Alasdair Smith	6dc0561fa7	Fix bug where dismissing onboarding would hide autocompile switch	2017-10-31 17:00:41 +00:00
Hayden Faulds	79d9756bea	Merge pull request #81 from sharelatex/hof-init-project-history ... initialize project history on project creation	2017-10-31 14:47:00 +00:00
Shane Kilkelly	a212fb1a05	Add "[TokenAccess]" context to log lines	2017-10-31 14:27:43 +00:00
Alasdair Smith	248dfdeeb5	Increase autocompile rollout to 40%	2017-10-31 09:18:14 +00:00
Shane Kilkelly	cc67b871e9	Make contents of 'make-private' dialog depend on current state	2017-10-30 14:21:54 +00:00
Shane Kilkelly	4130732c14	Only show the TC "Guests" switch if token-acces UI is enabled	2017-10-30 14:13:56 +00:00
Shane Kilkelly	5fe5125a5c	Add ability to show/hide the new token-access ui	2017-10-30 13:48:25 +00:00
Shane Kilkelly	14633fe867	Update the link-sharing wiki url	2017-10-30 13:47:48 +00:00
Shane Kilkelly	23d249f092	Add links to learn-wiki article about link sharing	2017-10-30 10:43:27 +00:00
Alasdair Smith	b9ad03d20c	Increase autocompile rollout to 20%	2017-10-30 09:44:08 +00:00
Hayden Faulds	4ca73f6b53	allow overleaf.history.id to be blank	2017-10-27 16:52:10 +01:00
Hayden Faulds	19bc145ff4	separate overleaf.id from overleaf.history.id	2017-10-27 15:28:42 +01:00
Shane Kilkelly	c5a90233b4	Add a little 'link' icon beside projects which are link-shared	2017-10-27 15:17:41 +01:00
Shane Kilkelly	239f56ca0e	add unique index to both token fields	2017-10-27 14:58:55 +01:00
Hayden Faulds	20ea9918c9	allow overleafId to be passed in to avoid history initialization	2017-10-27 14:56:16 +01:00
Shane Kilkelly	a57827458d	Fix guest state sync	2017-10-27 14:41:48 +01:00
Shane Kilkelly	83bd78f467	More sensible conversion of byte-buffer to array	2017-10-27 10:38:55 +01:00
Shane Kilkelly	ec94e59388	Fix error-handling in setPublicAccessLevel	2017-10-26 16:39:24 +01:00
Shane Kilkelly	18443b55cb	Refactor token generator, and use crypto for numerics	2017-10-26 16:01:53 +01:00
Shane Kilkelly	d2a17c2745	Add rate-limiting to the token endpoints	2017-10-26 14:11:31 +01:00
Shane Kilkelly	f9899e8047	Add tooltips to the track-changes switches	2017-10-26 11:03:02 +01:00
Shane Kilkelly	5f6e191c5f	Automatically disable guest-track-changes when project made private	2017-10-25 14:48:32 +01:00
Shane Kilkelly	6e8e4e6453	Use ng-href for binding links with angular	2017-10-25 11:48:37 +01:00
Shane Kilkelly	8561b69ee9	Remove tokenMembers sync to clients	2017-10-25 11:29:05 +01:00
Shane Kilkelly	74c231826d	WIP: track changes with token-access	2017-10-25 10:34:18 +01:00
Paulo Reis	2ef7fd1d0a	Position the notifications lion relatively to the body.	2017-10-25 10:14:47 +01:00
Paulo Jorge Reis	0453aa60fe	Merge pull request #66 from sharelatex/pr-ol-beta-theme ... Overleaf beta theme & dashboard styling	2017-10-25 09:40:02 +01:00
Alasdair Smith	f8e44471ee	Merge pull request #75 from sharelatex/as-10-pc-rollout ... Rollout autocompile to 10% of users	2017-10-25 09:05:24 +01:00
Paulo Reis	70a56d0474	Merge branch 'master' into pr-ol-beta-theme	2017-10-24 16:19:31 +01:00
Hayden Faulds	670b183c8e	initialize project history on creation	2017-10-24 13:07:00 +01:00
Nate Stemen	98909026f5	moving data to backend and fixing tests	2017-10-24 10:59:41 +01:00
Hayden Faulds	c437eb37d5	handle missing settings.apis.project_history	2017-10-24 09:47:14 +01:00
Hayden Faulds	519f041215	Merge pull request #50 from sharelatex/hof-toggle-projec-history ... toggle project history	2017-10-24 09:13:50 +01:00
Paulo Reis	c105048e8d	Make project selection ARIA attributes translatable.	2017-10-23 16:09:43 +01:00
Hayden Faulds	299112f6e0	toggle project history using setting	2017-10-23 15:49:10 +01:00
Alasdair Smith	8421f6767a	Rollout to 10% of users	2017-10-23 13:14:20 +01:00
Paulo Reis	624dd26f39	Avoid loading onboarding images on page load.	2017-10-20 16:20:38 +01:00
Shane Kilkelly	dc39e447b2	Change findAllUsersProjects, produce and object rather than lists	2017-10-20 11:49:20 +01:00
Paulo Reis	525defb92d	Add router entry to the new styleguide (WIP).	2017-10-20 10:53:26 +01:00
Alasdair Smith	5b1836c639	Merge pull request #70 from sharelatex/as-add-onboarding-logging ... Adds some onboarding logging to investigate potential bug	2017-10-20 10:47:15 +01:00
Alasdair Smith	edb2a6c88b	Increase rollout to 5%	2017-10-20 10:23:52 +01:00
Shane Kilkelly	d710d284fe	Merge branch 'sk-unlisted-projects' of github.com:sharelatex/web-sharelatex-internal into sk-unlisted-projects	2017-10-20 10:11:33 +01:00
Shane Kilkelly	0e44b319db	Change anonToken and such to anonymousAccessToken	2017-10-20 10:10:21 +01:00
John Lees-Miller	30f67008a0	Fix typo	2017-10-20 09:19:18 +01:00
Shane Kilkelly	eab77aba91	Abstract away the token-protection logic	2017-10-19 16:26:01 +01:00
Alasdair Smith	ebaa640c51	Fix log call signature	2017-10-19 16:02:40 +01:00
Alasdair Smith	6fd1d493e3	Also add logging for track changes	2017-10-19 15:47:12 +01:00
Alasdair Smith	4d4dba9677	Adds some onboarding logging to investigate potential bug	2017-10-19 15:31:19 +01:00
Shane Kilkelly	97706acbac	Fix indentation	2017-10-19 14:54:59 +01:00
Shane Kilkelly	5572a0e873	Merge branch 'sk-unlisted-projects' of github.com:sharelatex/web-sharelatex-internal into sk-unlisted-projects	2017-10-19 14:46:05 +01:00
Shane Kilkelly	d8717a06a2	Fix track-changes with token-access	2017-10-19 14:42:17 +01:00
John Lees-Miller	3383a057a1	Fix typo ... (The typo came from my comment in Overleaf many years ago.)	2017-10-19 11:47:47 +01:00
Alasdair Smith	4cc517240c	Increase rollout to 3%	2017-10-19 10:54:21 +01:00
Brian Gough	05ee2a5244	Merge pull request #67 from sharelatex/bg-ignore-git-in-uploads ... ignore .git directories in uploads	2017-10-18 13:11:46 +01:00
Brian Gough	5d116e8ce9	Merge pull request #65 from sharelatex/bg-fix-main-doc-selection ... fix main doc selection (connects to overleaf/sharelatex#222)	2017-10-18 13:11:10 +01:00
Brian Gough	d0f0268783	Merge pull request #57 from sharelatex/bg-handle-undefined-project-name-with-error ... avoid exception in validateProjectName	2017-10-18 13:10:45 +01:00
Brian Gough	f8662d8aaa	Merge pull request #60 from sharelatex/bg-fix-unzip-permission ... replace unzip with yauzl (connects to #219)	2017-10-18 13:10:07 +01:00
Shane Kilkelly	7d2bde85ff	Add a setting to enable anonymous read-and-write link sharing	2017-10-18 13:04:37 +01:00
Brian Gough	290361dc72	ignore .gitignore files in uploads too	2017-10-17 16:49:51 +01:00
Brian Gough	277b9c5d50	ignore .git directories in uploads	2017-10-17 16:32:26 +01:00
Brian Gough	6001f14261	log each file unzipped	2017-10-17 16:31:56 +01:00
Brian Gough	76d73951f2	fix bug when unzipping directory	2017-10-17 16:31:35 +01:00
Brian Gough	56cb901b41	filter missing doc_ids from root doc_ids list	2017-10-17 15:49:02 +01:00
Brian Gough	f70ab03bd8	show an error if the main file cannot be found ... also improve logic for detecting the main file, if there's only one file it must be the main file.	2017-10-17 15:47:50 +01:00
Alasdair Smith	b0dc84748a	Fix to actual percentage	2017-10-17 15:44:15 +01:00
Alasdair Smith	6ff3a2de9f	Rollout autocompile to 1% of users and improve readability	2017-10-17 15:04:27 +01:00
Shane Kilkelly	9c247d5f59	On project list, only show projects once, with max access	2017-10-17 11:10:31 +01:00
Shane Kilkelly	855fe2e143	If user is project owner, don't add them as a token user	2017-10-16 16:44:20 +01:00
Brian Gough	4c78b5770c	use regex for directory check	2017-10-16 15:17:33 +01:00
Brian Gough	2bb7c6d4c6	remove child_process module from ArchiveManager	2017-10-16 14:21:28 +01:00
Brian Gough	96d08e41a7	update tests	2017-10-16 14:15:38 +01:00
Brian Gough	d6d76f132e	replace unzip with yauzl	2017-10-16 14:15:38 +01:00
Alasdair Smith	60c297eac8	Also prevent rollout to modulo 0 users	2017-10-16 13:40:09 +01:00
Shane Kilkelly	ad999a72b6	If a token-based project not found, check private overleaf project	2017-10-16 13:20:15 +01:00
Alasdair Smith	abb21ac96b	Fix autocompile rollout logic	2017-10-16 12:44:11 +01:00
Alasdair Smith	5d3371a52c	Merge pull request #38 from sharelatex/as-autocompile-rollout ... Rollout for auto compile; Connects to #20	2017-10-16 10:48:43 +01:00
Alasdair Smith	625f52c248	Update cutoff date	2017-10-16 10:28:42 +01:00
Alasdair Smith	e02c3bbb09	Remove beta program badge	2017-10-16 10:27:33 +01:00
Shane Kilkelly	ee29cb45d2	Translations for the new link-sharin (token access) feature	2017-10-13 13:57:11 +01:00
Shane Kilkelly	490ccc6051	Add commentary to token-generator, and move token-alpha to top level	2017-10-13 11:37:38 +01:00
Shane Kilkelly	ac513a1355	Refactor to not pass req down into Auth modules	2017-10-13 11:20:57 +01:00
Brian Gough	4ce639db70	Merge pull request #58 from sharelatex/bg-rate-limit-autocompile ... fix two bugs in auto compile limit logic	2017-10-13 08:18:31 +01:00
Nate Stemen	42412b1bb4	modified labels tests to pass with new metadata	2017-10-12 17:28:11 +01:00
Alasdair Smith	36e1fafb60	Set proportion to 0	2017-10-12 17:10:41 +01:00
James Allen	f0079bb7a4	Merge pull request #41 from sharelatex/ja-transfer-projects ... Add method to transfer projects from one user_id to another	2017-10-12 16:27:00 +01:00
Brian Gough	fc3ecddd0e	fix two bugs in auto compile limit logic ... 1. the compileGroup is "standard" not default 2. was not excluding normal compiles from metrics	2017-10-12 16:18:14 +01:00
Brian Gough	8cf3288187	avoid exception in validateProjectName	2017-10-12 16:03:12 +01:00
Shane Kilkelly	dcf601fe80	Only show token-based projects if accessLevel is set to token-based	2017-10-12 15:47:29 +01:00
Nate Stemen	f113ba6342	basic package aware autocomplete	2017-10-12 15:33:14 +01:00
Shane Kilkelly	9a7c8c5842	Revert "Remove remaining traces of UserStub" ... This reverts commit ab6b4c32254a20b940c489b8b5b56237433cc0f6.	2017-10-12 15:08:48 +01:00
Brian Gough	18370076a2	Merge pull request #45 from sharelatex/bg-auto-doc-flush ... allow docupdater to flush docs in background (connects to overleaf/sharelatex#190)	2017-10-12 14:48:16 +01:00
Shane Kilkelly	16416463c6	Update removeUserFromProject to account for token-access	2017-10-12 11:49:02 +01:00
Shane Kilkelly	6feedf5520	Use crypto module for token generation	2017-10-12 11:36:45 +01:00
Shane Kilkelly	22c5f41fb6	Add logging for token generation	2017-10-12 11:25:16 +01:00
Shane Kilkelly	fe708fcc04	Generate all missing tokens	2017-10-12 11:19:26 +01:00
Shane Kilkelly	70b1e42e36	Add deprecation comment regarding legacy access-levels	2017-10-12 11:00:39 +01:00
Shane Kilkelly	6e09165452	Refactor auth sources	2017-10-12 10:57:11 +01:00
Brian Gough	45ed090326	Merge pull request #37 from sharelatex/bg-rate-limit-autocompile ... rate limit autocompile (connects to #18)	2017-10-12 09:25:59 +01:00
Brian Gough	c913ec69ef	Merge pull request #34 from sharelatex/bg-fix-double-callback-in-resources-check ... fix double callback in resources check (connects to #18)	2017-10-12 09:20:05 +01:00
Brian Gough	cf25ff058f	use new endpoint docupdater get_and_flush_if_old	2017-10-11 16:05:28 +01:00
Alasdair Smith	5047213c3c	Change rollout detection to account for changes in proportion preserving rolled out users	2017-10-11 14:47:39 +01:00
Hayden Faulds	f017a94b7e	remove unused HistoryManager	2017-10-11 11:18:20 +01:00
Hayden Faulds	4e0a159db4	Merge pull request #40 from sharelatex/hof-pathname-for-doc-store ... return pathname from DocumentController.getDoc	2017-10-11 09:52:56 +01:00
Brian Gough	5b0d3d1429	simplify rate-limit checking code	2017-10-09 16:31:01 +01:00
Brian Gough	ea89638010	rename autocompile_disabled to autoCompileDisabled ... for consistency	2017-10-09 15:21:01 +01:00
Brian Gough	9eec245358	allow docupdater to flush docs in background	2017-10-09 14:17:28 +01:00
Paulo Reis	500dcc5bc2	Quick accessibility fixes for the dashboard.	2017-10-09 11:59:03 +01:00
Shane Kilkelly	1a4ffe7708	Remove un-necessary call to getProject from archiveProject path	2017-10-09 11:30:55 +01:00
Shane Kilkelly	ad68adee9a	Add more commentary on the anonymous path	2017-10-09 11:13:55 +01:00
Shane Kilkelly	e73de3bfd4	Fix whitespace in function signature	2017-10-09 10:57:23 +01:00
Shane Kilkelly	732ce9417b	Don't create tokens on project by default	2017-10-09 10:25:20 +01:00
Nate Stemen	cfca4b5d6c	modified labels service to include packages aware autocompletion	2017-10-06 17:15:50 +01:00
Shane Kilkelly	d386f79a76	Clean up	2017-10-06 16:10:33 +01:00
Shane Kilkelly	91abb6eed6	If project is not tokenBased, don't count members of token arrays	2017-10-06 15:57:22 +01:00
Shane Kilkelly	387854db7a	Fix an embarassing mistake, generate tokens dynamically, not once.	2017-10-06 13:24:10 +01:00
Paulo Reis	045fae7109	Some more adjustments to make the SL theme closer to original.	2017-10-06 10:50:59 +01:00
Paulo Reis	9047e9a365	Make SL theme closer to original.	2017-10-05 18:16:52 +01:00
Paulo Reis	60a76c45c3	Some more footer adjustments.	2017-10-05 16:41:11 +01:00
Paulo Reis	15eb23da54	Overall project list page layout; flex-based, i.e. needs lots of testing	2017-10-05 16:35:53 +01:00
James Allen	3c54419eb3	Remove commented debug code	2017-10-05 16:12:26 +01:00
Paulo Reis	8b98455674	Adjustments to the folders menu.	2017-10-05 15:26:49 +01:00
Shane Kilkelly	1500976226	Add temporary text to share modal	2017-10-05 14:47:50 +01:00
James Allen	9c1faa4395	Add method to transfer projects from one user_id to another	2017-10-05 14:26:34 +01:00
Nate Stemen	507bb568a3	labels -> metadata	2017-10-05 14:19:30 +01:00
Shane Kilkelly	bb0dad3353	Safe access to potentially-null project	2017-10-05 14:19:21 +01:00
Shane Kilkelly	b8d90a1a99	Show token-access projects on the dashboard	2017-10-05 13:20:06 +01:00
Shane Kilkelly	e4e558c0e6	Hide access tokens if user is not the project owner. ... This prevents sneaky read-only users from sniffing out the read-write link via the browser console.	2017-10-05 13:18:30 +01:00
Nate Stemen	e53a24f8f5	starting to generalize from labels to metadata	2017-10-04 17:56:43 +01:00
Shane Kilkelly	6482cd7dd8	Generate tokens on old projects if they're not present	2017-10-04 16:31:24 +01:00
Alasdair Smith	550e7d75ca	Check if user is part of autocompile rollout when showing setting or running autocompile	2017-10-03 17:19:51 +01:00
Alasdair Smith	8366ea271f	Restrict autocompile onboarding to users in rollout (factor of 100)	2017-10-03 17:08:19 +01:00
Brian Gough	2723537f82	disable autocompile when rate limit is hit	2017-10-03 16:23:49 +01:00
Brian Gough	d14723f24a	add rate limits for autocompiles ... global rate limit for all users and a lower rate limit for free users	2017-10-03 16:16:21 +01:00
Shane Kilkelly	b6c2a8f7f7	Tidy up callbacks	2017-10-03 14:14:22 +01:00
Shane Kilkelly	7b33f8b4c2	Unit test TokenAccessController	2017-10-03 14:04:59 +01:00
Paulo Jorge Reis	05f9e9b2c1	Merge pull request #27 from sharelatex/as-autocompile-onboarding ... Autocompile onboarding	2017-10-03 11:09:51 +01:00
Alasdair Smith	91e0397bf5	Update signup date check to today	2017-10-03 10:48:59 +01:00
Shane Kilkelly	ede497f4b3	Unit test TokenAccessHandler	2017-10-03 10:02:26 +01:00
Alasdair Smith	a3800a321b	Add beta program badge on autocompile popover & setting	2017-10-02 14:12:18 +01:00
Alasdair Smith	a69afae03d	Remove unnecessary arrow elem	2017-10-02 13:49:28 +01:00
Brian Gough	bd005d7bb6	fix double callback in precompile resources check	2017-10-02 10:14:52 +01:00
Shane Kilkelly	9f24f696a5	Use custom header, send anonToken in payload to joinProject	2017-09-29 16:32:07 +01:00
Shane Kilkelly	34d4d1360f	Anon read-token: add an Authorization header to $http	2017-09-29 15:54:55 +01:00
Hayden Faulds	bf1c24f6f9	return pathname from DocumentController.getDoc	2017-09-29 15:37:10 +01:00
Alasdair Smith	a4fa713f38	Fix typo	2017-09-29 11:18:44 +01:00
Shane Kilkelly	e04d10d11f	Styling of link-share, and fix read-only link	2017-09-29 10:59:30 +01:00
Alasdair Smith	ab7d83b1c5	Switch to translations	2017-09-29 10:59:01 +01:00
Alasdair Smith	dd7e6f0612	Make class names more consistent & switch to JS targeting through id	2017-09-29 10:49:45 +01:00
Shane Kilkelly	df338ebd6d	Show tokens in share modal	2017-09-29 10:11:23 +01:00
Shane Kilkelly	9810f63245	Render editor for token access, stub out ui changes	2017-09-28 16:06:08 +01:00
Brian Gough	c50f309b09	add missing whitespace in pdf.pug	2017-09-28 15:12:37 +01:00
Alasdair Smith	3e2388a7de	Don't show autocompile for users signed up after release date	2017-09-28 13:57:15 +01:00
Alasdair Smith	f2c0bf5515	First pass at getting onboarding shown event from analytics	2017-09-28 13:04:18 +01:00
Alasdair Smith	d9af9e723b	Clean up popover wrapper	2017-09-28 12:12:48 +01:00
Alasdair Smith	2d5a61f5b6	Determine placement of popover based on width of pdf panel	2017-09-28 11:32:38 +01:00
Alasdair Smith	fcc2db9ea7	Use width of button instead of hardcoded	2017-09-28 11:13:49 +01:00
Alasdair Smith	7e407621e9	Position onboarding popover after measuring position	2017-09-28 11:13:49 +01:00
Alasdair Smith	3259b871c0	Dismiss autocompile onboarding	2017-09-28 11:13:49 +01:00
Alasdair Smith	9386ddf4a9	Only show autocompile onboarding when first manual compile is run	2017-09-28 11:13:49 +01:00
Alasdair Smith	316cf07225	Add AutoCompileOnboardingController	2017-09-28 11:13:49 +01:00
Alasdair Smith	8d2a451b44	First pass at autocompile onboarding popover	2017-09-28 11:13:49 +01:00
Alasdair Smith	afff8ddf29	Pass (dummy) autocompile onboarding	2017-09-28 11:13:49 +01:00
Shane Kilkelly	4552f3be67	Move the getPublicAccessLevel helper to top-level of module	2017-09-28 10:53:35 +01:00
Shane Kilkelly	27dcf6c4c5	Fix a typo causing double-callbacks	2017-09-28 10:37:57 +01:00
Shane Kilkelly	574b115022	Working token-based access	2017-09-27 14:01:52 +01:00
Brian Gough	13628f82ec	Merge pull request #17 from sharelatex/bg-lock-compiles ... show error for compile in progress	2017-09-27 13:54:16 +01:00
Hayden Faulds	4adf88ca01	handle OL or SL ids in UserInfoController.getPersonalInfo	2017-09-26 11:40:05 +01:00
Hayden Faulds	2c0e9bb89a	return overleaf details from ProejctsDetailsHandler.getdetails	2017-09-26 10:19:30 +01:00
Brian Gough	0f855689a7	show error for compile in progress	2017-09-26 08:07:35 +01:00
Paulo Reis	08e0865870	Customize dashboard sidebar.	2017-09-25 16:41:09 +01:00
Paulo Reis	66654e4a14	Customize buttons; make button borders configurable.	2017-09-25 15:40:44 +01:00
Shane Kilkelly	ee32648bf4	Order privileges by highest-to-lowest	2017-09-22 15:55:38 +01:00
Shane Kilkelly	81170d472d	Add token-access routes	2017-09-22 14:54:35 +01:00
Shane Kilkelly	95292a2e55	Add unique index to token properties	2017-09-21 15:06:42 +01:00
Shane Kilkelly	441c207953	Generate tokens by default	2017-09-21 15:04:15 +01:00
Shane Kilkelly	abe41b6948	Fix projection in project query	2017-09-21 13:37:10 +01:00
Shane Kilkelly	863d327743	Change logic to exclude token users	2017-09-21 11:02:55 +01:00
Shane Kilkelly	931ba56e33	Add an 'owner' source tag, for the project owner	2017-09-21 09:35:25 +01:00
Shane Kilkelly	ef7e1ceabf	Rename functions to make distinction between invited/token members	2017-09-21 09:30:38 +01:00
Shane Kilkelly	91ec0da239	Use the invitedMembers function for sending tpds updates	2017-09-20 15:48:20 +01:00
Shane Kilkelly	574baf386e	Alter getProjectsUserIsMemberOf to include token-access projects. ... Also change the api to produce an object with the different project lists attached, rather than a pair of lists.	2017-09-20 15:26:03 +01:00
Shane Kilkelly	ceb7c509d0	Rename getProjectsUserIsCollaboratorOf to ...IsMemberOf ... This brings the naming more in line with current conventions.	2017-09-20 13:16:50 +01:00
Shane Kilkelly	069f49d5a6	Change getCollaboratorCount to getInvitedCollaboratorCount. ... And update the one call-site in LimitationsManager. This function is used to limit invites, so it makes sense to explicitely limit this to Invited members of the project.	2017-09-20 10:29:47 +01:00
Shane Kilkelly	8460160076	Add a getInvitedMembersWithPrivilegeLevels function. ... Then use it to build the loadProject view-model.	2017-09-20 10:02:43 +01:00
Shane Kilkelly	cf54989e6a	Add a getInvitedMemberIds function ... Limited to only members who were invited to the project, not users who have access via a token.	2017-09-20 09:36:56 +01:00
Shane Kilkelly	fc202439ab	Read-only privelege for anonymous access	2017-09-20 09:36:06 +01:00
Shane Kilkelly	06966f67db	Differentiate project members by source, include token members	2017-09-20 09:35:19 +01:00
Shane Kilkelly	a06f4b6b28	Remove remaining traces of UserStub	2017-09-19 16:16:39 +01:00
Shane Kilkelly	7919d5342b	Remove obsolete add-email-to-project workflow	2017-09-19 15:57:19 +01:00
Alasdair Smith	66bed67270	Merge pull request #4 from sharelatex/as-client-auto-compile ... Client-side auto compile	2017-09-19 15:20:07 +01:00
Shane Kilkelly	c87df7be79	Add token-access user refs to Project	2017-09-19 09:27:22 +01:00
Shane Kilkelly	8fece2d5f0	Add tokenBased access level	2017-09-18 10:58:13 +01:00
Shane Kilkelly	2011432120	Add tokens property to Project model	2017-09-18 10:27:28 +01:00
James Allen	adf211a226	Merge pull request #594 from sharelatex/ja-include-token-in-project-schema ... Include OL tokens in project schema	2017-09-15 11:41:24 +02:00
Brian Gough	9f9c15f6f5	Merge pull request #599 from sharelatex/bg-reset-project-state ... clear docupdater project state in deleteAuxFiles	2017-09-15 09:09:29 +01:00
Brian Gough	28a80cf23d	Merge pull request #604 from sharelatex/bg-fix-root-doc-in-incremental-compile ... fix root doc in incremental compile	2017-09-13 13:47:22 +01:00
Tim Alby	a04adbf132	remove extra security headers	2017-09-13 11:53:11 +02:00
Brian Gough	51eb94a493	handle incremental compile without root doc	2017-09-13 10:10:44 +01:00
Brian Gough	0e87b8950e	update clearProjectState endpoint	2017-09-12 11:40:00 +01:00
Tim Alby	d6834ff417	add security headers using Helmet ... - use all Helmet's default headers except `X-DNS-Prefetch-Control` - use `Referrer-Policy` - use cache headers when: - a user is logged in, OR - a project is displayed	2017-09-12 11:17:59 +02:00
Brian Gough	5430c8a3c2	Merge pull request #593 from sharelatex/bg-fix-inactive-projects-request ... avoid error when passing as limit in mongo query	2017-09-11 08:16:28 +01:00
Brian Gough	6d73c48c36	Merge pull request #596 from sharelatex/bg-suppress-incremental-compile-after-errors ... suppress incremental compile after errors	2017-09-11 08:15:50 +01:00
Brian Gough	2b4c8bd846	clear docupdater project state in deleteAuxFiles	2017-09-08 15:57:29 +01:00
Brian Gough	e8435e3eae	make condition clearer for incremental compile	2017-09-08 13:39:24 +01:00
Alasdair Smith	1b144ed183	Merge pull request #595 from sharelatex/as-fix-share-emails ... Fix UX issues in email autocompletion in share modal	2017-09-08 11:25:16 +01:00
Brian Gough	03a5ff2e43	skip incremental compile after docupdater error	2017-09-07 15:06:09 +01:00
Shane Kilkelly	586d1f1599	Merge pull request #531 from sharelatex/sk-allow-explicit-ses-email-config ... Instantiate the ses client if explicitly specified.	2017-09-07 10:21:01 +01:00
Alasdair Smith	320466a4f7	Catch invalid email address and show specific error message	2017-09-06 13:47:45 +01:00
Alasdair Smith	79566a9214	Prevent autocomplete on suggestions that don't match ... The behaviour of the ngTagsInput directive is somewhat counter-intuitive - typing part of a suggested email will appear as though it matches but pressing enter will not input the suggestion, but the current typed value. Disabling add on enter will still allow enter to select the selection, but prevents selection of the partially typed email/name.	2017-09-06 11:39:30 +01:00
Alasdair Smith	32b849faf7	Use translations	2017-09-05 14:57:06 +01:00
Alasdair Smith	42ae7a6479	Only show auto compile option for beta program users	2017-09-05 14:57:06 +01:00
Alasdair Smith	cca7f55322	Add autocompile setting	2017-09-05 14:57:06 +01:00
Alasdair Smith	9f1adfd0c0	Replace separate autocompile ctrl with listener in PdfController	2017-09-05 14:57:06 +01:00
Alasdair Smith	dab799a81b	First pass at auto compile ctrl	2017-09-05 14:57:06 +01:00
Brian Gough	3ac0e97a14	avoid error when passing as limit in mongo query ... convert request parameter from string to number	2017-09-05 12:33:13 +01:00
Brian Gough	e2368615e2	Merge pull request #589 from sharelatex/bg-check-options-for-incremental-compile ... include the options in the project state hash	2017-09-05 11:53:17 +01:00
Brian Gough	2e6c578dd7	add ol-style.css to fingerprint list	2017-09-05 10:54:26 +01:00
James Allen	39320c20b8	Include OL tokens in project schema	2017-09-05 10:50:39 +02:00
Brian Gough	d9557fcbf5	include the options in the project state hash	2017-09-01 16:36:51 +01:00
Shane Kilkelly	3d0268a486	Add other required properties for project load.	2017-09-01 11:36:23 +01:00
Shane Kilkelly	68f860b28d	Load user features alongside id and email. ... Fixes a bug where project features were not applied properly, and instead fell back to the free-account defaults.	2017-09-01 11:16:45 +01:00
Alasdair Smith	184c8adb84	Merge pull request #582 from sharelatex/as-pdfjs-cmaps-fix ... Fix Cmaps path for future versions of PDF.js	2017-08-31 09:36:46 +01:00
James Allen	9c4dc40abf	Merge pull request #583 from sharelatex/ja-import-projects ... Add in UserStub model and support in collaborators view	2017-08-29 16:06:00 +02:00
James Allen	a58a715fad	Merge pull request #570 from sharelatex/ho-null-check-redis-sessions ... Ho null check redis sessions	2017-08-29 15:44:22 +02:00
James Allen	8d268e9d42	Merge pull request #580 from sharelatex/ja-import-collaborators ... Add in UserStub model and support in collaborators view	2017-08-29 15:43:54 +02:00
James Allen	ba43e45f85	Merge pull request #578 from sharelatex/ja-import-projects ... Update Project schema for overleaf imports	2017-08-29 15:43:39 +02:00
James Allen	bb6ca9ba51	Update Project schema	2017-08-29 15:21:05 +02:00
Alasdair Smith	baf4eb6b52	Export PDFJS Cmaps path to window	2017-08-25 15:47:56 +01:00
Brian Gough	f9d1650c6a	Merge pull request #569 from sharelatex/bg-compile-from-redis ... compile from redis	2017-08-25 09:09:52 +01:00
James Allen	d5839437fd	Add in UserStub model and support in collaborators view	2017-08-24 17:48:47 +02:00
James Allen	b4254f06ef	Update Project schema for overleaf imports	2017-08-21 17:49:08 +02:00
Brian Gough	90ff58b820	compute project state hash from sorted docs/files	2017-08-16 10:49:29 +01:00
Brian Gough	739445336f	remove unused code and fix flushing	2017-08-15 16:00:00 +01:00
Brian Gough	4789dd23ee	docupdater will parse lines in getProjectDocs ... no need to do this in web now	2017-08-11 16:57:23 +01:00
James Allen	1f326f7990	Merge pull request #575 from sharelatex/ja-overleaf-oauth ... Allow OAuth based log-ins from Overleaf	2017-08-10 10:28:41 +02:00
Brian Gough	e2048e1ed5	use incrementalCompilesEnabled as option name	2017-08-09 16:25:57 +01:00
Brian Gough	836bddd91f	comment about 409 code in DocumentUpdaterHandler	2017-08-09 16:00:11 +01:00
Brian Gough	ddecd26718	flush documents to mongo on incremental compiles	2017-08-09 15:47:44 +01:00
James Allen	7538c8834f	Merge branch 'master' into ja-per-user-track-changes	2017-08-09 14:05:36 +02:00
James Allen	a0a45ee654	Update date	2017-08-09 14:02:40 +02:00
Brian Gough	7eb1c01994	add metrics for incremental compiles	2017-08-09 11:41:09 +01:00
Brian Gough	97b129cbe3	enable incremental compilation for beta users	2017-08-09 10:57:24 +01:00
James Allen	638eeb1247	Update Server.coffee	2017-08-09 11:51:08 +02:00
James Allen	17e849792c	Pull out logic into module	2017-08-09 11:50:05 +02:00
Brian Gough	8aa77cec5e	provide fallback to normal compile method	2017-08-08 16:48:47 +01:00
Brian Gough	203e42fa4c	clean up options handling	2017-08-08 16:48:37 +01:00
James Allen	eac0ce8353	Initial spike of Overleaf based logins	2017-08-08 14:00:21 +02:00
Brian Gough	31e71854a4	fix unit tests	2017-08-08 11:38:31 +01:00
Paulo Reis	d9e1254a6d	Update loading screen.	2017-08-07 17:02:55 +02:00
James Allen	5c8442a86f	Allow configureable brand prefix with overleaf styles	2017-08-07 17:01:59 +02:00
Brian Gough	849e905efb	simplify incremental request to docupdater ... if project state hasn't changed, get the docs from the docupdater -- we check/set the hash and return the docs in a single request. Otherwise do a full request from mongo.	2017-08-07 14:45:04 +01:00
Shane Kilkelly	05c5b4f9c5	Merge branch 'master' into sk-fully-hide-trackchanges	2017-08-03 15:20:20 +01:00
Shane Kilkelly	670d4438dc	If track-changes is not enabled, don't show hotkeys for it.	2017-08-03 15:16:54 +01:00
Brian Gough	1321009fe1	update docupdater endpoint to /project/id/docs	2017-08-03 14:40:46 +01:00
Henry Oswald	33fe252a15	null check user during logout	2017-08-03 13:26:14 +01:00
Henry Oswald	35f31d5a3c	null check the user correctly	2017-08-03 13:17:39 +01:00
Brian Gough	38c879faf2	improve comment about ClsiStateManager hash	2017-08-03 12:15:27 +01:00
Brian Gough	6d331e8ffd	use projectStateUnchanged instead of stateOk	2017-08-03 12:10:23 +01:00
Brian Gough	f44b844d74	refer to project state as projectStateHash	2017-08-03 12:08:11 +01:00
Brian Gough	5c02255e07	use syncType and syncState for clsi state options	2017-08-03 11:44:10 +01:00
Brian Gough	fb29ac3031	clean up logging	2017-08-03 11:36:59 +01:00
Brian Gough	0a859d3b33	clean up state manager	2017-08-03 11:36:23 +01:00
Brian Gough	a955b8fcc9	remove unused inline function	2017-08-03 11:35:42 +01:00
Brian Gough	a4117487e9	switch from mongoose to mongojs in ClsiManager ... for efficiency	2017-08-03 11:35:42 +01:00
Brian Gough	17b1075dc9	add rootFolder to attributes in Clsi request	2017-08-03 10:20:57 +01:00
James Allen	86a38df6e0	Merge pull request #563 from sharelatex/pr-support-html-encoded-i18n ... Support HTML encoded i18n	2017-08-03 10:36:35 +02:00
James Allen	ef9b3e06ee	Merge pull request #568 from sharelatex/ja-validate-contact-form ... Validate and add error status to contact form	2017-08-03 10:35:48 +02:00
James Allen	3d9da02815	Merge pull request #555 from sharelatex/sk-password-policy ... Enforce stricter password policy.	2017-08-03 10:35:00 +02:00
James Allen	28838eff60	Merge pull request #567 from sharelatex/ja-admin-panel-additions ... Some refactoring and methods needed to support the admin panel	2017-08-03 10:34:33 +02:00
Brian Gough	4d4cf4f693	project state can be stored per project ... there is no need to store it per project+user because it reflects the state of the project itself	2017-08-02 16:25:47 +01:00
James Allen	66d18bcbcd	Validate and add error status to contact form	2017-08-02 14:59:03 +02:00
Brian Gough	cf780fd8bb	start making requests incremental	2017-08-02 13:53:32 +01:00
James Allen	10f362a77a	Add SubscriptionUpdater.deleteSubscription	2017-08-02 09:59:45 +02:00
Brian Gough	66cd6ada14	allow querying folders from existing project ... avoid loading the project unnecessarily	2017-08-01 14:39:02 +01:00
Brian Gough	7a39eeb2ea	make request to docupdater for current docs	2017-08-01 14:38:34 +01:00
Paulo Reis	d576aa5b9d	Update date threshold to show the per-user TC dialog.	2017-08-01 12:01:17 +01:00
Paulo Reis	fbce49f5cd	Merge branch 'master' into ja-per-user-track-changes	2017-08-01 10:56:02 +01:00
Shane Kilkelly	ba3550759d	Persist autoPairDelimiters setting.	2017-07-31 08:36:13 +01:00
Paulo Reis	4849c705de	Optionally ask the translate local method to HTML encode; use it in the problematic tooltip.	2017-07-28 17:31:28 +01:00
Brian Gough	d66382382f	split request to mongo into separate method	2017-07-28 15:17:10 +01:00
Brian Gough	3e28eca26f	move docupdater flush to point of use	2017-07-28 15:11:07 +01:00
Shane Kilkelly	0f131d940d	Enforce stricter password policy. ... - Check minimum password lengths - Set default policy to 6-128 chars	2017-07-24 11:06:47 +01:00
Shane Kilkelly	4c637301f7	Add rate-limit to change-password action	2017-07-21 11:07:05 +01:00
Shane Kilkelly	8e55b77055	Move recurly callback to the public api router.	2017-07-20 13:51:11 +01:00
Shane Kilkelly	b00a30b2c5	Merge remote-tracking branch 'origin/pr-fix-tag-ordering'	2017-07-20 10:24:55 +01:00
Paulo Reis	35de3ee0ab	Fix typo in ng-repeat directive.	2017-07-19 10:34:50 +01:00
Shane Kilkelly	a4992891d0	Add an error handler to Raven loader. ... This should allow app to continue to work if loading Raven times out.	2017-07-18 14:41:44 +01:00
Paulo Reis	0c28c6cc3a	Add translation keys.	2017-07-07 10:38:13 +01:00
Paulo Reis	6cfa10d511	Add a per-user TC notice dialog.	2017-07-07 10:38:13 +01:00
Paulo Reis	d69a7577f5	Check in Analytics if user has already been informed about per-user TC.	2017-07-07 10:38:13 +01:00
Paulo Reis	8925dc5a78	Revert "Show simpler UI when there is only one user." ... This reverts commit 48300bd5b2ef01651e64dad3183e65d5d5798955.	2017-07-07 10:38:13 +01:00
Paulo Reis	dae5381af7	Show simpler UI when there is only one user.	2017-07-07 10:38:13 +01:00
Paulo Reis	139c2ab1fd	Consolidate members list.	2017-07-07 10:38:13 +01:00
Paulo Reis	e421b6550a	Filter out read-only users from TC users list.	2017-07-07 10:38:13 +01:00
Paulo Reis	bc88dbd0f8	Handle read-only permissions; allow read-only users to see state but not change it.	2017-07-07 10:38:13 +01:00
Paulo Reis	71e0a6935f	Readd feature flag handling.	2017-07-07 10:38:13 +01:00
Paulo Reis	7bf203c77f	Styling.	2017-07-07 10:38:13 +01:00
Paulo Reis	e7dd4874ad	Add collapse state indicator.	2017-07-07 10:38:13 +01:00
Paulo Reis	8e6265e3d2	Enable global setting.	2017-07-07 10:38:13 +01:00
Paulo Reis	1ae53a243a	Correctly fetch users from project info.	2017-07-07 10:38:13 +01:00
Paulo Reis	f4bdd5eb2b	Control sync state with server.	2017-07-07 10:38:13 +01:00
Paulo Reis	0ac52e7f19	Disable individual users TC control when TC is on for everyone; add styling for disabled toggles.	2017-07-07 10:38:13 +01:00
Paulo Reis	1fa7338baf	Wire up TC widget to controller methods.	2017-07-07 10:38:13 +01:00
Paulo Reis	dc2085c6e1	Basic widget for toggling TC state.	2017-07-07 10:38:13 +01:00
James Allen	710c89a629	Support per user track changes (proof of concept)	2017-07-07 10:38:13 +01:00
Shane Kilkelly	04c94760f5	Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration	2017-07-06 14:39:28 +01:00
Shane Kilkelly	009cadb8b8	Change translation for autoPairDelimiters setting	2017-07-06 14:32:30 +01:00
Shane Kilkelly	34b2012727	Enable (optional) auto-pairing for latex mode	2017-07-06 11:06:51 +01:00
Brian Gough	0ae93db08b	use ApiErrorHandler on public api	2017-07-05 15:06:23 +01:00
Brian Gough	1dbeebabd2	move status and health checks to public api router	2017-07-05 14:50:38 +01:00
Brian Gough	845ee51a67	rename apiRouter -> privateApiRouter in router	2017-07-05 14:43:41 +01:00
Brian Gough	bd83d94f64	rename apiRouter -> privateApiRouter in Modules	2017-07-05 14:41:14 +01:00
Brian Gough	29b40ad824	add public api router	2017-07-05 14:32:55 +01:00
Brian Gough	3e8ad69f3c	make loading of module routes more robust	2017-07-05 11:46:29 +01:00
Brian Gough	5ad3fd769d	preserve original /status message	2017-07-04 12:42:54 +01:00
Brian Gough	b2f676af5a	avoid duplicate routes for /status	2017-07-04 12:41:51 +01:00
Brian Gough	dbbc4966d8	Merge pull request #513 from sharelatex/bg-split-web-and-web-api ... split web and web api	2017-07-04 08:51:00 +01:00
Paulo Reis	86e66bbed1	Merge branch 'master' into pr-angular-1.6.x	2017-07-03 09:50:01 +01:00
Shane Kilkelly	b73b78e570	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2017-06-27 08:24:24 +01:00
Shane Kilkelly	0d5d59bb66	Remove user field from log, var not in scope	2017-06-26 13:56:22 +01:00
Paulo Reis	1bc38b2ea7	Use Angular minified bundle.	2017-06-26 10:07:15 +01:00
Henry Oswald	3da5ef818c	null check subscription for group admin panel	2017-06-22 14:07:07 +01:00
Shane Kilkelly	1112a1f085	Instantiate the ses client if explicitly specified. ... This allows end-users to use AWS features such as instance roles, avoiding the use of explicit crendentials	2017-06-21 10:57:13 +01:00
Paulo Reis	ddee75e479	Use a getterSetter to manage int values in settings.	2017-06-20 17:08:53 +01:00
Paulo Reis	eab00c95df	Include Angular 1.6.	2017-06-20 11:49:33 +01:00
Brian Gough	bac275962f	put /ip on web router	2017-06-19 15:54:57 +01:00
Brian Gough	d32a3fbaf5	support status and health check on web and web-api	2017-06-19 15:54:14 +01:00
Brian Gough	02cb0f2295	make compiler health check available on web	2017-06-19 15:52:04 +01:00
Brian Gough	62d6933886	use settings instead of ENV for web/api split	2017-06-15 16:11:20 +01:00
Brian Gough	1ecabaa611	Revert "update pdfjs to v1.8.188" ... This reverts commit 189e48dcc00f530eff674cc4a2b87c06814d45ff.	2017-06-15 11:14:01 +01:00
Shane Kilkelly	5a6415d3f8	Add logging for Labels http actions	2017-06-15 08:56:48 +01:00
Shane Kilkelly	9607174b64	Merge branch 'master' into sk-server-side-labels-loading	2017-06-15 08:49:14 +01:00
Shane Kilkelly	5e37b1dac1	Move logic for selectively loading labels. ... Only load labels if the user has write permission	2017-06-14 13:26:02 +01:00
Brian Gough	9687daf97f	Merge pull request #520 from sharelatex/bg-upgrade-pdfjs-1.8.188 ... upgrade pdfjs 1.8.188	2017-06-13 16:46:10 +01:00
Shane Kilkelly	3b066758bb	Don't load labels for anonymous/read-only users	2017-06-13 14:06:00 +01:00
Shane Kilkelly	b97becc7a2	Change getLabelsForDoc to broadcastLabelsForDoc	2017-06-13 11:38:15 +01:00
Shane Kilkelly	a3dbb16e50	Flush project before getting all project labels	2017-06-13 11:15:26 +01:00
Shane Kilkelly	bd6133aadb	Remove callback-pattern from label parsers	2017-06-13 11:10:21 +01:00
Shane Kilkelly	c25b6b792d	Namespace the document route under /doc/	2017-06-13 10:57:51 +01:00
Shane Kilkelly	26be4f84d0	Re-use parser	2017-06-12 15:15:14 +01:00
Shane Kilkelly	0a491a4f13	Add comment, explain flushing of doc to mongo	2017-06-12 13:09:13 +01:00
Shane Kilkelly	ff4991284d	Change docLabelsUpdated socket event to broadcastDocLabels	2017-06-12 13:06:56 +01:00
Shane Kilkelly	234a2d0e21	Remove cruft	2017-06-12 11:37:34 +01:00
Shane Kilkelly	9f9468d0e0	Use lowercase project_id	2017-06-12 11:37:05 +01:00
James Allen	7137ab643f	Merge pull request #523 from sharelatex/ja-removing-group-holding-accounts ... Use an email based invite system for groups, not holding accounts	2017-06-09 11:36:42 +01:00
Shane Kilkelly	5443b92e7d	Move state management into LabelsMaster on the ide	2017-06-09 11:28:27 +01:00
Paulo Reis	cc7f44737e	Tell Angular to avoid parsing the value attribute.	2017-06-08 16:02:28 +01:00
Shane Kilkelly	965a46291b	Only fetch labels for uploaded docs, not files	2017-06-08 15:55:17 +01:00
Shane Kilkelly	ff7955dfdb	Update labels when docs are uploaded or removed	2017-06-08 15:12:18 +01:00
James Allen	4cecbae6b6	Use an email based invite system for groups, not holding accounts	2017-06-08 12:12:08 +01:00
Shane Kilkelly	feb1d87de1	Add test for LablesHandler	2017-06-08 10:25:39 +01:00
Shane Kilkelly	c7dbd21cd1	use flag on aceEditor to enable autocomplete features	2017-06-08 09:22:08 +01:00
Paulo Reis	19ecffd654	Merge branch 'master' into pr-aggregate-insert-delete	2017-06-06 17:04:31 +01:00
Paulo Reis	34796b18c5	Add translation keys.	2017-06-06 16:46:36 +01:00
Brian Gough	ecf0857756	update pdfjs to v1.8.188	2017-06-06 12:19:13 +01:00
Brian Gough	b277ee3254	Merge pull request #511 from sharelatex/bg-handle-web-api-errors ... use a separate error handler for api router errors	2017-06-06 09:22:28 +01:00
Paulo Reis	e616a62d68	Save entry ids inside entry object, not only as the key.	2017-06-05 16:29:55 +01:00
Shane Kilkelly	f7ad4a4786	WIP: basically working, with client sync	2017-06-05 14:48:50 +01:00
James Allen	d7981fd2d4	Merge pull request #512 from sharelatex/ja-project-name-validation ... Refactor project name validation into one place and restrict /s	2017-06-05 11:55:39 +01:00
Paulo Reis	d4ac91f75e	Use correct handlers in directives.	2017-06-05 10:52:11 +01:00
Shane Kilkelly	f29320dd93	Add ability to load labels from single document	2017-06-05 09:26:13 +01:00
Shane Kilkelly	4cb41a988a	WIP: initial work on server-side labels	2017-06-02 15:12:59 +01:00
Paulo Reis	e2edf4184f	Explicit naming.	2017-06-02 11:43:43 +01:00
Paulo Reis	2a0454f2f1	Integrate aggregate changes with bulk actions.	2017-06-01 15:18:43 +01:00
Paulo Reis	1490ea7b04	Change aggregated change model: the main change is now the insertion, deletion is stored in metadata.	2017-06-01 15:03:37 +01:00
Paulo Reis	11c0644490	Aggregate changes; make accept and reject work.	2017-06-01 11:47:55 +01:00
Shane Kilkelly	6b746f757e	Merge pull request #514 from sharelatex/ja-update-raven ... Update Raven (Sentry lib) to 3.15.0 in client	2017-06-01 09:13:40 +01:00
Shane Kilkelly	5847973615	Merge pull request #515 from sharelatex/ja-editable-asy-files ... Make .asy files editable when uploaded	2017-06-01 09:13:25 +01:00
Paulo Reis	b6cef2e3d7	Include directive; add some styling.	2017-05-31 15:53:14 +01:00
James Allen	e2be4b6293	Make .asy files editable when uploaded	2017-05-22 17:12:01 +01:00
James Allen	32b27766bc	Update Raven (Sentry lib) to 3.15.0 in client	2017-05-22 16:45:50 +01:00
James Allen	59085c1ddd	Add missing require stubs and remove console.logs in unit tests	2017-05-22 15:33:52 +01:00
Brian Gough	4b188ce120	support separate processes for web and api ... via an environment variable WEB_TYPE	2017-05-22 13:31:02 +01:00
Paulo Reis	8dfb91fa6f	Blur toggler after clicking.	2017-05-22 11:11:26 +01:00
James Allen	ba62206b91	Refactor project name validation into one place and restrict /s	2017-05-19 17:42:24 +01:00
Brian Gough	5ac2ed8fc6	use a separate error handler for api router errors	2017-05-19 16:36:29 +01:00
Paulo Reis	914e50f3f6	Add new review-related hotkeys; re-arrange hotkeys modal.	2017-05-19 15:52:04 +01:00
Paulo Reis	15980d5427	Merge branch 'master' into pr-hide-review-panel	2017-05-19 15:31:14 +01:00
Paulo Reis	957b201fc1	Add commenting and track-changes keyboard shortcuts.	2017-05-19 15:28:49 +01:00
James Allen	76b8fecde9	Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster ... Don't try to set the server id if it isn't returned in the response	2017-05-19 15:00:18 +01:00
James Allen	01548a0216	Don't try to set the server id if it isn't returned in the response	2017-05-19 10:23:01 +01:00
Paulo Reis	e532f543a3	Merge branch 'master' into pr-bulk-actions	2017-05-18 14:38:16 +01:00
James Allen	39ca6d1e6c	Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster ... Check for blank string in clsi cookie caching	2017-05-18 11:12:11 +01:00
James Allen	f708a0cd81	Check for blank string in clsi cookie caching ... ioredis returns "" for a blank entry, the previous driver returned null, so also check for a blank string	2017-05-18 11:09:33 +01:00
Paulo Reis	832764dd3d	Add key shortcut to toggle the review panel.	2017-05-18 11:02:50 +01:00
Paulo Reis	5a9519d18f	Add a toggler element inside the review panel.	2017-05-17 16:41:53 +01:00
Brian Gough	5237647b8b	Merge pull request #489 from sharelatex/bg-improve-upload-robustness ... improve stream error handling on upload	2017-05-17 15:26:03 +01:00
Shane Kilkelly	6338835baf	Merge branch 'sk-sudo-mode'	2017-05-17 09:48:22 +01:00
Shane Kilkelly	4e3284cec8	Merge branch 'sk-dont-redirect-to-images'	2017-05-17 09:48:16 +01:00
Shane Kilkelly	25e0a19350	Make confirm-password routes more restful	2017-05-16 11:51:06 +01:00
Brian Gough	e23871118d	Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness	2017-05-15 16:01:01 +01:00
Shane Kilkelly	60d3e4a97b	If external auth system is in use, skip sudo-mode checks	2017-05-15 15:46:24 +01:00
Shane Kilkelly	707a81cc2a	Correct title of confirm-password page	2017-05-15 15:46:11 +01:00
James Allen	5aa8b71832	Allow writing of clsi cookie cache to redis cluster secondary	2017-05-15 15:35:01 +01:00
Shane Kilkelly	1d7d0193fc	Use translations for sudo-mode prompt	2017-05-15 13:37:54 +01:00
Shane Kilkelly	1f7724be68	Merge branch 'sk-sudo-mode' of github.com:sharelatex/web-sharelatex into sk-sudo-mode	2017-05-15 11:54:14 +01:00
Shane Kilkelly	c864288c4e	On logout, clear sudo mode	2017-05-15 11:53:52 +01:00
James Allen	17b064df18	Adjust style of sudo mode prompt	2017-05-15 11:45:41 +01:00
Shane Kilkelly	0f75d9f4d9	Test SudoModeController	2017-05-15 10:56:43 +01:00
Paulo Reis	82a19444b3	Merge branch 'master' into pr-bulk-actions	2017-05-15 10:29:15 +01:00
Shane Kilkelly	76285a1554	Start testing SudoModeController	2017-05-15 10:07:22 +01:00
Shane Kilkelly	8605dc83b4	Merge branch 'master' into sk-sudo-mode	2017-05-15 09:21:13 +01:00
Shane Kilkelly	0e26222551	Don't redirect to images, icons, etc, in login workflow	2017-05-12 15:46:16 +01:00
Paulo Jorge Reis	d550ede112	Merge pull request #496 from sharelatex/pr-review-panel-relayout ... Review panel relayout	2017-05-12 13:54:59 +01:00
Shane Kilkelly	1640dfa79a	Merge branch 'sk-fix-cooldown-tpds'	2017-05-12 09:11:23 +01:00
James Allen	3bfd92dd9c	Rename lock to avoid potential conflict with doc updater	2017-05-11 15:27:01 +01:00
Shane Kilkelly	7b0aca7f02	add cooldown to tpds mergeUpdate path	2017-05-11 11:29:57 +01:00
Paulo Reis	a3ab994ab3	Use the same watcher to control miniRP visibility and trigger Ace resizing.	2017-05-11 10:17:25 +01:00
Shane Kilkelly	a08dd26ef3	Remove CooldownMiddlewear from Tpds routes	2017-05-11 10:07:04 +01:00
Shane Kilkelly	e6286c721d	Merge branch 'master' into sk-fix-large-projects	2017-05-11 08:40:17 +01:00
Shane Kilkelly	01ee104f77	Revert "update to newest mongoose" ... This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.	2017-05-10 15:31:17 +01:00
Shane Kilkelly	08567ff220	if projectId is not defined, error out	2017-05-10 15:25:23 +01:00
Shane Kilkelly	b8e4cafd81	Fix log line	2017-05-10 15:16:36 +01:00
Shane Kilkelly	27842996aa	start testing SudoModoController	2017-05-10 15:15:57 +01:00
James Allen	274d6f4ac6	Merge pull request #493 from sharelatex/ja-redis-cluster-refactor ... Move all redis end points to be cluster compatible	2017-05-10 14:38:37 +01:00
Shane Kilkelly	08fd501ce2	Add a hint to the sudo-mode prompt	2017-05-10 11:36:35 +01:00
Shane Kilkelly	16128288a9	Add sudo-mode protection to sessions page	2017-05-10 11:36:19 +01:00
Shane Kilkelly	5a97521b04	Fix typo in log message	2017-05-10 11:36:05 +01:00
Shane Kilkelly	a3a2108526	Increase sudo-mode time to one hour	2017-05-10 11:35:47 +01:00
Shane Kilkelly	094784b6d5	protect settings page with sudo-mode middlewear	2017-05-10 10:25:32 +01:00
Shane Kilkelly	029c96c7cc	Add sudo-mode 'confirm password' prompt	2017-05-10 10:05:48 +01:00
Paulo Reis	f3e020df7e	Add dialog to confirm bulk actions.	2017-05-09 16:06:19 +01:00
Shane Kilkelly	fd0176c0cf	if project goes over maximum allowed files, put on cooldown	2017-05-09 14:20:29 +01:00
Shane Kilkelly	8e90b7fb9b	Add Cooldown to Tpds routes	2017-05-09 13:54:11 +01:00
Shane Kilkelly	149e38855f	Add a cooldown mechanism for projects which go over limits	2017-05-09 11:40:42 +01:00
Shane Kilkelly	c5c0364d49	update to newest mongoose	2017-05-08 16:09:59 +01:00
Paulo Reis	3ced808411	Use a single accept changes method.	2017-05-05 15:19:31 +01:00
James Allen	014e3afb36	Don't call sync functions inside async ... Calling sync functions inside async can trigger the node max stack size. Instead, build up our unique list of ids in advance, so we only call a method in async for each user we actually need to look up, asynchronously. Then use all the cached values synchronously afterwards.	2017-05-04 17:04:20 +01:00
Paulo Reis	19828d3c5b	Basic bulk accept support.	2017-05-04 15:33:47 +01:00
James Allen	8449b0417c	Move all redis end points to be cluster compatible	2017-05-04 15:22:54 +01:00
Paulo Reis	6662ec34ae	Only show bulk actions when n changes > 1.	2017-05-04 11:30:05 +01:00
Paulo Jorge Reis	20433327b8	Merge pull request #490 from sharelatex/pr-align-pdf-icon ... Use header button classes in the PDF button.	2017-05-04 09:59:11 +01:00
Paulo Jorge Reis	9d2d217d35	Merge pull request #491 from sharelatex/pr-project-list-improvements ... Project list improvements	2017-05-04 09:59:02 +01:00
Paulo Reis	05d9bf47d1	Use entry ids instead.	2017-05-03 16:53:04 +01:00
Paulo Reis	bf7bf701ed	Store selected entries; improve visibility logic.	2017-05-03 16:35:58 +01:00
Paulo Reis	0249a13012	Add bulk actions as in-editor widgets.	2017-05-03 11:41:17 +01:00
Paulo Reis	3f441ff38c	Count entries within selection; only show bulk actions if there are selected entries.	2017-05-02 17:02:30 +01:00
Paulo Reis	e2eaf6619e	Bulk actions directive; include it in the review panel.	2017-05-02 16:15:40 +01:00
Paulo Reis	76ea497b33	Use a single entry for bulk actions.	2017-05-02 15:43:45 +01:00
Paulo Reis	d874eb70f8	Add and remove bulk accept and reject entries with selections.	2017-05-02 15:34:05 +01:00
Paulo Reis	d71296da9f	Add row clicking in the projects list.	2017-05-01 17:11:03 +01:00
Paulo Reis	208f021bd0	Actually remove project from tag, inline.	2017-05-01 16:00:25 +01:00
Paulo Reis	2708fdf159	Add a button to allow inline removal of tags.	2017-05-01 15:43:44 +01:00
Paulo Reis	bca916d504	Use header button classes in the PDF button.	2017-05-01 15:04:08 +01:00
Paulo Reis	9fb166d2b3	Style improvements.	2017-04-28 17:09:34 +01:00
Paulo Reis	6e40284099	Add untagged projects counter.	2017-04-28 16:57:37 +01:00
Brian Gough	679680532f	improve stream error handling on upload	2017-04-28 14:47:18 +01:00
Paulo Reis	84a2658259	Add an untagged filter in the projects list.	2017-04-28 12:11:51 +01:00
Brian Gough	46f693519a	return 404 for api request on missing doc	2017-04-27 16:41:53 +01:00
Henry Oswald	3bdd5a4a2e	Merge pull request #483 from sharelatex/ja-dont-fail-on-tpdsworker-error ... Continuing flushing document on tpds worker error	2017-04-25 09:19:13 +01:00
Henry Oswald	5d55e383c7	Merge pull request #485 from sharelatex/sk-warn-on-zip-failure ... when the uploaded file is not a zip, warn instead of error	2017-04-25 09:18:17 +01:00
Henry Oswald	f5267ac6ee	Merge pull request #481 from sharelatex/ja-encode-project-names ... Error if no project returned from joinProject	2017-04-25 09:17:59 +01:00
Henry Oswald	efe5e9efb0	Merge pull request #484 from sharelatex/ho-rate-limit-compiles ... added rate limit to compile endpoint	2017-04-25 09:17:27 +01:00
Henry Oswald	c733925a26	show rate limit message when compiled too much	2017-04-24 15:56:09 +01:00
Shane Kilkelly	779336e5b0	when the uploaded file is not a zip, warn instead of error	2017-04-13 15:12:54 +01:00
Shane Kilkelly	8d6370026e	Merge pull request #479 from sharelatex/pr-fix-favicon-path ... Fetch favicon and related assets from root.	2017-04-13 13:09:29 +01:00
Shane Kilkelly	e4e8520f27	Merge branch 'node-6.9'	2017-04-13 10:10:43 +01:00
Henry Oswald	65b83f2c67	added space before email for closed site	2017-04-12 17:04:12 +01:00
Shane Kilkelly	a9b8b864df	Move content-disposition setting into a method on res	2017-04-12 16:00:02 +01:00
Shane Kilkelly	02d75deaa0	when setting content-disposition, uri-encode names	2017-04-12 09:31:59 +01:00
Henry Oswald	0961a034ea	added rate limit to compile endpoint	2017-04-11 16:08:38 +01:00
James Allen	6d2f18016f	Move tpds worker error ignoring logic into tpdsUpdateSender	2017-04-11 15:41:17 +01:00
James Allen	7c8f228f48	Continuing flushing document on tpds worker error	2017-04-11 14:02:08 +01:00
Shane Kilkelly	f398e87e6f	Merge branch 'master' into node-6.9	2017-04-11 11:34:53 +01:00
James Allen	f6bd949f01	Error if no project returned from joinProject ... socket.io seems to choke on the unicode project name and just return undefined when it fails to parse the JSON. I've improved the escaping of the user data on HTML load, but reporting an error is the best we can easily do on joinProject via websockets.	2017-04-10 12:03:39 +01:00
Paulo Reis	332e4a80b2	Also fix iOS icon path.	2017-04-07 14:43:07 +01:00
Paulo Reis	a7d3721882	Fetch favicon and related assets from root.	2017-04-07 14:31:21 +01:00
James Allen	477278eea5	Merge pull request #476 from sharelatex/ja-use-new-comment-button ... Fix on the new comment button variation	2017-04-05 11:08:59 +01:00
James Allen	7d24fbc225	Merge pull request #477 from sharelatex/ja-encode-project-names ... Properly pass project data as JSON and then parse it	2017-04-05 11:08:37 +01:00
Shane Kilkelly	bb65da88fe	Merge branch 'master' into node-6.9	2017-04-05 10:15:51 +01:00
Shane Kilkelly	0555154a24	Merge branch 'sk-fix-folder-creation'	2017-04-04 11:01:07 +01:00
James Allen	8d0186532f	Properly pass project data as JSON and then parse it	2017-04-04 10:46:46 +01:00
Paulo Reis	15de552c2c	Make new add comment button styles as the default; removed old add comment button code.	2017-04-04 10:40:53 +01:00
Shane Kilkelly	fc9bf838fc	Merge branch 'sk-upgrade-metrics'	2017-04-04 10:28:58 +01:00
James Allen	567edbfb31	Fix on the new comment button variation	2017-04-03 17:11:33 +01:00
Shane Kilkelly	043520fc28	Remove the Metrics module, use metrics-sharelatex	2017-04-03 16:18:30 +01:00
James Allen	335f8f78f0	Merge pull request #445 from sharelatex/pr-new-logo ... PR New logo	2017-04-03 14:05:51 +01:00
James Allen	6b03e4b2a1	Merge pull request #470 from sharelatex/pr-fix-high-cpu-firefox ... Set video source only when the onboarding prompt is shown.	2017-04-03 14:04:27 +01:00
Paulo Reis	4a86ff4b44	Merge branch 'master' into pr-new-logo	2017-04-03 11:17:39 +01:00
Paulo Reis	6b9b8480a8	Only show the tooltip if the project name is truncated.	2017-03-31 16:36:58 +01:00
Paulo Reis	5b8c36dfc0	Add a project name tooltip.	2017-03-31 16:13:23 +01:00
Shane Kilkelly	bee62400a6	Merge branch 'master' into sk-upgrade-metrics	2017-03-31 14:08:12 +01:00
Shane Kilkelly	cc81eca902	Account for error being null	2017-03-31 10:46:13 +01:00
Shane Kilkelly	2c62acee0b	Cleaner error reporting for addFolder endpoint	2017-03-31 10:31:03 +01:00
Paulo Reis	250d19163b	Set video source only when the onboarding prompt is shown.	2017-03-30 10:35:16 +01:00
Paulo Reis	f298fac638	Improve wording on error pages.	2017-03-28 16:57:08 +01:00
James Allen	3bf19a38ee	Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation ... Handle a 404 from Recurly if account doesn't exist	2017-03-28 16:06:25 +01:00
James Allen	08699d7aa2	Handle a 404 from Recurly if account doesn't exist	2017-03-28 15:46:58 +01:00
James Allen	f53234271f	Merge pull request #465 from sharelatex/sk-hide-email-errors ... If sending email fails, return a generic error.	2017-03-28 13:16:43 +01:00
James Allen	2e6e51eb6d	Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation ... Check Recurly for subscription as well before creating subscription	2017-03-28 13:15:58 +01:00
Brian Gough	835d8d618d	use error handler	2017-03-28 11:33:37 +01:00
Brian Gough	6002fdbad6	return 404 on project details not found	2017-03-28 10:30:53 +01:00
Brian Gough	f433510e61	return NotFound error in ProjectDetailsHandler	2017-03-28 10:12:52 +01:00
Brian Gough	4e66b045e3	fix unhandled exception in ProjectDetailsHandler	2017-03-28 09:44:50 +01:00
Shane Kilkelly	d2e1efe4a9	fix a daft mistake	2017-03-27 17:45:19 +01:00
Shane Kilkelly	69b9b308d4	If sending email fails, return a generic error. ... This prevents us from leaking juicy details of our aws/ses setup via the password-reset form.	2017-03-27 16:17:38 +01:00
Paulo Reis	6ac99115a4	Safari pinned tab favicon.	2017-03-27 13:45:03 +01:00
Paulo Reis	73a9732b8e	Favicons for mobile devices.	2017-03-27 13:45:03 +01:00
Paulo Reis	659028cf0f	Graphically anchor elements of 500 error visual.	2017-03-27 13:45:03 +01:00
Paulo Reis	f5bf310d80	Adapt 500 error page.	2017-03-27 13:45:03 +01:00
Paulo Reis	d82dc7c1a1	Basic responsive behaviour.	2017-03-27 13:45:03 +01:00
Paulo Reis	e60b1b5922	Bootstrap 404 page; integrate styles.	2017-03-27 13:45:03 +01:00
Paulo Reis	7a1c06982e	Styling of loading screen.	2017-03-27 13:33:49 +01:00
James Allen	7aa4c0c030	Check Recurly for subscription as well before creating subscription	2017-03-27 12:07:43 +01:00
Henry Oswald	f27dfa54f1	fixup AuthenticationController from missing module after merge	2017-03-27 09:42:49 +01:00
Paulo Jorge Reis	67943a8906	Merge pull request #463 from sharelatex/pr-ab-test-add-comments ... PR AB test "add comment" button	2017-03-27 09:32:49 +01:00
Henry Oswald	9c7465fd64	Merge pull request #461 from sharelatex/ho-annom-user-events ... add identify on login	2017-03-27 09:28:34 +01:00
Henry Oswald	aa4f768513	Merge pull request #455 from sharelatex/ho-bug-fix ... multiple small bug fixes	2017-03-27 09:28:28 +01:00
Henry Oswald	379efcb04a	Merge branch 'master' into ho-annom-user-events	2017-03-27 09:28:03 +01:00
Paulo Reis	78e8a8319d	Put review panel widgets container inside the review panel element; rearrange visibility logic.	2017-03-24 14:04:37 +00:00
Henry Oswald	ed4a321906	remove extra debug route	2017-03-23 15:39:12 +00:00
Henry Oswald	cff922a0f5	idendify -> identify	2017-03-22 16:01:26 +00:00
Henry Oswald	ebdce6169e	idendifyUser on login	2017-03-22 15:50:49 +00:00
Shane Kilkelly	4e6553ebcc	Merge branch 'sk-handle-analytics-absence'	2017-03-22 09:35:16 +00:00
Shane Kilkelly	1663f2a8eb	Use res.send, not next	2017-03-21 11:09:39 +00:00
Shane Kilkelly	1ed1eaaa05	If analytics is not configured, produce a ServiceNotConfiguredError	2017-03-21 10:57:39 +00:00
Shane Kilkelly	8a8a5a7079	Add a 'ServiceNotConfiguredError' to Errors module.	2017-03-21 10:57:09 +00:00
Paulo Reis	0e24d7118d	Hide new UI behind query string parameter.	2017-03-20 13:56:36 +00:00
Paulo Reis	8951e91e31	Remove add comment button from the mini review panel.	2017-03-20 11:35:35 +00:00
Paulo Reis	2c2abc3cae	Wire up new button with existing UI for adding comments.	2017-03-20 11:18:29 +00:00
Henry Oswald	ca3849c0c2	jpeg -> json	2017-03-20 11:08:42 +00:00
Paulo Reis	beac43741c	New add comment button.	2017-03-17 17:05:38 +00:00
Shane Kilkelly	a64f890ed0	Upgrade metrics api	2017-03-17 14:55:41 +00:00
Henry Oswald	625fa810c2	validate mongo id in getPrivilegeLevelForProject ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/	2017-03-17 14:44:51 +00:00
Henry Oswald	8ee2e5ba63	null check folder in findElement ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/	2017-03-17 13:29:20 +00:00
Henry Oswald	31b1c53faa	proxy jpg to blog backend ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/212236471/	2017-03-17 13:24:50 +00:00
Henry Oswald	e5468983ce	clone project plow though null doc/file/folders ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/	2017-03-17 13:21:30 +00:00
Henry Oswald	d453a4d5c7	null check stat when we check file on disk ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/	2017-03-17 13:03:16 +00:00
Shane Kilkelly	f2b5901776	wip: use new metrics.timeAsyncMethod	2017-03-16 10:59:18 +00:00
Henry Oswald	085cc7a0b2	json stringify and trim recommended currency	2017-03-14 17:53:48 +00:00
Shane Kilkelly	1ce48e971a	Merge branch 'sk-fix-file-upload'	2017-03-10 11:30:03 +00:00
James Allen	604aa7859e	Merge pull request #449 from sharelatex/ho-trust-blog-urls ... don't add /blog to the start of blog urls in annoucements	2017-03-09 13:28:36 +00:00
James Allen	6068ac8f88	Merge pull request #450 from sharelatex/pr-review-feature-page ... Review features page	2017-03-09 13:28:25 +00:00
James Allen	8f434cdd8b	Merge commit 'ab16aa9'	2017-03-09 11:36:22 +00:00
Shane Kilkelly	ec25ee9045	When upload to filestore fails, produce an error	2017-03-09 10:11:45 +00:00
James Allen	b75d0ab3eb	Don't show onboarding for newly registered users	2017-03-09 09:13:49 +00:00
Henry Oswald	63b84d3724	don't add /blog to the start of blog urls in annoucements ... also up timeout	2017-03-08 17:58:22 +00:00
Henry Oswald	d722f47b0f	add indentify option and uuid for users not logged in	2017-03-08 17:51:35 +00:00
Paulo Reis	a5e2ae3853	New URL; style adjustments.	2017-03-08 12:25:21 +00:00
James Allen	eb30c46458	Turn on track changes for everyone and take out of beta	2017-03-08 11:58:16 +00:00
James Allen	fb91219661	Don't submit comment on clicking cancel	2017-03-08 11:38:28 +00:00
James Allen	a4464a330c	Merge pull request #446 from sharelatex/ja-track-changes-module ... Pull track changes backend into a module	2017-03-06 11:27:11 +00:00
Paulo Reis	5459ae8daa	Prepare to use a static feature page.	2017-03-03 17:15:29 +00:00
James Allen	2b36a443c9	Pull track changes backend into a module	2017-03-02 16:45:24 +00:00
Brian Gough	e24873a945	Merge pull request #444 from sharelatex/bg-upgrade-pdfjs-1.7.225 ... upgrade pdfjs 1.7.225	2017-03-02 14:04:52 +00:00
Brian Gough	6f392f2270	upgrade pdfjs to 1.7.225	2017-03-02 09:31:23 +00:00
Henry Oswald	8db684bd2d	Update SystemMessageManager.coffee	2017-03-01 15:46:43 +00:00
Henry Oswald	1a9c035647	bring system message checks down to 1 min. ... can take ages when at 5 mins	2017-02-28 18:53:34 +00:00
Shane Kilkelly	34a1bd0e91	Merge branch 'master' into node-6.9	2017-02-24 11:27:32 +00:00
James Allen	e83c7dfe05	Merge pull request #429 from sharelatex/pr-collapse-overview-entries ... Collapse overview entries	2017-02-22 13:45:23 +01:00
Paulo Reis	519cd3c0bd	Avoid showing files in overview if the associated review entries object is still undefined.	2017-02-21 15:20:00 +00:00
James Allen	1b6cbdba1b	Merge pull request #428 from sharelatex/ja-translate-track-changes ... Translate track changes	2017-02-21 15:10:47 +01:00
James Allen	00fce4d2da	Merge branch 'master' into pr-collapse-overview-entries	2017-02-21 14:25:45 +01:00
James Allen	53a127cc65	Make consistent with file tree	2017-02-21 14:25:26 +01:00
James Allen	2553dfbf82	Translate placeholders	2017-02-21 14:19:46 +01:00
Paulo Reis	0b7863185c	Make expand/collapse indicator consistent with the one used in filetree.	2017-02-21 11:05:55 +00:00
James Allen	8c5800ceaf	Only render the entries that are visible in the text	2017-02-20 16:03:02 +01:00
Shane Kilkelly	9734f29086	Merge branch 'master' into node-6.9	2017-02-20 11:07:14 +00:00
James Allen	637cfa2e18	Translate tooltips	2017-02-20 11:51:06 +01:00
James Allen	44377ed03c	Fix typo	2017-02-17 16:37:49 +01:00
James Allen	71b13b3f43	Fix translation string	2017-02-17 16:30:06 +01:00
James Allen	f180b25850	Convert track changes text to translation strings	2017-02-17 16:28:53 +01:00
Paulo Reis	121b783b4a	Show number of entries per file, when collapsed.	2017-02-17 14:32:06 +00:00
Paulo Reis	1f92a494e7	Remove unneeded CSS animation.	2017-02-17 11:55:20 +00:00
Paulo Reis	0841ab8278	Add directive to collapse elements via height.	2017-02-17 11:24:21 +00:00
Henry Oswald	58c7dda945	fix couple of bad translations	2017-02-17 11:05:32 +00:00
Henry Oswald	debe78030a	use html from jade as strings now fully html escaped	2017-02-17 11:05:32 +00:00
James Allen	04b9f8d249	Merge branch 'master' into ja-track-changes	2017-02-16 17:07:12 +01:00
Paulo Reis	a639f13cb6	Bootstrap collapsing behavior in files list. Store state.	2017-02-16 15:48:58 +00:00
Shane Kilkelly	4945c0d478	Merge branch 'master' into node-6.9	2017-02-16 09:33:20 +00:00
Henry Oswald	5626be2913	change free trial from track changes to real-time-track-changes, conflict with old event	2017-02-15 12:39:29 +00:00
Henry Oswald	8cd3d21792	track read more clicks in announcements	2017-02-15 12:17:10 +00:00
James Allen	d01d6a35cf	Only create Controller when showing onboarding	2017-02-15 09:47:37 +01:00
Shane Kilkelly	2d0a7b2bdb	Merge branch 'master' into node-6.9	2017-02-14 14:42:35 +00:00
Paulo Reis	badc4ecb7a	Show add comment tooltip to the left when appropriate.	2017-02-14 14:40:21 +00:00
James Allen	b40b9add5a	Turn on track changes for beta users	2017-02-14 15:28:21 +01:00
James Allen	a0a4509edc	Avoid underscore (_) name overwriting	2017-02-14 15:26:36 +01:00
James Allen	03ceb23fcf	Update wording slightly	2017-02-14 15:23:02 +01:00
James Allen	c8096facfb	Merge pull request #421 from sharelatex/ho-announcments ... mark announcments before user signs up as read	2017-02-14 15:12:10 +01:00
James Allen	4dbc2c3066	Merge pull request #418 from sharelatex/pr-review-panel-onboarding ... Pr review panel onboarding	2017-02-14 15:00:39 +01:00
James Allen	bb3589ab2d	Merge pull request #420 from sharelatex/ja-track-changes ... List track changes in beta program	2017-02-14 14:41:57 +01:00
James Allen	b48f57c2cb	Submit comment on blur or selection change	2017-02-14 13:41:04 +01:00
Henry Oswald	27caf4d555	mark announcments before user signs up as read	2017-02-14 12:29:48 +00:00
Paulo Reis	594f2024d1	Style the onboarding prompt as a modal; close it when clicked outside.	2017-02-14 12:09:05 +00:00
James Allen	cc0986b4da	List track changes in beta program	2017-02-14 12:22:53 +01:00
Shane Kilkelly	621a07aff2	Merge branch 'master' into node-6.9	2017-02-14 11:01:14 +00:00
James Allen	3f2ebbcf91	Show message asking owner to upgrade if user is not owner	2017-02-14 11:18:22 +01:00
James Allen	34c07b97b9	Ensure showTrackChangesOnboarding is a boolean	2017-02-14 11:13:12 +01:00
James Allen	c08c8e09ff	Only show onboarding for users with track changes enabled	2017-02-14 11:09:37 +01:00
James Allen	03ecf4b4ae	Only show track changes onboarding once based on analytics API events	2017-02-14 10:25:46 +01:00
James Allen	c8baae84da	Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding	2017-02-13 16:51:16 +01:00
Paulo Reis	7dd9a3fa44	Add a dismiss button.	2017-02-13 15:49:58 +00:00
James Allen	6a4f0ace3b	Merge branch 'master' into pr-review-panel-onboarding	2017-02-13 16:19:56 +01:00
James Allen	f840a20f5c	Merge pull request #417 from sharelatex/pr-track-changes-upgrade-prompt ... Turn on track changes for beta users with upgrade prompt	2017-02-13 12:44:04 +01:00
James Allen	1d58efbca0	Don't enable for beta users just yet	2017-02-13 12:42:53 +01:00
James Allen	3334078fe6	Merge pull request #415 from sharelatex/ja-track-changes ... Don't animate review panel entries on toggle and resize	2017-02-13 12:17:45 +01:00
James Allen	e99c9a2065	Enable track changes for beta users	2017-02-13 12:09:47 +01:00
James Allen	47a66eed50	Merge branch 'ja-include-track-changes-feature' into pr-track-changes-upgrade-prompt	2017-02-13 11:50:56 +01:00
James Allen	4728077cca	Add track changes feature flag into model	2017-02-13 11:50:32 +01:00
James Allen	d7c40fa6ef	Run comments through same URL linking filter as chat	2017-02-13 10:05:48 +01:00
Paulo Reis	faef71d812	Wording.	2017-02-10 15:28:44 +00:00
Paulo Reis	a8a7589973	More style adjustments.	2017-02-09 17:13:23 +00:00
Paulo Reis	dd15cc06a0	Integrate playback state directive in tutorial videos; style adjustments.	2017-02-09 15:44:38 +00:00
Paulo Reis	d137b00822	Relayout the onboarding, making a video slideshow.	2017-02-08 17:19:29 +00:00
Paulo Reis	d792230bf0	Basic onboarding tutorial for track-changes.	2017-02-07 15:07:26 +00:00
Shane Kilkelly	6a161b4071	remove commented out code	2017-02-06 16:35:52 +00:00
Shane Kilkelly	7d5dc34b3e	fix the set-password form for new (admin-created) users	2017-02-06 14:58:54 +00:00
Paulo Reis	31102d30da	Update prompt title.	2017-02-06 12:24:20 +00:00
James Allen	6e39824e41	Fix language icons in language recommendation	2017-02-03 16:31:42 +01:00
James Allen	935847f2a1	Add track changes flag into user model	2017-02-03 14:47:04 +01:00
James Allen	343abfde23	Use user feature flags to determine track changes state	2017-02-03 14:36:11 +01:00
Paulo Reis	8f9e43f339	Handle track changles toggling when the feature is not enabled.	2017-02-02 12:12:14 +00:00
Paulo Reis	98b98005a6	Create and integrate track changes upgrade prompt.	2017-02-01 16:52:18 +00:00
Shane Kilkelly	5be65431f7	Fix sentry config	2017-02-01 10:55:01 +00:00
Shane Kilkelly	efdd777c89	Add a _headLinks block to layout	2017-01-31 15:43:53 +00:00
Shane Kilkelly	b0dd7475b0	fix pug syntax	2017-01-31 14:57:22 +00:00
Shane Kilkelly	83d0f26011	Merge branch 'master' into sk-pug	2017-01-31 10:18:53 +00:00
James Allen	ca11f5fa18	Merge pull request #400 from sharelatex/ja-goto-code-from-rp ... Jump to code when clicking on review panel entries	2017-01-31 10:49:13 +01:00
Shane Kilkelly	e2a207d618	Merge branch 'master' into sk-pug	2017-01-31 09:39:06 +00:00
James Allen	e7efa40c75	Merge pull request #401 from sharelatex/ja-spam-code-fixes ... Refactor rate limiting code around sending invites	2017-01-31 10:21:55 +01:00
Shane Kilkelly	4e9426e6bf	Merge branch 'master' into sk-pug	2017-01-30 14:36:10 +00:00
Shane Kilkelly	3ed85dad42	Merge branch 'master' into sk-upgrade-uuid	2017-01-30 11:09:50 +00:00
James Allen	b086d7afa2	Refactor rate limiting code around sending invites	2017-01-27 16:26:58 +01:00
Paulo Reis	15ad3f4769	Avoid stopping propagation, check event target instead.	2017-01-26 16:11:02 +00:00
James Allen	0479b01b9d	Jump to code when clicking on review panel entries	2017-01-26 16:04:08 +01:00
James Allen	abb4ef14d8	Streamline the update/rendering process to not do extra work	2017-01-26 15:08:30 +01:00
James Allen	32b0c6a4fb	Merge pull request #398 from sharelatex/ja-track-changes ... Fix style issues in IE 10	2017-01-25 15:55:15 +01:00
James Allen	757c7002eb	Merge pull request #397 from sharelatex/ja-modify-threads ... Allow editing/deleting of comments and threads	2017-01-25 15:50:00 +01:00
Paulo Reis	a924794a5a	Add expandable text area directive; apply it to review panel text areas.	2017-01-25 13:51:33 +00:00
Shane Kilkelly	e2f4fc3653	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 10:52:34 +00:00
Henry Oswald	3eb13ccdd1	fix stupid mistake	2017-01-25 10:38:39 +00:00
Henry Oswald	2a00b9c7a2	use user._id for error log	2017-01-25 10:33:30 +00:00
Shane Kilkelly	239164fe26	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 09:56:08 +00:00
Henry Oswald	cc717f0357	domainAnnouncementsToShow -> domainAnnouncements	2017-01-25 09:44:13 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	1280a2313d	add check for id to exist in domain announcments ... null check user at start of getUnreadAnnouncements fix spelling mistake	2017-01-25 09:35:11 +00:00
Henry Oswald	69ab275404	Update list.jade	2017-01-25 09:14:21 +00:00
James Allen	59c40ea5cc	Only show delete options when thread has more than one message!	2017-01-24 17:03:32 +01:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
James Allen	798e09f011	Don't show 'no comments' when submitting	2017-01-24 16:56:08 +01:00
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
Henry Oswald	2341a8481a	Merge branch 'master' into ho-promote-case-study	2017-01-24 14:49:35 +00:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
Shane Kilkelly	0add3ed66e	Merge branch 'master' into sk-upgrade-uuid	2017-01-23 10:04:31 +00:00
Shane Kilkelly	abbffb8e4b	Remove deprecated node-uuid package, replace with uuid.	2017-01-23 10:03:16 +00:00
Henry Oswald	9153ffac41	limit project name in email to 40 chars	2017-01-21 12:58:16 +00:00
Henry Oswald	74240e28c7	rate limit via ip the number of invite to project requests	2017-01-21 12:44:09 +00:00
Henry Oswald	6d35585847	limit number of invites each user can do ... done with the number of collaborators a user can add prevents notifications getting filled up as well	2017-01-21 12:43:15 +00:00
Shane Kilkelly	cfa2777d62	Merge branch 'sk-launchpad'	2017-01-20 13:58:16 +00:00
Shane Kilkelly	57cd54bf55	WIP: migrate from jade to pug	2017-01-20 12:03:02 +00:00
Paulo Reis	76ea469970	Reposition the track-changes indicator element to avoid issues with IE positioning.	2017-01-19 12:12:34 +00:00
Paulo Reis	5489514d7a	Add some compatibility style rules for IE10.	2017-01-18 15:38:34 +00:00
Shane Kilkelly	8922c9dbf5	New email layout for "testEmail"	2017-01-18 15:28:51 +00:00
James Allen	3413687833	Merge pull request #393 from sharelatex/ja-track-changes ... Ja track changes	2017-01-18 15:32:16 +01:00
James Allen	f97d36eb73	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-18 14:07:29 +01:00
Paulo Reis	329c6af168	Add a track-changes indicator in the editor, for when the review panel is closed.	2017-01-17 17:20:51 +00:00
James Allen	786c92b2fc	Don't show delete comment button (until it works)	2017-01-17 17:34:11 +01:00
Shane Kilkelly	707838baa4	Merge branch 'master' into sk-launchpad	2017-01-17 16:25:59 +00:00
Shane Kilkelly	59ab66fca2	Fix double-callback	2017-01-17 16:25:18 +00:00
James Allen	4d15fc30ba	Don't flash resolved comments when editor is loading	2017-01-17 16:55:18 +01:00
James Allen	5a34d17947	Toggle track changes in a project based on the owner's feature switch	2017-01-17 15:59:18 +01:00
Shane Kilkelly	d7251c6bfe	Merge branch 'master' into sk-launchpad	2017-01-17 14:55:08 +00:00
Shane Kilkelly	1137ab0715	Don't record redirect to static asset paths	2017-01-17 14:35:37 +00:00
James Allen	960d1e8b2f	Only call /project/.../threads if we need the threads	2017-01-17 15:04:49 +01:00
Shane Kilkelly	70c7e32e58	Add a 'testEmail' email type	2017-01-17 10:52:04 +00:00
James Allen	9c0bf885be	Merge branch 'master' into ja-track-changes	2017-01-17 10:16:41 +01:00
Paulo Reis	36f15ff56e	Avoid empty comment submission.	2017-01-16 17:14:06 +00:00
Paulo Reis	121629426e	Avoid empty comment replies.	2017-01-16 17:06:57 +00:00
James Allen	bf56952f88	Make overview panel entries jump to place in doc again	2017-01-16 15:31:51 +01:00
James Allen	d4f60977fd	Add loading indicator while submitting new comments	2017-01-16 15:25:10 +01:00
James Allen	e5c96eb619	Focus on text area when adding a comment	2017-01-16 15:17:56 +01:00
James Allen	278bfc1f50	Use 'show all' instead of 'more'	2017-01-16 15:06:47 +01:00
Shane Kilkelly	82ddeab2bd	If user tries to invite themselves to project, don't.	2017-01-16 13:45:01 +00:00
Shane Kilkelly	635b935acc	Add an acceptance test for login rate limits, cleanup	2017-01-16 11:46:59 +00:00
Henry Oswald	fed88504f8	rate limit emails sent sharing projects by users	2017-01-14 14:52:32 +00:00
Shane Kilkelly	25956d4c62	Fix up tests	2017-01-13 16:04:26 +00:00
Paulo Reis	3968761ac8	Add collapsing behaviour to resolved comments.	2017-01-13 15:37:24 +00:00
Paulo Reis	5eece9f5d9	Add collapsing behaviour to long entries.	2017-01-13 15:30:31 +00:00
James Allen	b6ea338ff8	Separate resolved comments so they don't affect review panel	2017-01-13 15:27:45 +01:00
Shane Kilkelly	525e871d55	Merge branch 'master' into sk-rate-limit-cluster	2017-01-13 14:17:18 +00:00
James Allen	bf7038f506	Adapt review panel line height to editor	2017-01-13 14:52:08 +01:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Paulo Reis	823c2c854a	Add styling to have left-based layout when there is no space on the right.	2017-01-12 17:06:08 +00:00
Paulo Reis	e3e8541a63	Add class when review panel should layout to the left.	2017-01-12 16:49:47 +00:00
Shane Kilkelly	d17483fd47	Merge branch 'sk-top-menu-rework'	2017-01-12 13:24:47 +00:00
James Allen	a42cc48be8	Fix doc names and sort order in resolved comments dropdown	2017-01-12 13:44:54 +01:00
James Allen	8e0c2ff0b3	Adjust resolved comments buttons and add tooltip	2017-01-12 13:37:44 +01:00
Henry Oswald	daee77f052	Merge pull request #387 from sharelatex/pr-email-template-improvements ... Email template improvements	2017-01-12 12:34:35 +00:00
James Allen	f9b8ada215	track changes for anonymous users	2017-01-12 13:29:57 +01:00
James Allen	0d02b860d9	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-12 13:08:57 +01:00
Paulo Reis	0b57cc650b	Fix merge mistake; adjust animation timings.	2017-01-12 11:56:04 +00:00
James Allen	64b9fe52dd	Handle deleted users in comments gracefully	2017-01-12 12:31:01 +01:00
Paulo Reis	88b694f894	Animate comment resolving.	2017-01-12 11:25:36 +00:00
James Allen	9a867438b2	Always show user name next to comment	2017-01-12 12:06:02 +01:00
James Allen	e7ab92b7c9	Only show users controls they have permission to use	2017-01-12 11:52:39 +01:00
Shane Kilkelly	5c25d15a18	WIP: try switch to rolling rate limiter	2017-01-12 09:25:18 +00:00
Paulo Reis	d701c1ef5e	Make the dropdown scrollable.	2017-01-11 11:25:18 +00:00
Paulo Reis	931187bd8b	Add a backdrop to the dropdown (to close when clicked outside).	2017-01-11 10:53:46 +00:00
Shane Kilkelly	411cb4330c	Fix typo in hyperlink	2017-01-11 10:39:34 +00:00
Shane Kilkelly	731f280e2e	Move auth parts of top menu out of config and into web templates. ... Move the remaining configuration into a new config var: `nav.header_extras`. Add a `nav.showSubscriptionLink` var to control visibility of subscription link in the Account menu. This will allow admins to more easily configure extra links in the top navigation bar, without the danger of overwriting the important auth menus.	2017-01-11 10:27:38 +00:00
Paulo Reis	72baed60ef	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 16:29:36 +00:00
Paulo Reis	010612aacc	Keep track of resolved threads in the dropdown.	2017-01-10 16:29:27 +00:00
James Allen	f17ce2705c	Don't include wrapper for resolved comments, since it throws the review panel layout off	2017-01-10 17:17:07 +01:00
Shane Kilkelly	f5ced03074	Set redirect when sending user to login page. ... Allows smart redirecting to work when public access is turned off.	2017-01-10 15:42:36 +00:00
James Allen	f31fa98679	Sync track changes state between sessions and client	2017-01-10 16:11:12 +01:00
James Allen	85c613e161	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 13:44:01 +01:00
James Allen	d03aa7056e	Rename /ranges/users end point to /changes/users	2017-01-10 13:43:53 +01:00
Paulo Reis	5bd49c08f8	Simpler resolved comments dropdown data structure.	2017-01-10 12:16:58 +00:00
Paulo Reis	072044ee90	Remove thread from view collection; some clean-up.	2017-01-10 11:23:06 +00:00
Paulo Reis	32fb317820	Add delete action to the dropdown.	2017-01-10 10:33:54 +00:00
Paulo Reis	70134d44d0	Add unresolve action to the dropdown.	2017-01-09 17:22:01 +00:00
James Allen	4e128b6ab7	Send user data in /threads dat	2017-01-09 17:25:06 +01:00
Paulo Reis	1a100b77df	Hide resolved comments from the review panel.	2017-01-09 15:15:03 +00:00
James Allen	35bdb4383a	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes ... Conflicts: public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee	2017-01-09 16:11:59 +01:00
Paulo Reis	037389b7dd	Decouple ranges update from the overview panel; integrate it with the dropdown.	2017-01-09 14:59:01 +00:00
James Allen	43f6b9de7c	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
James Allen	9379cff89d	Add end point for accepting change in doc updater	2017-01-09 15:25:27 +01:00
Paulo Reis	0478fcd925	Add comment resolution info.	2017-01-06 15:24:33 +00:00
James Allen	cb24e9390a	Fix comments in overview panel	2017-01-06 14:17:57 +01:00
James Allen	beb94b0756	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-06 13:42:08 +01:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
Paulo Reis	42585085c0	Integrate new directive, plumb data into it. More styling.	2017-01-06 12:00:17 +00:00
Henry Oswald	0b67265eb6	use admin email for closed site	2017-01-06 11:32:57 +00:00
Paulo Reis	a1435d13a3	Basic structure for the resolved comments dropdown.	2017-01-05 17:15:27 +00:00
Henry Oswald	862e15b842	log out user id and anonymous when loading editor	2017-01-05 15:02:10 +00:00
Paulo Reis	d13035a4f4	Simpler UI for comments; remove some unused code.	2017-01-05 11:50:43 +00:00
James Allen	60152e219b	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-04 16:26:08 +01:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00
Paulo Reis	fdafcf9677	Restyle insertions and deletions - increasing info density.	2017-01-04 15:24:49 +00:00
Shane Kilkelly	7bbbfe20b9	If external auth is used, remove /register items from header nav. ... (logic moved from docker-image settings file)	2016-12-21 13:50:13 +00:00
Shane Kilkelly	64f69069b2	Experimental: upgrade to node 6.9.2 (latest LTS release)	2016-12-21 10:23:42 +00:00
Shane Kilkelly	259c589076	Add option to restrict invites to existing user accounts.	2016-12-20 09:54:42 +00:00
Shane Kilkelly	822f76a883	Add unit tests for RedisWrapper	2016-12-19 15:12:22 +00:00
Shane Kilkelly	d428f9adbc	Make LoginRateLimiter a thin wrapper around RateLimiter	2016-12-19 14:10:51 +00:00
Shane Kilkelly	03b541fb64	Fix small mistakes	2016-12-19 14:10:27 +00:00
Shane Kilkelly	9f787943b6	Remove stray redis imports.	2016-12-19 12:17:23 +00:00
Shane Kilkelly	ef0a5801d5	Create a RedisWrapper, and use it for rate limiting.	2016-12-19 12:17:02 +00:00
Paulo Reis	d6fcc21ab5	Add support for GMail go-to actions in the single CTA template.	2016-12-16 17:04:26 +00:00
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +00:00
Paulo Reis	869f729132	Fix forgotten templating function.	2016-12-16 15:15:06 +00:00
Paulo Reis	ca5040882f	Use the new template in the join group email.	2016-12-16 14:57:59 +00:00
Paulo Reis	0fe3664a82	Use the new template in the reset pwd email.	2016-12-16 12:16:45 +00:00
Paulo Reis	2234c438a1	Support a secondary message in the single CTA email template.	2016-12-16 12:16:33 +00:00
Paulo Reis	7dfc2c61a6	Make the CTA button text configurable.	2016-12-16 10:06:56 +00:00
Paulo Reis	47a5eb5382	Add a new layout and body template for e-mails.	2016-12-15 17:22:39 +00:00
James Allen	898277b4af	Refactor ops model so it all happens in Document	2016-12-13 17:34:29 +00:00
James Allen	0a6a6c3c28	Keep files ordered in overview panel in the same was as the file tree	2016-12-09 16:17:28 +00:00
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1d426e538f	Load ranges from docupdater and toggle track changes when possible	2016-12-08 14:10:30 +00:00
James Allen	1830d41eba	Proxy ranges between doc updater and docstore	2016-12-08 14:09:06 +00:00
Paulo Reis	42bd1852c6	Use HTML binding in the excerpt.	2016-12-07 15:45:22 +00:00
Paulo Reis	58ab888f3f	Add a button to show all, when filtering new items.	2016-12-07 14:57:54 +00:00
Paulo Reis	c716b86def	Add logic to dismiss unread announcements, styling fixes.	2016-12-07 14:26:10 +00:00
Henry Oswald	e6eeb86046	add read property to announcments	2016-12-07 11:39:22 +00:00
Paulo Reis	821e556dd3	Better handling of overflowing content.	2016-12-06 17:15:56 +00:00
Paulo Reis	c1355e64b3	Merge branch 'master' into pr-style-announcements	2016-12-06 15:42:24 +00:00
Paulo Reis	6a9ab1f525	Style adjusments; make announcements close when backdrop is clicked.	2016-12-06 14:17:30 +00:00
Shane Kilkelly	a5d2183441	if Recurly error, parse body xml rather than using regex match	2016-12-06 10:39:59 +00:00
Shane Kilkelly	58280bf6ee	Merge branch 'master' into sk-user-delete-with-cancelled-sub	2016-12-06 09:31:42 +00:00
Paulo Reis	a00acd7458	Add animations and state toggling.	2016-12-05 15:32:38 +00:00
James Allen	48cc5a992f	Merge branch 'master' into ja-set-version-in-docstore	2016-12-01 09:30:53 +00:00
Shane Kilkelly	e03d16e0cd	Deleting user: if subscription is already cancelled, ignore and proceed.	2016-11-30 16:03:18 +00:00
James Allen	34276520d8	Merge pull request #379 from sharelatex/sk-show-user-email ... Add a `user_email` option to the nav "Account" dropdown.	2016-11-30 15:49:34 +00:00
Shane Kilkelly	d38890e9f4	Add the rolling option to session	2016-11-30 09:41:58 +00:00
James Allen	eb648b9bc8	Proxy version number to and from docstore	2016-11-29 17:16:56 +00:00
Paulo Reis	73e0a63689	Basic mark-up and styles. Change the controller to hold all notifications.	2016-11-29 17:12:53 +00:00
Shane Kilkelly	cf94429e05	Add a user_email option to the nav "Account" dropdown.	2016-11-29 16:04:20 +00:00
Henry Oswald	68ddf04fe8	to string record event check	2016-11-29 14:38:45 +00:00
Henry Oswald	6e9458e9e1	wip	2016-11-29 14:38:25 +00:00
Henry Oswald	aacdb1e96b	to string record event check	2016-11-28 19:19:00 +00:00
Shane Kilkelly	a03ac8fe72	More robust session destruction after deleting user account.	2016-11-28 12:37:53 +00:00
Shane Kilkelly	d15659ed85	check user is present before accessing email	2016-11-28 12:01:11 +00:00
Shane Kilkelly	52462d7020	Merge branch 'sk-sync-details-from-sso'	2016-11-28 10:11:59 +00:00
Shane Kilkelly	395135a655	Merge branch 'sk-post-login-redirect'	2016-11-28 09:52:14 +00:00
Shane Kilkelly	acce8853ba	Remove redundant baseUrl from plans page.	2016-11-25 15:24:50 +00:00
Shane Kilkelly	2ab5ad4230	If we're updating details from a SSO source, don't allow editing on settings page.	2016-11-25 14:38:00 +00:00
Henry Oswald	4b59fdd453	added missing settings file to announcments controller	2016-11-25 11:59:50 +00:00
Henry Oswald	f130470971	log ip address of user when logging in	2016-11-25 11:59:50 +00:00
Paulo Reis	ecd81738cb	Restyle toggle.	2016-11-24 15:55:09 +00:00
Shane Kilkelly	167f01857a	Remove stray next params.	2016-11-24 14:15:01 +00:00
Shane Kilkelly	4cc4a4e264	Merge branch 'master' into sk-post-login-redirect	2016-11-24 14:02:38 +00:00
Shane Kilkelly	22101d0305	If user is sent to login page with explicit redirect, obey	2016-11-24 11:38:13 +00:00
Paulo Reis	1148b00c9a	Add review header item.	2016-11-23 16:53:13 +00:00
Paulo Reis	8d933d9b5f	Toggler style adjustments.	2016-11-23 16:10:35 +00:00
Paulo Reis	f61aac0bb3	Make toggler label clickable.	2016-11-23 14:44:04 +00:00
Paulo Reis	e655e85e6d	Integrate toggler in review panel.	2016-11-23 14:34:55 +00:00
Paulo Reis	ba5118d02a	Merge branch 'master' into ja-review-panel	2016-11-23 10:41:20 +00:00
Paulo Jorge Reis	ff0a5395e5	Merge pull request #374 from sharelatex/pr-wrap-ab-test-header ... PR Wrap header labels AB test	2016-11-23 09:49:53 +00:00
Shane Kilkelly	cee3326ce3	fix omission of 'length'	2016-11-22 17:06:05 +00:00
Shane Kilkelly	f9b1862ddb	Merge branch 'master' into sk-post-login-redirect	2016-11-22 16:54:12 +00:00
Shane Kilkelly	8a4352fff2	Set redirect when redirecting from restricted	2016-11-22 16:54:03 +00:00
Shane Kilkelly	2edd75de96	Allow the 500/Error page to render, even if res.locals aren't set up yet.	2016-11-22 16:48:13 +00:00
Shane Kilkelly	8089bb55a4	use session for the post-login redirect, remove redir query string.	2016-11-22 14:24:36 +00:00
Paulo Reis	dce272462a	Remove test-related mark-up.	2016-11-22 10:39:56 +00:00
James Allen	db93bc8cff	Grey out and add extra info to resolved comments	2016-11-21 17:13:17 +00:00
Paulo Reis	fc6730f5bf	Lower brightness in smaller username text spans; limit avatar text to 1 char.	2016-11-21 14:51:01 +00:00
Paulo Reis	ad857a15f9	Style resolved comments in the current file pane.	2016-11-21 11:16:23 +00:00
James Allen	5814d93f5e	Order entries in the overview panel based on their place in the document	2016-11-18 16:30:41 +00:00
James Allen	6ea61472ec	Add tooltip to add comment indicator	2016-11-18 16:08:02 +00:00
Paulo Reis	f029c7a7b2	Control click behaviour on comments; relayout when toggling panels.	2016-11-18 15:08:16 +00:00
Shane Kilkelly	da1be67aff	Merge branch 'sk-ext-auth-show-email'	2016-11-18 09:34:05 +00:00
James Allen	bf20799478	Allow comments to be resolved an deleted	2016-11-17 18:06:08 +00:00
James Allen	7a8af8a21a	Show file names in overview panel	2016-11-17 16:05:12 +00:00
James Allen	4a93e02407	Goto a change when clicked in the overview panel	2016-11-17 15:55:18 +00:00
Shane Kilkelly	6606375cd7	Remove dead code: SessionInvalidator	2016-11-17 15:27:58 +00:00
Shane Kilkelly	fa146a1558	Remove redundant !!	2016-11-17 14:48:15 +00:00
Shane Kilkelly	3b8fbe8249	If using external auth, show non-editable email field. ... Also defend server-side against setting email when using external auth.	2016-11-17 14:34:02 +00:00
James Allen	15d8f6c661	Sort out scroll bar positions and scroll position transitions	2016-11-17 14:29:35 +00:00
James Allen	e2f21a67d2	Sort of positioning and scrolling of overview panel	2016-11-17 12:09:07 +00:00
James Allen	1e8f2a89a1	Refactor layout and CSS to be more manageable with overview classes	2016-11-17 11:47:20 +00:00
Paulo Reis	f170fd4b83	Refactor Ace directive to have a single events bridge.	2016-11-17 10:40:08 +00:00
Paulo Reis	706b0793ab	Pull callouts into entries directives.	2016-11-16 16:21:24 +00:00
Paulo Reis	32b3ba6bbb	Pull indicators into entries directives.	2016-11-16 16:13:39 +00:00
Paulo Reis	6153bd3022	Wrap add comment entries in a directive	2016-11-16 15:47:05 +00:00
Paulo Reis	24f82c3c35	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 15:34:49 +00:00
James Allen	fc3fd5c73c	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 15:27:48 +00:00
James Allen	379afe4aa5	Refactor scroll handling into directive	2016-11-16 15:23:29 +00:00
Paulo Reis	00a6df156b	Wrap comment entries in a directive	2016-11-16 15:12:58 +00:00
Paulo Reis	9ffb05cd98	Wrap insert and delete entries in a directive	2016-11-16 14:56:34 +00:00
Brian Gough	277894631a	try out new pdfjs font fix ... https://github.com/mozilla/pdf.js/pull/7705	2016-11-16 14:50:09 +00:00
Paulo Reis	d7d21b106c	Isolate review-panel markup.	2016-11-16 14:42:07 +00:00
Shane Kilkelly	f9774141b1	Fix up makeRequest, so it copes with analytics.url being un-configured.	2016-11-16 14:40:38 +00:00
James Allen	479ea83e36	Dump everything (unstyled) into the review panel	2016-11-16 13:51:30 +00:00
James Allen	711f282575	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 13:26:33 +00:00
Paulo Reis	f640c17d4d	Add review panel substate toggling.	2016-11-16 12:31:47 +00:00
Paulo Reis	db5dc6ef15	Positive action buttons on the right.	2016-11-16 11:03:29 +00:00
James Allen	b443c5d7dc	Make mini review panel entries scroll and stack like main panel	2016-11-15 17:07:06 +00:00
James Allen	829ccb6641	Resize on toggling review panel	2016-11-15 16:21:45 +00:00
Paulo Reis	8a11c8c3ca	Show add comment button when review panel is off.	2016-11-15 16:02:12 +00:00
James Allen	09074f5413	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-15 15:48:17 +00:00
James Allen	4542d1094d	Keep separate persistent change tracker for each doc	2016-11-15 15:48:12 +00:00
Henry Oswald	5b3cd7ed2b	use makeRequest func in analytics manager	2016-11-15 15:36:26 +00:00
Paulo Reis	7bf55823b2	Hide review panel when there are no entries.	2016-11-15 15:04:29 +00:00
Henry Oswald	a822cc0c92	don't log events from health check user	2016-11-15 13:41:15 +00:00
Henry Oswald	6776aa61f1	use new way to send status in express for healthcheck controlller	2016-11-15 11:04:13 +00:00
Henry Oswald	411b5324df	don't try and send requests when analytics isn't enabled	2016-11-15 10:54:48 +00:00
Henry Oswald	d87067bc2f	Merge branch 'announcments'	2016-11-15 10:38:01 +00:00
Henry Oswald	15564102a0	Update ProjectController.coffee	2016-11-15 10:34:57 +00:00
Paulo Reis	0c600ba9b8	Support overflowing panes in UI layout.	2016-11-15 10:34:19 +00:00
Shane Kilkelly	6c381b127c	Count saml as an external authentication system.	2016-11-14 13:33:48 +00:00
James Allen	c89579e1df	Focus on the focused change	2016-11-14 12:47:46 +00:00
Paulo Reis	7201bde2a3	Add comment UI.	2016-11-14 11:19:00 +00:00
Henry Oswald	e397b76fba	commended out jade so can go live with rest of code quietly	2016-11-14 10:54:36 +00:00
Henry Oswald	47ed17aab3	remove unneeded package and comma in jade	2016-11-14 10:50:49 +00:00
Henry Oswald	666bfdf967	stop the /announcements call at controller level	2016-11-11 17:15:36 +00:00
Henry Oswald	5a13ee1077	use anlaytis api ... - don’t talk to postgres - show recent blog post announcments - proxy all events to analytics api	2016-11-11 17:03:09 +00:00
James Allen	747e14dffe	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-11 16:16:10 +00:00
Paulo Reis	d04d7f834e	Adjustments in the threaded comments, mocked comments responses.	2016-11-11 16:10:26 +00:00
James Allen	9509e87dc1	Update entries in place and position via DOM attributes directly	2016-11-11 16:09:32 +00:00
Shane Kilkelly	2cf2199964	WIP: enable non-csrf routes from modules	2016-11-11 13:48:29 +00:00
Paulo Reis	6c5c1549b6	Add comment replies via enter keypress.	2016-11-11 10:51:32 +00:00
Paulo Reis	78e409593b	Threaded comments.	2016-11-10 17:19:41 +00:00
Paulo Reis	8dcbb6ea4f	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-10 15:09:56 +00:00
Paulo Reis	c5e6ca5200	More entry styling.	2016-11-10 15:08:41 +00:00
James Allen	593e59450b	Use different UserSessions keys for cluster vs normal redis session store	2016-11-10 14:31:48 +00:00
Paulo Reis	997addf355	More entry header styling + entry body.	2016-11-10 12:35:35 +00:00
James Allen	4e2dd55cfd	Fix merge issues	2016-11-10 10:53:30 +00:00
James Allen	812ee82af1	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade	2016-11-10 10:52:40 +00:00
James Allen	34b2b665a3	Accept and reject changes	2016-11-10 10:52:09 +00:00
Paulo Reis	950fc0179c	Basic support for action icons.	2016-11-10 10:19:52 +00:00
James Allen	ca178c1a85	Fix indentation	2016-11-09 17:12:01 +00:00
James Allen	f62d95dd8c	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 17:11:02 +00:00
James Allen	2e719fc450	Start adding callouts in review panel	2016-11-09 17:10:58 +00:00
Paulo Reis	013df17192	Entry header layout.	2016-11-09 17:09:57 +00:00
Paulo Reis	f28119aacb	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 16:36:12 +00:00
Paulo Reis	341a092231	Merge + basic layout for entries.	2016-11-09 16:36:06 +00:00
James Allen	184b421b1f	Show user name in comments	2016-11-09 16:34:23 +00:00
James Allen	b44f1cde10	Add user data into changes	2016-11-09 16:23:08 +00:00
Paulo Reis	19241e571f	Distinguish between inserts and deletes in the entries repeater.	2016-11-09 15:58:03 +00:00
James Allen	c5532bd8a3	Add cancel buttons for comments	2016-11-09 15:51:40 +00:00
James Allen	6d7f4e9e6a	Add basic comment replying	2016-11-09 15:25:41 +00:00
James Allen	707ed43a7d	Very crude adding of comments	2016-11-09 14:50:58 +00:00
Shane Kilkelly	c3860dd7a7	Remove stray commented-out code, use mapSeries instead of map.	2016-11-09 14:36:25 +00:00
James Allen	446ca7212a	Track timestamps of changes	2016-11-09 12:19:48 +00:00
Shane Kilkelly	f6de4cbb44	Merge branch 'master' into sk-sessions-cluster	2016-11-09 12:10:46 +00:00
Shane Kilkelly	5f3098df38	Replace multi-ops with Async.series, tests passing	2016-11-09 11:03:03 +00:00
James Allen	064ae1945a	Toggle review panel and track changes with ui elements	2016-11-08 16:43:01 +00:00
Shane Kilkelly	bfa0e7cf89	WIP: start moving web sessions to cluster	2016-11-08 15:32:36 +00:00
Henry Oswald	d556cbaacf	Merge pull request #361 from djwf/master ... Pass ignoreTLS option to nodemailer	2016-11-08 11:26:42 +00:00
Brian Gough	6f41dddb42	disable spell check for anonymous users ... these requests always fail	2016-11-04 16:03:18 +00:00
Brian Gough	307f08e6bb	Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down ... lock editor when connection down	2016-11-04 11:04:30 +00:00
Brian Gough	49a06f8489	modal for lost connection	2016-11-03 12:37:44 +00:00
James Allen	091eb7e462	Merge branch 'master' into ja-review-panel ... Conflicts: public/coffee/ide.coffee public/stylesheets/app/editor.less	2016-11-03 10:07:37 +00:00
David J. Weller-Fahy	5efee51ed8	Pass ignoreTLS option to nodemailer	2016-11-02 13:14:54 -04:00
Paulo Reis	559350eaa2	Avoid showing the history upgrade teaser when user is not the project owner.	2016-11-02 16:08:47 +00:00
Shane Kilkelly	e7b09a81a7	Merge branch 'sk-passport-ldap'	2016-11-02 15:39:32 +00:00
Paulo Jorge Reis	74d8fb103b	Merge pull request #358 from sharelatex/pr-latex-linter-onboarding ... Code-checker onboarding	2016-11-02 13:58:06 +00:00
Henry Oswald	fde9ab60cc	remove left-menu-upgraed-rotation ab test	2016-11-02 10:24:03 +00:00
Henry Oswald	11a097c9a6	remove some old sixpack tests	2016-11-02 10:09:12 +00:00
Shane Kilkelly	a63f7685b8	Move the planCode logic for Collaborator into a helper function.	2016-11-02 09:56:33 +00:00
Paulo Reis	c18114bfeb	Different strategy for highlighting the code-check setting.	2016-11-01 17:30:27 +00:00
Paulo Reis	840d52ef1a	Remove default value from user model, but add it upon creation (i.e. affecting new users).	2016-11-01 16:36:26 +00:00
Paulo Reis	8c182c2ccd	Show code-check option for non-beta users.	2016-11-01 15:26:26 +00:00
Brian Gough	585f8681ea	enable syntax validation for all users ... (by defining aceWorker)	2016-11-01 15:02:32 +00:00
Shane Kilkelly	9cb3d8c4b8	Enable hook from module into passport init.	2016-11-01 14:06:54 +00:00
Paulo Reis	06629e05d4	Include teaser media and do some style adjustments.	2016-11-01 11:36:21 +00:00
Paulo Reis	aa58b70d43	Improve visibility logic.	2016-10-31 20:18:08 +00:00
James Allen	8368577867	Merge branch 'master' into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade public/coffee/ide.coffee public/coffee/ide/editor/directives/aceEditor.coffee	2016-10-31 16:42:55 +00:00
Paulo Reis	97b92928dc	Merge branch 'master' into pr-latex-linter-onboarding	2016-10-28 16:36:10 +01:00
Paulo Reis	4721fd450c	Improve condition to avoid linking sixpack directives when project loads.	2016-10-28 14:40:04 +01:00
Paulo Reis	8157f68393	Avoid linking sixpack directives when project loads.	2016-10-28 14:23:16 +01:00
Shane Kilkelly	5c8cdd22cc	Merge branch 'sk-account-delete-pass'	2016-10-28 11:02:41 +01:00
Shane Kilkelly	6e6211bde6	Merge branch 'sk-plain-text-emails-all'	2016-10-28 11:02:33 +01:00
Shane Kilkelly	4c092e7ff1	Remove deprecated "projectSharedWithYou" email.	2016-10-28 10:37:10 +01:00
Shane Kilkelly	164c8a091f	Move the scripts block after jQuery has been loaded and CDN logic. ... Fixes issue on the update-billing-info page.	2016-10-28 10:18:20 +01:00
Shane Kilkelly	751a116921	add plainTextTemplate to all emails	2016-10-27 14:41:13 +01:00
Paulo Reis	1c4183e7b1	Merge branch 'master' into pr-ab-test-history-teaser	2016-10-27 12:35:11 +01:00
Paulo Reis	5dddbec5b2	Add AB test conversion.	2016-10-27 12:06:36 +01:00
Paulo Reis	991626692b	Track subscriptions in metabase with AB test variant.	2016-10-27 12:05:32 +01:00
Paulo Reis	5a82cebcff	Make the history teaser message look like a modal.	2016-10-27 11:12:22 +01:00
Paulo Reis	04f8b3adfa	Adapt mark-up to history teaser, add some styles.	2016-10-27 10:30:10 +01:00
Shane Kilkelly	1538f140f3	update test timestamp	2016-10-27 09:41:51 +01:00
Paulo Reis	b5494c1730	Basic test mark-up structure.	2016-10-26 15:48:03 +01:00
Shane Kilkelly	dfd13e0815	Update AB test timestamp	2016-10-26 14:24:00 +01:00
Shane Kilkelly	d912c3b487	Merge branch 'master' into sk-plans-tidy	2016-10-26 13:47:26 +01:00
Shane Kilkelly	dc62b1a86e	Remove deprecated endpoint for old delete-user	2016-10-26 11:18:36 +01:00
Paulo Reis	70c7880639	Style adjustments.	2016-10-26 11:12:34 +01:00
Shane Kilkelly	7cc26f2207	Disable autocomplete on user-delete form	2016-10-26 10:57:54 +01:00
Shane Kilkelly	fc7bd4c2d3	fix logging	2016-10-26 10:57:34 +01:00
Shane Kilkelly	1c8721ceab	Functioning account deletion with password	2016-10-25 16:23:50 +01:00
Brian Gough	baf09e4f3a	avoid exception in LoggerSerializers	2016-10-25 15:50:05 +01:00
Brian Gough	bb06b97b3c	avoid exception in logging null user	2016-10-25 15:01:59 +01:00
Paulo Reis	f4849201aa	Merge branch 'master' into pr-latex-linter-onboarding	2016-10-25 15:00:26 +01:00
Shane Kilkelly	efe6df145c	WIP: ask for password when deleting account	2016-10-25 14:33:47 +01:00
Brian Gough	3519fbe337	add worker-latex.js to fingerprints	2016-10-25 14:18:37 +01:00
Brian Gough	a02d245b78	added missing dependency on ace/ace for modelist	2016-10-25 14:16:52 +01:00
Brian Gough	d6333d2955	Merge pull request #346 from sharelatex/bg-use-ace-mode-detection ... use ace mode detection	2016-10-25 13:54:05 +01:00
Shane Kilkelly	6069d4dba3	Merge branch 'master' into sk-plans-tidy	2016-10-25 13:14:44 +01:00
Shane Kilkelly	e268275e77	Fix participate/convert flow for plan tests	2016-10-25 10:47:14 +01:00
Paulo Reis	27dfa91683	Add dismiss button.	2016-10-24 12:20:15 +01:00
Shane Kilkelly	667c7ce520	Show correct number of collaborators for plans	2016-10-24 11:47:01 +01:00
Shane Kilkelly	c051b56abf	Cloak plans until they have loaded	2016-10-24 11:24:28 +01:00
Henry Oswald	450946212a	log out health check failures	2016-10-21 18:59:28 +01:00
Shane Kilkelly	8c1d110688	Remove debug logs	2016-10-21 16:21:21 +01:00
Shane Kilkelly	d5a7514923	Add AB test for plans (+15 squashed commits) ... Squashed commits: [45c2237] Add a `subscription-form-switch-to-student` event [1ad9b8f] change experiment name, and re-enable switch-to-student workflow [f7cdb78] Remove debug [4b9778a] Incorporate collaborator alternative plans [701e80b] Add collaborator plans for heron and ibis [287aa0f] AB test plans from editor page [c74052e] Fix change-plan view for default plans [1a947d6] Use correct plan codes [1eecda7] Adjust prices [69c4c7b] Introduce two plans [8b8d5f8] Rename sixpack experiment [c332002] Fix up the change-plan page [c7af52d] Overhaul change-plan page, show only plans from current generation [33d86bf] update plan [5bbd946] Add a basic plans AB test	2016-10-21 16:17:37 +01:00
Paulo Reis	4d33b11ce5	Restrict the appearance of the onboarding view.	2016-10-21 15:00:52 +01:00
Paulo Reis	777b28b443	Add animation and other styling items. Small refactor with Less vars.	2016-10-21 12:02:53 +01:00
Paulo Reis	ac07ba035b	Navigation in onboarding UI.	2016-10-20 16:39:43 +01:00
Brian Gough	7258e947a8	use ace modelist extension to auto-detect mode	2016-10-20 16:03:19 +01:00
James Allen	8f9a4882c8	Don't let widgets in review panel overlap	2016-10-20 15:04:10 +01:00
Paulo Reis	e60f67dacb	Bootstrapping.	2016-10-20 12:24:07 +01:00
James Allen	2b94c69795	Don't use the trackChanges engine in the history editor panel	2016-10-20 12:19:57 +01:00
James Allen	e717caab7f	Merge branch 'master' into ja-review-panel	2016-10-18 16:52:41 +01:00
Henry Oswald	1beca53b3d	project name should be clickable href in invite email	2016-10-18 15:53:56 +01:00
Brian Gough	cf09a9ed83	Merge pull request #344 from sharelatex/bg-upgrade-pdfjs ... upgrade pdfjs	2016-10-14 17:03:13 +01:00
Henry Oswald	a02da61cb0	fixed email sender tests looking for wrong settings	2016-10-14 16:43:59 +01:00
Brian Gough	991486ab60	make html valid (div not allowed in p tag)	2016-10-13 16:10:02 +01:00
Brian Gough	0bd36a9e3b	fix comment	2016-10-13 16:10:02 +01:00
Brian Gough	27a8dc1dfd	upgrade pdfjs to 1.6.210p1	2016-10-13 16:10:01 +01:00
James Allen	4999ed30f8	Merge branch 'master' into ja-review-panel	2016-10-13 14:22:43 +01:00
James Allen	7a4bebd785	Allow review panel to be toggled	2016-10-13 14:22:23 +01:00
Henry Oswald	bfeb7e082f	added textEncoding option for email	2016-10-13 14:22:08 +01:00
James Allen	fc782581ea	Change review panel to feel like part of ace	2016-10-12 17:27:20 +01:00
Shane Kilkelly	3ec0e65ae1	Merge branch 'master' into sk-end-subform-test	2016-10-12 14:34:55 +01:00
James Allen	c689937297	Merge pull request #338 from sharelatex/ja-track-changes ... Ja track changes	2016-10-12 09:21:46 +01:00
Shane Kilkelly	e706057677	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-10-11 14:44:09 +01:00
Shane Kilkelly	8fcc58495e	Use a new key for the delete-account warning	2016-10-11 14:34:30 +01:00
Brian Gough	380487abf0	use separate jade template block for requirejs ... removes the need to suppressDefaultJs	2016-10-11 14:31:04 +01:00
James Allen	4ac55c7671	Merge branch 'ja-track-changes' into ja-review-panel	2016-10-11 14:24:51 +01:00
James Allen	e9c8fc7c20	Add in review panel layout	2016-10-11 14:24:01 +01:00
Shane Kilkelly	e2cf40ff33	Remove old default subscription form, replace with 'simple' form	2016-10-11 14:07:31 +01:00
Brian Gough	0f2959eb3b	use suppressDefaultJs instead of suppressFooter	2016-10-11 13:04:10 +01:00
Brian Gough	b9ecfcf41f	provide minimal requirejs config	2016-10-11 13:02:30 +01:00
James Allen	9682af3981	Merge branch 'master' into ja-track-changes ... Conflicts: public/coffee/ide/history/HistoryManager.coffee	2016-10-10 17:10:10 +01:00
James Allen	1c9abd35f8	Rename track-changes -> history on the client ... Conflicts: app/views/project/editor/history.jade	2016-10-10 16:59:25 +01:00
Henry Oswald	65e48652ee	don't add second slash into uni redirect	2016-10-10 15:36:12 +01:00
Henry Oswald	adc6b429e6	record when a subscription is canceled	2016-10-10 15:29:54 +01:00
Henry Oswald	92e3101d81	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-10-10 15:29:06 +01:00
Shane Kilkelly	c4fd9f3bce	Merge branch 'master' into sk-session-button	2016-10-10 14:49:55 +01:00
Shane Kilkelly	9d3baf488f	Use the query operator for existence check	2016-10-10 13:28:03 +01:00
Shane Kilkelly	a722646040	Remove un-used module	2016-10-10 11:05:14 +01:00
Henry Oswald	101896a754	redirect to /i/ university	2016-10-07 17:10:58 +01:00
Shane Kilkelly	25dd998107	clear-sessions page (+4 squashed commits) ... Squashed commits: [3a56af0] Remove cruft [c5a1f6c] Finalise alignment [82f741a] Working sessions page [d40f069] WIP: display sessions	2016-10-07 16:47:00 +01:00
Brian Gough	d2db6663e5	Merge pull request #335 from sharelatex/bg-ace-syntax-validator ... add ace syntax validator with latex parsing	2016-10-07 15:05:34 +01:00
Brian Gough	2d1a0b34d5	Merge pull request #333 from sharelatex/support-package-versions ... Support package versions	2016-10-07 15:04:59 +01:00
Shane Kilkelly	894c549ec6	WIP: display sessions on a page	2016-10-06 15:49:47 +01:00
Brian Gough	8c7d712738	update live version of ace to 1.2.5	2016-10-06 14:20:23 +01:00
Brian Gough	9177544ed9	add left menu for syntax validator	2016-10-06 11:51:24 +01:00
Brian Gough	0946729ae6	clean up config object	2016-10-05 14:54:42 +01:00
Brian Gough	837151a395	include moment in package versions	2016-10-05 14:54:42 +01:00
Brian Gough	8b6425317f	introduce PackageVersions module ... put all package versions in one central place	2016-10-05 14:54:42 +01:00
Shane Kilkelly	95a66bbf00	Merge pull request #328 from sharelatex/sk-plain-text-email ... Sk plain text email	2016-10-05 10:04:08 +01:00
Henry Oswald	3141f91b59	Merge pull request #322 from sharelatex/ho-password-limits ... Ho password limits	2016-10-05 10:03:54 +01:00
Paulo Reis	ef1aab1c27	Track header AB conversions only on click events.	2016-10-04 14:42:01 +01:00
Shane Kilkelly	e699fcb1fa	Add plain-text component to the project-invite email	2016-10-03 15:25:38 +01:00
Shane Kilkelly	b42a3b9188	Fix logging typo	2016-10-03 15:25:18 +01:00
James Allen	901e32a050	Merge pull request #326 from sharelatex/ho-fingerprintmultiple ... Ho fingerprintmultiple	2016-09-28 09:58:03 +01:00
Paulo Jorge Reis	cef367fde2	Merge pull request #325 from sharelatex/pr-ab-test-labels ... AB test labels	2016-09-28 09:02:15 +01:00
Henry Oswald	4f3b57ceeb	cleaned up comments	2016-09-27 16:23:40 +01:00
Henry Oswald	a00cb707cc	fingerprints are grouped into lists with this change ... fingerprints are shared when require.js pulls in other resources. this change means changes to either ace.js or mode-latex.js will result in different fingerprints for those files.	2016-09-27 16:21:04 +01:00
Paulo Reis	b6d237e189	More granular tracking, in metabase.	2016-09-27 16:01:56 +01:00
Paulo Reis	38d04e27c9	Restrict AB test to newly registered users.	2016-09-27 11:50:34 +01:00
Henry Oswald	6141eb4a44	null check user_id	2016-09-26 17:25:11 +01:00
Paulo Reis	6ccf7288e6	Register conversions.	2016-09-26 16:18:37 +01:00
Paulo Reis	d97313d22c	Horizontal layout.	2016-09-26 16:09:27 +01:00
Paulo Reis	9208fe7c30	Basic mark-up for AB testing labels.	2016-09-26 15:02:54 +01:00
Henry Oswald	8558ce1f75	improve error handling in update merger	2016-09-26 13:57:57 +01:00
Shane Kilkelly	fb6f6c13c9	Merge branch 'master' into sk-passport	2016-09-26 09:43:19 +01:00
Brian Gough	bba6008e4d	Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change ... Ace syntax validator minimal change	2016-09-26 09:25:50 +01:00
Shane Kilkelly	ab4916067e	Merge branch 'master' into sk-passport	2016-09-26 09:18:24 +01:00
Shane Kilkelly	dd14e51713	Handle null, undefined and false in isUserLoggedIn	2016-09-23 16:53:07 +01:00
Henry Oswald	8a2b7d0461	server side protect passwords which are too long	2016-09-23 16:51:46 +01:00
Henry Oswald	0d0f0e8604	wip	2016-09-23 16:38:46 +01:00
Shane Kilkelly	f9030a0a38	get user_id directly	2016-09-23 16:25:23 +01:00
Shane Kilkelly	7384a08cb4	Pass req to function.	2016-09-23 16:21:07 +01:00
Henry Oswald	67f8ec756c	Revert "wip" ... This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.	2016-09-23 16:19:11 +01:00
Henry Oswald	7c0e338352	fix bug where users are always shown downgrade option when not required	2016-09-23 16:18:22 +01:00
Henry Oswald	5c2fbaafd3	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-09-23 15:45:42 +01:00
Henry Oswald	0802ab6ddc	wip	2016-09-23 15:44:47 +01:00
Brian Gough	4f9826c87b	show beta program link for everyone on /settings	2016-09-23 15:28:15 +01:00
Brian Gough	0eaa359f6c	use syntax validator for beta programme users only	2016-09-23 15:19:40 +01:00
Brian Gough	0a350c8e3f	infrastructure for using ace syntax checking	2016-09-23 15:19:40 +01:00
Shane Kilkelly	02587377a2	Remove ReferalMiddleware, dead code.	2016-09-23 14:42:57 +01:00
Shane Kilkelly	72ca1d6316	Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee	2016-09-23 10:01:11 +01:00
James Allen	2b317cab6c	Merge pull request #320 from sharelatex/ja-validate-filenames ... Don't allow files to be created with / or * characters	2016-09-23 09:42:48 +01:00
James Allen	e15976be21	Use token in URL to force its precense when invite and allow easy dynamic notifications	2016-09-22 17:24:06 +01:00
Shane Kilkelly	dbac4bd008	update session when user settings change	2016-09-22 16:58:25 +01:00
Shane Kilkelly	636b1fe9e2	Copy to session.user, for compatibility	2016-09-22 15:49:09 +01:00
Shane Kilkelly	a0f156e1a9	wipe out more session access	2016-09-22 15:33:50 +01:00
Shane Kilkelly	ff1c72ee14	Fix up more session access	2016-09-22 14:30:34 +01:00
Shane Kilkelly	c959e0c65d	Set req.user	2016-09-22 13:54:13 +01:00
Shane Kilkelly	6df569253a	Fix session touch	2016-09-22 13:48:09 +01:00
Shane Kilkelly	3b73d97931	Use getLoggedInUserId	2016-09-22 11:33:38 +01:00
Shane Kilkelly	64c9a3ae18	Fix logic, was wrong way around	2016-09-22 11:16:50 +01:00
James Allen	4386ab1225	Don't allow files to be created with / or * characters ... Requires the following translations: "files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters", "invalid_file_name": "Invalid File Name"	2016-09-21 16:31:55 +01:00
Shane Kilkelly	c12450f533	Merge branch 'master' into sk-passport	2016-09-21 13:17:54 +01:00
Shane Kilkelly	dde5b7b830	Regenerate session on login, protect against session-fixation attack.	2016-09-21 13:03:37 +01:00
James Allen	d904e50041	Make project invite notification dynamic and accept via ajax request ... Needs translations: "joining": "Joining", "notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>", "notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>", "open_project": "Open Project"	2016-09-21 11:59:35 +01:00
James Allen	a93c939dbc	Send invite email and notification in the background	2016-09-21 10:11:35 +01:00
Shane Kilkelly	bb71433727	Remove getLoggedInUser	2016-09-21 09:27:51 +01:00
Shane Kilkelly	eca1dfa482	Remove dead code	2016-09-21 09:27:35 +01:00
James Allen	c2e14ded13	Add null checks for fileRefs and docs, which are not present when calling mkdirp	2016-09-20 16:55:12 +01:00
Henry Oswald	1a67e4982e	change blog regex to look for src's which start with a slash	2016-09-20 15:43:36 +01:00
Henry Oswald	21ca9697ca	log user_id not user	2016-09-20 15:11:14 +01:00
Henry Oswald	777cbf1c80	move comment for user is false next to if statment	2016-09-20 14:51:51 +01:00
Henry Oswald	d4863ae148	don't use cdn for blog posts which have a http on them	2016-09-20 14:48:35 +01:00
Shane Kilkelly	4eada48638	Merge branch 'master' into sk-passport	2016-09-19 15:40:25 +01:00
James Allen	0917fe10ca	Return type when finding element by path so that we don't need a heuristic	2016-09-19 14:35:25 +01:00
Brian Gough	ebe3ba4fb8	Merge pull request #316 from sharelatex/pdfjs-font-patch ... Pdfjs font patch	2016-09-19 11:24:50 +01:00
Brian Gough	64dc1784d3	switch to patched version of pdfjs	2016-09-19 11:15:27 +01:00
Shane Kilkelly	97a6ac0f00	Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee	2016-09-15 14:48:51 +01:00
Shane Kilkelly	2119dcbb58	Finalise login workflow, works with login form again.	2016-09-15 14:36:11 +01:00
James Allen	06d67835e4	Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains	2016-09-15 10:21:12 +01:00
James Allen	c9a17982cf	Add canonical url tag and don't include query string	2016-09-14 17:08:26 +01:00
James Allen	9019b20d50	Preserve line formatting in word count error message	2016-09-14 11:21:00 +01:00
James Allen	53b3e3831d	Update cancellation survey link	2016-09-14 10:51:19 +01:00
James Allen	a45aa7b80e	Show word count error messages	2016-09-13 15:54:25 +01:00
James Allen	cc9791d3f4	Redirect to login with a redirect back to the page we want if not logged in	2016-09-13 11:23:47 +01:00
James Allen	1714b014bf	Force true or false for userHasNoSubscription, not blank	2016-09-13 10:29:14 +01:00
Shane Kilkelly	438ac45854	fix unit tests	2016-09-07 16:40:49 +01:00
Shane Kilkelly	8e0103a1bc	wip: fix unit tests for AuthenticationController	2016-09-07 14:05:51 +01:00
Shane Kilkelly	cc5ddc92bb	use getSessionUser rather than getLoggedInUser	2016-09-07 10:30:58 +01:00
Shane Kilkelly	9758dd77b3	kill whitespace	2016-09-07 08:58:57 +01:00
Shane Kilkelly	3a5b3a8e8d	wip: acceptance tests working	2016-09-06 15:55:34 +01:00
Shane Kilkelly	b0a10c948c	wip refactor	2016-09-06 15:22:13 +01:00
Paulo Reis	afdded702b	Use an object instead of a string, to avoid writing to another scope.	2016-09-06 14:59:18 +01:00
Shane Kilkelly	749658a916	WIP: fixing acceptance tests	2016-09-06 13:21:22 +01:00
Shane Kilkelly	6aef092dce	fix typo	2016-09-06 09:29:58 +01:00
Shane Kilkelly	eca4c46f7f	WIP: refactor	2016-09-05 16:23:37 +01:00
Shane Kilkelly	ab2c1e82fb	WIP: refactor	2016-09-05 15:58:31 +01:00
Shane Kilkelly	e6c7aa25ec	barely functional login and logout	2016-09-05 10:28:47 +01:00
Shane Kilkelly	51e987b3b6	Merge branch 'master' into sk-passport	2016-09-02 16:29:07 +01:00
Brian Gough	ab2fe1de97	fix unclosed brace in template	2016-09-02 16:20:16 +01:00
Shane Kilkelly	e4f4325150	Basic passport integration	2016-09-02 16:17:37 +01:00
Henry Oswald	8002930270	don't use mathjax for cdn	2016-09-01 13:51:50 +01:00
Brian Gough	1592ca7623	Merge pull request #309 from sharelatex/fix-compile-check ... clean up compile check	2016-08-31 16:27:36 +01:00
Brian Gough	e82411ac79	clear serverid on every compile check	2016-08-31 16:10:24 +01:00
Henry Oswald	bbb319f235	Merge pull request #307 from sharelatex/pr-empty-proj-list-dropdown ... Empty project list dropdown	2016-08-31 15:47:30 +01:00
Brian Gough	b95a2c6d04	clean up compile check ... use a valid user id, report all failures as errors, clear timeout on success	2016-08-31 15:21:23 +01:00
Paulo Jorge Reis	70adae7a5b	Merge pull request #308 from sharelatex/pr-hide-sign-up-plans-page ... Hide "sign up" button in plans page, if user is logged in	2016-08-31 14:12:39 +01:00
Shane Kilkelly	1d83524853	Add a <code> block to autocomplete_references. ... Use unescaped interpolation.	2016-08-31 13:54:51 +01:00
Shane Kilkelly	f849bf6d4c	Add Autocomplete descriptions to hotkeys	2016-08-31 13:31:04 +01:00
Paulo Reis	bba39cc902	Also hide button, when viewing student plans.	2016-08-31 11:40:27 +01:00
Shane Kilkelly	47b1a5099a	Better logging when plan is null.	2016-08-31 10:40:30 +01:00
Shane Kilkelly	f59d5d836d	Check plan, return error if not valid. ... This prevents a crash later when we refer to properties of the plan object, which can end up being `null` when the `planCode` is either missing, or not a valid code.	2016-08-31 10:18:53 +01:00
Shane Kilkelly	1b29e0e8ec	Merge branch 'master' of github.com:sharelatex/web-sharelatex ... # Conflicts: # app/coffee/Features/Notifications/NotificationsBuilder.coffee	2016-08-31 09:48:19 +01:00
Henry Oswald	960ed520b6	fix notifications builder @key bug	2016-08-31 09:42:43 +01:00
Shane Kilkelly	1399ee4689	Fix reference to @key in log expression.	2016-08-31 09:34:20 +01:00
Paulo Reis	09c188030c	Hide sign up button via visibility, to keep the layout fixed.	2016-08-30 17:42:23 +01:00
Brian Gough	c44f33ce99	allow negative values for synctex positions	2016-08-30 16:45:21 +01:00
Paulo Reis	8c7b9edd21	Remove AB-related logic from template and controller.	2016-08-30 16:10:04 +01:00
Paulo Reis	e3fe4a2eeb	Rename empty projects list file, do some clean-up.	2016-08-30 16:07:31 +01:00
Paulo Reis	2885164748	Isolate create project dropdown styles, to avoid influencing other dropdowns.	2016-08-30 15:32:23 +01:00
Shane Kilkelly	4a76fcd13b	Change first param of getMemberSubscriptions to user_or_id, to match semantics of usage. ... This function works whether a user object, or an ObjectId is passed, but the `user_id` param name is confusing.	2016-08-30 14:26:57 +01:00
Henry Oswald	cbb4ee88cc	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-08-30 13:08:09 +01:00
Henry Oswald	ddc0023c64	make forceCreate the default for creating notifications	2016-08-30 13:07:37 +01:00
Henry Oswald	8c18153d5c	Merge pull request #304 from sharelatex/ho-jade-speedup ... Ho jade speedup	2016-08-30 12:47:08 +01:00
Brian Gough	16e4577ffa	Merge pull request #306 from sharelatex/compile-check ... Compile check	2016-08-30 11:58:04 +01:00
Brian Gough	3c59de31df	finalise display of syntax check error message	2016-08-26 15:14:57 +01:00
Brian Gough	696a7206c1	clean up display of error message	2016-08-25 16:55:29 +01:00
Brian Gough	9a1934465a	clean up syntax check options on menu	2016-08-25 15:51:56 +01:00
Henry Oswald	26a4076c22	add redirect to /i/university for ab test	2016-08-25 10:48:29 +01:00
Brian Gough	74bc157e7c	added force recompile option	2016-08-24 16:48:37 +01:00
Paulo Reis	c82ab65077	Bind to an object to avoid writing in different .	2016-08-24 11:02:53 +01:00
Paulo Jorge Reis	f4aab93dfa	Merge pull request #303 from sharelatex/pr-ab-subscription-form ... PR AB Subscription form	2016-08-24 09:45:36 +01:00
Henry Oswald	3f4e888af5	Merge pull request #305 from sharelatex/cdnfallback ... don't use cdn if it can not be accessed	2016-08-24 09:45:14 +01:00
Henry Oswald	934e908697	just use plain req.ip for logging	2016-08-23 17:00:13 +01:00
Henry Oswald	fcc7585444	put jquery as first script in head tag	2016-08-23 16:58:39 +01:00
Henry Oswald	f8799334ec	Merge branch 'master' into ho-jade-speedup	2016-08-23 15:35:04 +01:00
Henry Oswald	114dbf9f3f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-08-23 15:34:55 +01:00
Henry Oswald	d3ebdb64b2	precompile the jade partial views	2016-08-23 15:31:09 +01:00
Paulo Reis	ba71ed2a3d	Merge branch 'master' into pr-ab-subscription-form	2016-08-23 14:10:19 +01:00
Paulo Reis	8abf839d55	Add country to the paypal form.	2016-08-23 13:36:54 +01:00
Paulo Reis	bc16999a4e	Validate on blur; reset validation on focus.	2016-08-23 11:55:23 +01:00
Paulo Reis	f79bee7893	Loading indicator when submitting.	2016-08-23 11:27:09 +01:00
James Allen	bcc8bfbe6c	Redirect to working update billing details end point that shows a nice message	2016-08-22 17:36:33 +01:00
Paulo Reis	23ed1e2aa3	Add form validation.	2016-08-22 17:03:29 +01:00
Paulo Reis	2f93a102fd	Fix layout to support scrollable messages.	2016-08-22 16:12:29 +01:00
Paulo Reis	a9095ccde8	Disable filter which wraps long words, still buggy.	2016-08-22 14:54:07 +01:00
Shane Kilkelly	11ec486c13	Merge pull request #300 from sharelatex/pr-subscription-improvements ... Pr subscription improvements	2016-08-22 11:08:18 +01:00
Shane Kilkelly	03aa9b87f1	Add debug query string origin to invocations of the updateSubscription endpoint.	2016-08-22 10:09:54 +01:00
Henry Oswald	130fece0f6	track when users accept invites	2016-08-19 18:33:03 +01:00
Paulo Reis	92bc411df5	Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form	2016-08-19 16:48:33 +01:00
Paulo Reis	f4b8cc7fc8	Use first and last name instead of full name as input.	2016-08-19 16:46:44 +01:00
Paulo Reis	53c6e48da9	Remove left-hand panel experiment.	2016-08-19 16:03:15 +01:00
Henry Oswald	110820face	use url.resolve to build url for freegeoip lookups	2016-08-19 15:40:54 +01:00
Henry Oswald	50b3403983	use url.resolve to build url for freegeoip lookups	2016-08-19 15:39:58 +01:00
Paulo Reis	6a1f0de912	Add i18n keys.	2016-08-19 15:12:05 +01:00
Paulo Reis	452abe94be	Add coupon code, VAT and pricing breakdown. Styling adjustments.	2016-08-19 14:51:07 +01:00
Henry Oswald	d8e7bacec4	added logging in	2016-08-19 11:53:40 +01:00
Shane Kilkelly	c02854c9d8	Improve log messages	2016-08-19 11:52:50 +01:00
Shane Kilkelly	07cd75cd64	Add an expect404 option to apiRequest. ... Suppress error generation when 404 response is encountered.	2016-08-19 11:52:04 +01:00
Henry Oswald	3d36dc7d6c	mvp for not using cdn when blocked	2016-08-19 11:05:35 +01:00
James Allen	c653f59705	Add error handling to mkdir_p	2016-08-18 17:48:33 +01:00
Paulo Reis	26e21732f8	Added validations + minor fixes.	2016-08-18 17:41:55 +01:00
Paulo Reis	43b832965f	Layout and styling for simple subscription form.	2016-08-18 16:56:23 +01:00
Shane Kilkelly	4a6df04c21	Merge branch 'master' into pr-subscription-improvements	2016-08-18 12:53:56 +01:00
Paulo Reis	4814fc2606	Simple layout for subscription form.	2016-08-17 17:34:17 +01:00
Shane Kilkelly	ece0491e3d	Refactor. Handle republishing of notifications on resend.	2016-08-17 16:27:15 +01:00
Paulo Reis	672d4f8767	Setup AB test (alternative is still empty).	2016-08-17 12:11:17 +01:00
Shane Kilkelly	85f49d6c9c	Make whole 'red button' in email a link	2016-08-17 10:37:44 +01:00
Shane Kilkelly	c98e473bc3	Fix layout of notifications	2016-08-17 10:31:05 +01:00
Shane Kilkelly	4805c96584	Merge branch 'master' into pr-email-tokens	2016-08-17 08:52:24 +01:00
Shane Kilkelly	fc068b62a2	defend against undefined plan_code	2016-08-17 08:51:35 +01:00
Shane Kilkelly	81d0edf716	Improve error handling	2016-08-16 15:19:36 +01:00
Shane Kilkelly	ce78b855a3	Add counts to log message	2016-08-16 11:33:14 +01:00
Shane Kilkelly	da40f54d55	Improve logging, add acceptance tests for joinProject json	2016-08-16 11:17:45 +01:00
Shane Kilkelly	b68af254ff	Correct logic for bailing out with no privileges	2016-08-16 09:59:42 +01:00
Brian Gough	7fcae775ee	Merge pull request #297 from sharelatex/roll-out-chktex ... Roll out chktex	2016-08-16 09:48:01 +01:00
Shane Kilkelly	d2183738c5	Improve logging for debugging	2016-08-16 09:04:11 +01:00
Brian Gough	8d6cdb03e8	restrict compile check options ... allowed options are validate/error/silent validate = only run chktex, exit status 0 error = run compilation, exit(1) if chktex fails silent = run chktex, but always do full compilation	2016-08-15 16:46:53 +01:00
Shane Kilkelly	36d969e6e6	Set invites to be an empty array if missing	2016-08-15 15:22:23 +01:00
Shane Kilkelly	158afbb157	Merge branch 'master' into pr-email-tokens ... Conflicts: app/coffee/Features/Notifications/NotificationsBuilder.coffee public/coffee/ide/share/controllers/ShareController.coffee	2016-08-15 10:29:21 +01:00
Shane Kilkelly	f92767f7b5	Address feedback, add ? checks where appropriate	2016-08-12 15:26:20 +01:00
Shane Kilkelly	e53394919f	Rework how invite expiry functions.	2016-08-12 14:40:59 +01:00
Shane Kilkelly	d547bff4e5	Blur the resend button after response	2016-08-12 11:25:03 +01:00
Shane Kilkelly	a7bc8bffe0	Update markAsReadByKeyOnly url.	2016-08-12 09:59:25 +01:00
Shane Kilkelly	a9042ff324	Enable enter key on share dialog button	2016-08-11 15:24:35 +01:00
Shane Kilkelly	ce039f8cd3	Remove the email when user id is added to project	2016-08-11 14:17:01 +01:00
Paulo Reis	9bf9df9a4a	Track login events.	2016-08-11 14:09:45 +01:00
Shane Kilkelly	826295167f	Mark Notification as read by key alone	2016-08-11 14:04:11 +01:00
Brian Gough	9a399d3dd3	move "run syntax check" compile option out of beta	2016-08-11 13:55:47 +01:00
Brian Gough	a862592138	added syntax check to beta page, removed mendeley	2016-08-11 13:43:33 +01:00
Paulo Reis	6a210978fe	Track registration events.	2016-08-11 12:29:58 +01:00
James Allen	0270d34d0f	Use JSONB not JSON column type	2016-08-11 10:19:07 +01:00
Paulo Reis	b405b4dce6	Remove Countly integration.	2016-08-10 17:34:32 +01:00
James Allen	4886e8ba0e	Rename metadata -> segmentation in Events table to play well with metabase	2016-08-10 17:22:35 +01:00
James Allen	056bb6b0f4	Use a JSON column for metadata	2016-08-10 17:17:59 +01:00
James Allen	93cd511211	Send events to custom DB backend	2016-08-10 16:42:56 +01:00
Brian Gough	abcfb2dd16	Merge pull request #290 from sharelatex/enable-chktex ... Enable chktex	2016-08-10 11:49:31 +01:00
Shane Kilkelly	0e0ccb41ff	cancel notification when accepting invite	2016-08-08 13:57:33 +01:00
Shane Kilkelly	110082390e	Test the _trySendInviteNotfification helper	2016-08-08 10:34:54 +01:00
Shane Kilkelly	e0444cfc62	Make notification column layout explicit.	2016-08-05 16:41:11 +01:00
Shane Kilkelly	9b46c1b1f7	WIP: notification when user is sent an invite	2016-08-05 16:11:03 +01:00
Shane Kilkelly	eafd61a90e	Refresh members and invites in client when status changes	2016-08-05 14:01:08 +01:00
Shane Kilkelly	8f7603c324	Add an endpoint to access project members	2016-08-04 16:47:48 +01:00
Shane Kilkelly	092c036406	Rate-limit calls to invite api	2016-08-04 09:50:47 +01:00
Paulo Jorge Reis	60f8e577a8	Merge pull request #293 from sharelatex/pr-wrap-long-words-chat ... Wrap long words chat	2016-08-03 16:32:36 +01:00
Shane Kilkelly	721ea88bd0	If email is already invited, resend the invite	2016-08-03 16:30:34 +01:00
Brian Gough	42388f8b76	fix missing space in pdf jade template	2016-08-03 16:30:33 +01:00
Brian Gough	7ce406dd38	switch the compile dropdown menu to left, to avoid overflow into editor	2016-08-03 16:30:18 +01:00
Brian Gough	4d3629e5db	add beta feature badge to syntax check	2016-08-03 16:29:46 +01:00
Paulo Reis	73f115fc57	Add i18n keys.	2016-08-03 16:09:45 +01:00
Paulo Reis	cf5c8e27e1	UI fix - do not allow multiple clicks to restore a deleted file.	2016-08-03 16:05:19 +01:00
Shane Kilkelly	a5ddcc3df7	Allow resending of invites	2016-08-03 15:42:19 +01:00
Shane Kilkelly	e7251aab53	Small wording changes	2016-08-03 14:06:08 +01:00
Paulo Reis	e6898d64c9	Track hovering of header features.	2016-08-03 12:17:19 +01:00
Shane Kilkelly	8cb93511df	Update UI of share modal	2016-08-03 11:55:24 +01:00
Shane Kilkelly	6ea690225f	Refactor view-invite to not use model calls.	2016-08-03 10:23:34 +01:00
Henry Oswald	892511820e	fix logging on groupPlan invite notification	2016-08-02 17:09:42 +01:00
Shane Kilkelly	3a3688d3d0	Include invites count in canAddXCollaborators	2016-08-02 15:42:50 +01:00
Shane Kilkelly	2494026b85	Move Helpers/EmailHelpers to Helpers/EmailHelper	2016-08-02 15:42:26 +01:00
Henry Oswald	418d1c56da	nullcheck qqfile on upload files	2016-08-02 15:36:59 +01:00
Henry Oswald	928777b61c	add null check to redis return value for getValueFromTokenAndExpire	2016-08-02 15:34:44 +01:00
Henry Oswald	2ad0bab976	use underscore.each so it doesn’t blow up on non array.	2016-08-02 15:33:41 +01:00
Brian Gough	38f76b305b	change message to "Run syntax check"	2016-08-02 14:43:09 +01:00
Shane Kilkelly	13fe000176	Move email parsing code to Helpers/EmailHelpers	2016-08-02 14:30:42 +01:00
Shane Kilkelly	abbd059eae	Refactor to existing addUserIdToProject function	2016-08-02 13:51:00 +01:00
Shane Kilkelly	63f8fe453a	Use UserGetter rather than User model	2016-08-02 09:48:09 +01:00
Shane Kilkelly	dca1c9be5d	Load invites on project load, rather than asynchronously.	2016-08-01 17:05:37 +01:00
Paulo Reis	ff62e50530	Integrate word wrapping filter in the chat component.	2016-08-01 16:42:54 +01:00
Shane Kilkelly	291a26595c	Remove referal id from invite email link	2016-08-01 15:56:07 +01:00
Brian Gough	e508f7b8a9	don't try to display a log hint link if there isn't one	2016-07-29 15:11:34 +01:00
Brian Gough	0742db7732	enable validation option only for beta programme users	2016-07-29 15:11:34 +01:00
Brian Gough	5da1b90418	use validate as keyword for syntax checks	2016-07-29 14:59:48 +01:00
Brian Gough	ef85f1014c	add menu option for checking with chktex	2016-07-29 14:59:48 +01:00
Brian Gough	e0d5075fdb	include check option when compiling	2016-07-29 14:59:48 +01:00
Shane Kilkelly	f3a1f32bb1	Test the invalid-invite page	2016-07-29 11:54:08 +01:00
Shane Kilkelly	563247044b	Start testing the invite page	2016-07-29 09:52:55 +01:00
Shane Kilkelly	9c6195fbec	Factor out link builder	2016-07-28 15:59:59 +01:00
Shane Kilkelly	7b18f88145	Merge branch 'master' into pr-email-tokens	2016-07-28 14:53:36 +01:00
Shane Kilkelly	ed65e16e54	If user is member of project, redirect to project. ... Leave invite in place to expire naturally.	2016-07-28 11:15:11 +01:00
Shane Kilkelly	1cb9c3582d	Don't return early if user is already member.	2016-07-28 09:47:07 +01:00
Shane Kilkelly	e70f121461	Correct name of expireAfterSeconds index	2016-07-27 15:55:31 +01:00
Shane Kilkelly	62d544ccfc	Redirect to project if user is already member. ... If invite is missing, and current user is already a member of the project, then just redirect to the project page	2016-07-27 15:28:22 +01:00
Paulo Reis	f4d78a856c	Disable page view and session tracking.	2016-07-27 14:20:39 +01:00
Shane Kilkelly	46ec17f2c4	Add redir query string to login link	2016-07-27 13:51:52 +01:00
Shane Kilkelly	e1af171534	Add a dot to end of sentence.	2016-07-27 11:07:26 +01:00
Shane Kilkelly	6f39813a56	Add translations	2016-07-27 10:56:22 +01:00
Shane Kilkelly	78948251a1	Change the Close button color	2016-07-27 10:28:01 +01:00
Shane Kilkelly	827629a74a	Invalid-invite page, and re-jigg the share modal	2016-07-27 10:10:44 +01:00
Paulo Reis	6d0779b8f8	Add forgotten name attribute.	2016-07-26 14:47:48 +01:00
Paulo Reis	ab305ea07e	Merge branch 'master' into pr-log-hints-negative-feedback	2016-07-26 14:27:15 +01:00
Shane Kilkelly	6162c5ec60	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-26 14:23:08 +01:00
Shane Kilkelly	e46901a21b	Send an empty keys array when there is no data	2016-07-26 14:23:00 +01:00
Shane Kilkelly	855cc28483	Finish adding project and owner details to the accept-invite page	2016-07-26 14:14:14 +01:00
Paulo Reis	a3ee3134b1	Support for i18n.	2016-07-26 11:56:15 +01:00
Shane Kilkelly	2dede5f793	WIP: Working "accept invite" page	2016-07-26 11:46:41 +01:00
Paulo Reis	bfe3e160c9	Integrate with UI.	2016-07-26 11:37:51 +01:00
Henry Oswald	81744e4301	use cdn for blog	2016-07-26 11:11:28 +01:00
Shane Kilkelly	41755212f0	Update the register page with new message	2016-07-26 09:06:21 +01:00
Shane Kilkelly	b898c62e91	Add appropriate query strings to the end of invite link	2016-07-25 16:14:41 +01:00
Paulo Reis	32b57f228c	Integrate feedback UI with wufoo service.	2016-07-25 16:12:56 +01:00
Shane Kilkelly	16dcbe2cd4	WIP: wire up share-modal frontend to invite system	2016-07-25 15:07:14 +01:00
Shane Kilkelly	b3add65de1	Start integrating invites into share frontend	2016-07-25 14:27:02 +01:00
Shane Kilkelly	73fed8b0bf	Add a getAllInvites api endpoint	2016-07-25 11:17:47 +01:00
Shane Kilkelly	5438f39f9e	Start testing acceptInvite	2016-07-25 09:58:08 +01:00
Shane Kilkelly	78a410c39d	Remove expiresAt logic from acceptInvite	2016-07-25 09:07:47 +01:00
Paulo Reis	37eb6252d2	Rewording + animation when shown the feedback panel.	2016-07-22 16:33:19 +01:00
Shane Kilkelly	78570817d5	Render a separate template if the invite is not found.	2016-07-22 16:28:00 +01:00
Shane Kilkelly	9e0c44573a	Remove expiresAt, use mongo TTL instead.	2016-07-22 16:08:56 +01:00
Shane Kilkelly	b201f1a37a	Test getInviteByToken.	2016-07-22 14:21:34 +01:00
Paulo Reis	b6cd6c2d7d	UI logic to show or hide the negative feedback panel.	2016-07-22 14:14:58 +01:00
Henry Oswald	8492ea7d28	Merge pull request #285 from sharelatex/file-path-checks ... add file path check on element names	2016-07-22 13:54:05 +01:00
Henry Oswald	f7a0860f0b	Merge pull request #286 from sharelatex/ha-editor-close ... fix close editor button	2016-07-22 13:49:26 +01:00
Paulo Reis	54eadf3256	Add textarea for 'other' feedback + styles.	2016-07-22 12:20:26 +01:00
Paulo Reis	95db6ba934	Basic mark-up for the extra log hint feedback.	2016-07-22 11:56:45 +01:00
Shane Kilkelly	9fba98cd45	Accept invite, and start testing the invite handler.	2016-07-22 11:38:00 +01:00
Shane Kilkelly	1139444790	add token to body of acceptInvite action.	2016-07-22 09:27:00 +01:00
Henry Oswald	ef6eefe1b1	add comment not to fingerprint worker	2016-07-22 09:05:39 +01:00
Henry Oswald	c7a3de45bb	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-07-22 09:05:14 +01:00
Henry Oswald	3029fb6335	add dark host option and don’t load pdfjs worker via cdn	2016-07-21 19:06:53 +01:00
Paulo Jorge Reis	50ad3a107f	Merge pull request #287 from sharelatex/pr-highlight-biblio-search ... A|B test for bib search pop-up	2016-07-21 17:06:59 +01:00
Paulo Reis	6a46b46cf4	Expose sign-up date as an user attribute in the editor.	2016-07-21 16:42:22 +01:00
Shane Kilkelly	546517db90	revokeInvite and getInviteByToken functions.	2016-07-21 16:19:15 +01:00
Shane Kilkelly	d9c6df0e47	start adding the ProjectInvite workflow.	2016-07-21 15:56:41 +01:00
Henry Oswald	6aca798a45	don’t use cdn on dark	2016-07-21 15:34:23 +01:00
Shane Kilkelly	e0562a2301	Update ProjectInvite model	2016-07-21 14:20:09 +01:00
Shane Kilkelly	3311b43644	more tests for invite controller	2016-07-21 13:31:54 +01:00
Shane Kilkelly	23a9aadba5	start tests for invite controller	2016-07-21 10:08:22 +01:00
Shane Kilkelly	c3e51dd773	Revert "copy helper functions from CollaboratorsHandler" ... This reverts commit 0d5acd7bade584e4ff119dc22e5d5d3b3175dae2.	2016-07-21 09:50:52 +01:00
Shane Kilkelly	049cced4fd	copy helper functions from CollaboratorsHandler	2016-07-21 09:42:37 +01:00
Henry Oswald	ad60268707	clean up vars for buildjs path and change default to cdn.sharelatex.dev:3000	2016-07-21 09:38:24 +01:00
Shane Kilkelly	0f2600b198	finish out skeleton of invite controller	2016-07-21 09:32:14 +01:00
Shane Kilkelly	f7c2fa37ab	Fill out getInviteByToken	2016-07-20 16:44:22 +01:00
Henry Oswald	e27d5ce969	use Url for lib name	2016-07-20 16:10:33 +01:00
Henry Oswald	97b42478d1	don’t fingerprint sentry	2016-07-20 16:03:01 +01:00
Shane Kilkelly	0dc4e2c0c1	Merge branch 'master' into pr-email-tokens	2016-07-20 15:23:37 +01:00
Shane Kilkelly	5b22be8a0b	Further scaffolding	2016-07-20 15:22:48 +01:00
Henry Oswald	e8aad2abb1	don’t fingerprint main.js and ide.js	2016-07-20 15:17:01 +01:00
Henry Oswald	596fc2525b	simplified buildJSPath	2016-07-20 14:48:58 +01:00
Henry Oswald	a3e40adbaf	Merge pull request #283 from sharelatex/ho-cdn ... Ho cdn	2016-07-20 14:19:37 +01:00
Shane Kilkelly	a4c7db5f20	skeleton of inviteToProject function	2016-07-20 14:14:56 +01:00
Shane Kilkelly	e383e49161	Add CollaboratorsInviteController and routes	2016-07-20 14:04:14 +01:00
Henry Oswald	6c78ab4ace	got requirejs working nicely with cdn	2016-07-20 12:58:32 +01:00
Henry Oswald	b589ab388f	fix close editor button ... - only evaulate close on web router, not api/static assets - allow /admin pages to still be available	2016-07-19 17:15:20 +01:00
Henry Oswald	f8c38f30a8	got build js path working with mathjax	2016-07-19 15:41:33 +01:00
Brian Gough	13d6448ab8	Merge pull request #284 from sharelatex/fix-synctex-subdir-path ... work around for synctex paths containing /./	2016-07-19 12:24:31 +01:00
Brian Gough	a93efde1ae	add file path check on element names	2016-07-19 11:58:10 +01:00
Henry Oswald	0cbd9d0ff9	use url.resolve to adding https:// part	2016-07-19 11:41:36 +01:00
Shane Kilkelly	4e1df9f476	Fix wording of userHasSubscription to userHasNoSubscription	2016-07-19 11:37:58 +01:00
Shane Kilkelly	3aea3a68d1	Check the truth of subscription.customAccount, rather than definition.	2016-07-19 10:28:43 +01:00
Shane Kilkelly	effc3727be	Don’t show upgrade prompts for users with custom subscription accounts. ... Set `hasValidSubscription` to true if user subscription is custom.	2016-07-19 10:15:45 +01:00
Henry Oswald	a2a8b7123b	created buildCssPath img and js path funcs	2016-07-18 17:18:51 +01:00
Brian Gough	1d74e6750c	work around for synctex paths containing /./	2016-07-18 17:00:34 +01:00
James Allen	62a444082d	Add in /dev/csrf endpoint for easy automated testing	2016-07-18 16:47:54 +01:00
Henry Oswald	715ffcfbf2	changed ordering on static assets path, just tidying.	2016-07-18 16:24:48 +01:00
Brian Gough	a3c97533ae	Merge pull request #281 from sharelatex/stop-compile ... add support for stopping compile	2016-07-18 15:01:26 +01:00
Brian Gough	ded9bcaa11	remove unwanted styling on 'stop compile' button	2016-07-18 15:00:16 +01:00
Henry Oswald	c21549220c	mvp for cdn	2016-07-18 14:05:07 +01:00
Brian Gough	92d41dd74e	added comment for per-user route to top-level directory	2016-07-18 11:16:09 +01:00
Brian Gough	5a02e8c656	add support for stopping compile	2016-07-15 16:28:52 +01:00
Henry Oswald	0576380811	allow placeholder for sharing project to be changed	2016-07-14 11:40:32 +01:00
Paulo Reis	c23091da94	Always set feature flags, if available.	2016-07-14 11:07:10 +01:00
Paulo Reis	ab995671fc	Namespace feature flags.	2016-07-14 10:10:14 +01:00
Paulo Reis	5d5bc57535	Add user name.	2016-07-14 09:55:11 +01:00
Paulo Reis	fee22db567	Refactor user blocks into a single script tag.	2016-07-14 09:47:25 +01:00
Paulo Reis	a261de9eb1	Set feature flags.	2016-07-14 09:37:04 +01:00
Paulo Reis	68906cb0c5	Avoid unneeded change_id event; id can be set as a Countly property, before initializing.	2016-07-13 16:29:53 +01:00
Henry Oswald	713f2110c1	use translations for title and meta description (google)	2016-07-12 14:25:25 +01:00
Paulo Reis	1e62ce679b	Make 'knowledge base' a link to the KB index page.	2016-07-12 11:44:48 +01:00
Paulo Reis	785bf1b5a2	New key for the message label.	2016-07-11 16:24:06 +01:00
Paulo Reis	af93ac4413	Track suggestions usage.	2016-07-11 14:27:07 +01:00
Paulo Reis	9ef78b4bc2	Merge branch 'master' into pr-contact-form-suggestions	2016-07-11 13:54:06 +01:00
Paulo Reis	7eafa5ca3f	Make Countly server configurable via settings.	2016-07-11 11:02:52 +01:00
Henry Oswald	94d760e32d	import bootstrap font awseome via less not html	2016-07-10 11:10:43 +01:00
Paulo Reis	444120f8b1	Merge branch 'master' into pr-contact-form-suggestions	2016-07-08 13:55:08 +01:00
Shane Kilkelly	0e9beb5653	remove daft redundancy.	2016-07-07 09:42:01 +01:00
Shane Kilkelly	896cbb5f4c	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-07 09:35:53 +01:00
Shane Kilkelly	9e35bdcaea	Refactor: add ? suffix to truth tests.	2016-07-07 09:35:44 +01:00
Paulo Jorge Reis	efacd9e7f2	Merge pull request #267 from sharelatex/pr-log-dropdown ... "Other logs & files" dropdown / dropup	2016-07-06 16:06:10 +01:00
Shane Kilkelly	21eb104928	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-06 15:39:12 +01:00
Shane Kilkelly	dda0841af3	Return early if there are no keys to delete	2016-07-06 15:39:03 +01:00
Paulo Reis	b867c37d49	Merge branch 'master' into pr-log-dropdown	2016-07-06 15:35:28 +01:00
Paulo Jorge Reis	59065395ef	Merge pull request #273 from sharelatex/pr-countly-integration ... Countly integration	2016-07-06 15:00:47 +01:00
Paulo Reis	7a3d3d3ffd	Make Countly track by internal ids.	2016-07-06 14:44:28 +01:00
Paulo Reis	8e2475afdc	Track hints feedback in both GA and Countly; clean-up.	2016-07-06 14:24:50 +01:00
Shane Kilkelly	fc6cf75ad5	Merge branch 'master' into sk-session-revocation	2016-07-06 13:19:15 +01:00
Paulo Reis	5c121a5f05	Track user log in and sign up.	2016-07-06 12:12:54 +01:00
Paulo Reis	7e1c1f7414	Remove heap integration.	2016-07-06 12:12:22 +01:00
Paulo Reis	c9b1faa1a1	Add user info to correlate with events.	2016-07-06 11:59:33 +01:00
Paulo Reis	909f7c15b5	Track log-related actions.	2016-07-05 16:27:14 +01:00
Paulo Reis	d5efe81a46	Track recompiles.	2016-07-05 16:02:46 +01:00
Shane Kilkelly	3f1a47eccb	map the 'retain' values to session ids	2016-07-05 14:54:26 +01:00
Shane Kilkelly	5b9903551a	add an array of session ids to retain.	2016-07-05 14:20:47 +01:00
Shane Kilkelly	6e282ab308	clear sessions on password reset	2016-07-05 14:19:59 +01:00
Paulo Reis	fac3698c40	Better namespacing of sprite CSS classes.	2016-07-05 11:08:58 +01:00
Paulo Reis	7dd1906eaf	Initial Countly integration.	2016-07-04 16:51:31 +01:00
Shane Kilkelly	df0a7bc547	test the _checkSessions function.	2016-07-04 14:04:10 +01:00
Shane Kilkelly	2ae2e6ed4f	Test trackSession	2016-07-04 10:37:01 +01:00
Shane Kilkelly	a869c99c60	Begin testing UserSessionsManager.	2016-07-04 10:05:34 +01:00
Shane Kilkelly	5a1af9a5f3	check sessions on login and logout.	2016-07-04 09:27:38 +01:00
Paulo Reis	11f198d970	Merge branch 'master' into sprites	2016-07-01 16:27:09 +01:00
Paulo Reis	4f49a25639	Use a figure element instead of an img, as there is no src attribute.	2016-07-01 16:02:01 +01:00
Shane Kilkelly	6f20f565fe	Add early-return guards	2016-07-01 15:55:50 +01:00
Shane Kilkelly	0ac9b05d02	Add ip_address and session_created to the session user object.	2016-07-01 15:49:07 +01:00
Shane Kilkelly	f1653d01b7	Refactor method names in UserSessionsManager	2016-07-01 15:33:59 +01:00
Henry Oswald	6f4a7f4779	mvp for using sprites for flags, needs border removing	2016-07-01 15:04:39 +01:00
Shane Kilkelly	6938f1d055	No need to build extra string	2016-07-01 15:04:13 +01:00
Shane Kilkelly	8855d0fa0f	Clear out sessions	2016-07-01 13:38:13 +01:00
Shane Kilkelly	5ae0aeaf94	Fix logging.	2016-07-01 13:37:56 +01:00
Shane Kilkelly	d8ffa5b4b1	set expiry on the user sessions set.	2016-07-01 11:24:46 +01:00
Shane Kilkelly	88bef5c5ea	Add revokeAllSessions handler, when password is reset	2016-07-01 09:51:22 +01:00
Brian Gough	ea942fe255	Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers ... remove scaffolding for per-user compiles so that it is always by default	2016-06-30 15:16:28 +01:00
Brian Gough	c04e00026b	remove scaffolding for per-user compiles so that it is always by default	2016-06-30 14:43:03 +01:00
James Allen	882e28a811	Don't choke on null projects	2016-06-30 14:30:04 +01:00
James Allen	b76cc7e314	Remove a user from being a collaborator when their account is deleted	2016-06-30 14:21:44 +01:00
James Allen	a0fcc7e3ed	Skip null user objects when getting collaborators	2016-06-30 13:56:21 +01:00
Paulo Reis	c5f53ef431	Track log hints feedback.	2016-06-30 11:30:30 +01:00
Henry Oswald	000c862ae1	return 404 if blog returns 403, caused by file not existing	2016-06-29 15:36:33 +01:00
Shane Kilkelly	03fedafaf5	save the session key string, rather than just the id	2016-06-29 15:12:12 +01:00
Paulo Reis	72d498c6c8	Merge branch 'master' into pr-contact-form-suggestions	2016-06-29 11:58:07 +01:00
Shane Kilkelly	db213c0621	Begin keeping record of user sessions in reds.	2016-06-29 11:35:25 +01:00
Henry Oswald	8f14526354	added custom footer in email option	2016-06-28 17:07:27 +01:00
Henry Oswald	88fb955884	hook notifications handler up to make request which doesn't make request if url not set	2016-06-28 16:52:27 +01:00
Paulo Reis	a6d184358f	Avoid inline-styles.	2016-06-28 15:51:50 +01:00
Paulo Reis	88564ea126	Dynamically determine if the files dropdown should drop up or drop down.	2016-06-28 15:48:11 +01:00
Shane Kilkelly	9e16f250f9	Merge branch 'sk-subscription-address'	2016-06-28 14:16:34 +01:00
Shane Kilkelly	6581bc4ecf	set postal_code as zip	2016-06-28 14:15:47 +01:00
Shane Kilkelly	465d09dcfe	Test the createSubscription action (+4 squashed commits) ... Squashed commits: [fc9c8f9] Add tests for createBillingInfo [db9f90e] Test the createSubscription stage [c17151d] Check that userExists gets set [1367c96] Act on buddy-check feedback	2016-06-28 13:59:52 +01:00
Paulo Reis	616fd5daf6	Merge branch 'master' into pr-ui-feedback-error-nav	2016-06-28 10:50:23 +01:00
Paulo Reis	d6067b86ac	Merge branch 'master' into pr-ui-feedback-error-nav	2016-06-28 10:49:55 +01:00
Brian Gough	2b23e13619	Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds ... use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-28 10:49:33 +01:00
Henry Oswald	b8b833b753	moved wiki into module	2016-06-28 10:16:02 +01:00
Shane Kilkelly	709f8f2bea	start testing the paypal workflow.	2016-06-27 16:34:00 +01:00
Paulo Reis	3580d8377f	Merge branch 'master' into pr-contact-form-suggestions	2016-06-27 15:39:00 +01:00
Paulo Reis	d7f67e7931	Integrate translations.	2016-06-27 15:38:13 +01:00
Shane Kilkelly	401565ba23	Fix references to the RecurlyWrapper object.	2016-06-27 12:14:43 +01:00
Paulo Reis	81b93ab5a9	Disable links to the docs when the wiki is not available.	2016-06-27 11:34:24 +01:00
Shane Kilkelly	9938787e4a	fix a few silly issues. Appears to work now	2016-06-27 10:38:10 +01:00
Shane Kilkelly	72c73809f6	Generate address xml from object.	2016-06-27 09:44:40 +01:00
Paulo Reis	c82f4481e4	Show search results.	2016-06-24 17:10:18 +01:00
Paulo Reis	f427ce88d9	Better Jade syntax.	2016-06-24 16:37:35 +01:00
Paulo Reis	dfc375adf8	Add more feedback on :hover.	2016-06-24 15:55:19 +01:00
Henry Oswald	9888d6631a	don't error if references is not enabled	2016-06-24 15:46:37 +01:00
Henry Oswald	6e59a10fb3	added more null checks for potential undefined notifications	2016-06-24 15:23:57 +01:00
Paulo Reis	c376c807d7	Forgotten href attribute.	2016-06-24 15:22:34 +01:00
Henry Oswald	51df3825e5	add null check on notifications handler	2016-06-24 15:11:22 +01:00
Henry Oswald	8d79b37651	return from _doIndexOperation if referneces is not setup eailer	2016-06-24 15:07:28 +01:00
Shane Kilkelly	026e9f46c8	WIP: process appears to work, setting address correctly	2016-06-24 15:03:46 +01:00
Shane Kilkelly	56bc840b88	WIP: fix up error handling and account for possibility of account already existing.	2016-06-24 14:11:28 +01:00
Paulo Reis	a33aeca9c3	Merge branch 'pr-latex-hints-improvements'	2016-06-24 14:07:57 +01:00
Henry Oswald	3887db8898	don't call notifications if notifications has no url	2016-06-24 14:06:04 +01:00
Paulo Reis	b4de353828	Merge branch 'master' into pr-latex-hints-improvements	2016-06-24 14:02:55 +01:00
Henry Oswald	9a3e621c9c	stripe off errors and kb from page titles	2016-06-24 13:15:22 +01:00
Paulo Reis	5f7ffb5a8c	Make hint card area non-clickable.	2016-06-24 12:12:45 +01:00
Paulo Reis	e4a1443d1d	Better handling of whitespace.	2016-06-24 12:07:02 +01:00
Shane Kilkelly	249381b6a8	WIP: initial work on sending address to recurly for paypal subscriptions	2016-06-24 11:42:58 +01:00
Paulo Reis	a587d5ddba	Set up model options.	2016-06-24 11:02:29 +01:00
Henry Oswald	d294117286	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-23 16:40:22 +01:00
Henry Oswald	5371669f89	if references has no url don't send post, silently return	2016-06-23 16:39:54 +01:00
Paulo Reis	f62a45444d	Prototype mark-up and styles.	2016-06-23 12:08:13 +01:00
Shane Kilkelly	cbdcc874e3	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-22 11:03:32 +01:00
James Allen	b693ced843	Merge pull request #263 from sharelatex/pr-human-readable-logs ... Human readable logs	2016-06-21 14:28:06 +01:00
Paulo Reis	ed659fd973	Minor UI improvements.	2016-06-21 14:20:23 +01:00
Shane Kilkelly	6f07ea513e	Remove DataJoy link from the project page.	2016-06-21 13:28:08 +01:00
Henry Oswald	5800c88d80	Merge branch 'ha_custom_image_logo'	2016-06-21 12:07:49 +01:00
Paulo Reis	e607de0b91	Safety checks for non-existing values; avoid rendering the hint template when there is no hint.	2016-06-21 12:07:47 +01:00
Paulo Reis	d8e0026bc6	Add class to enable per-hint feedback tracking.	2016-06-20 17:32:57 +01:00
Paulo Reis	fe53083afd	Show thank you note after receiving feedback.	2016-06-20 15:04:47 +01:00
Paulo Reis	baea017adb	Better mark-up for analytics tracking.	2016-06-20 14:59:30 +01:00
Paulo Reis	a8976fd4dc	Use plain links instead of buttons.	2016-06-20 14:42:36 +01:00
Paulo Reis	ada018263a	Merge branch 'master' into pr-human-readable-logs	2016-06-20 11:54:56 +01:00
Paulo Reis	1893ae68a9	Add feedback widget for log hints.	2016-06-20 11:53:10 +01:00
Paulo Reis	605bb07ba3	Hint card styling.	2016-06-20 09:45:14 +01:00
Henry Oswald	fe11a4d835	include sentry below the fold	2016-06-18 12:29:52 +01:00
Henry Oswald	d2e4e22511	health checks should be on api router with no sessions	2016-06-18 11:58:26 +01:00
Henry Oswald	d27d19e02a	added override for navbar background image	2016-06-17 14:18:52 +01:00
Paulo Reis	2bfe0d0ba9	Basic mark-up for hint card.	2016-06-17 14:16:38 +01:00
Brian Gough	98a0c54004	use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-17 12:22:03 +01:00
Paulo Reis	54d48ce0ea	Support extra info URL in human readable hints.	2016-06-17 11:42:32 +01:00
Paulo Reis	40fda6e361	Support HTML in human readable log messages.	2016-06-16 16:29:19 +01:00
Paulo Reis	9b8d695e43	Match logs against ruleset; show human readable message when appropriate.	2016-06-16 15:53:39 +01:00
Brian Gough	fcd5582e6e	Merge pull request #259 from sharelatex/fix-per-user-containers ... Fix per user containers	2016-06-16 14:12:57 +01:00
Brian Gough	8a0fa1321d	add comments to router, downcase route ... express has case-insensitive routes	2016-06-16 13:59:56 +01:00
Brian Gough	6873c1d972	fix download methods in CompileController	2016-06-16 13:59:24 +01:00
Shane Kilkelly	3e3dd199a0	Add id's to buttons on beta program page	2016-06-16 10:56:16 +01:00
Shane Kilkelly	241d3bfc14	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-16 10:17:47 +01:00
Shane Kilkelly	9919f5f44a	Refactor heap analytics	2016-06-16 10:17:36 +01:00
Henry Oswald	101e98ed83	simpliyfied dashboard & fixed error with leave group shown to group owner ... - always show the manage button if you are the group owne - only show the recurly subscription part if you are the subscription owner - always try and loop through groups you can leave	2016-06-16 09:17:43 +01:00
Shane Kilkelly	5ce0100371	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-16 08:50:15 +01:00
Henry Oswald	7dad0427e8	fixed logger in notifications builder	2016-06-15 17:40:54 +01:00
Shane Kilkelly	c8302e090f	Merge branch 'master' into sk-heap-analytics	2016-06-15 15:35:47 +01:00
Shane Kilkelly	522ac8b59b	initial port of heap code from DJ into sharelatex.	2016-06-15 15:35:03 +01:00
Paulo Reis	e891a47a9e	Better support for larger text in keyboard tooltips.	2016-06-15 15:27:30 +01:00
Henry Oswald	a5abc7392d	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-15 14:45:28 +01:00
Henry Oswald	8a9a65a80a	fix the download and compile endpoint used by zip	2016-06-15 14:45:05 +01:00
Paulo Reis	d7e4009504	Small styling enhancements.	2016-06-15 10:48:40 +01:00
Paulo Reis	3310a3ea3f	Change tooltip copy; get it from i18n catalogue.	2016-06-14 17:20:16 +01:00
Paulo Reis	a9e0185098	Added tooltip with keyboard shortcut in the recompile button.	2016-06-14 17:02:22 +01:00
Brian Gough	830d15136d	fix missing variables in pdf sync	2016-06-14 08:49:08 +01:00
Henry Oswald	f9fdec8a15	whitelist /user/activate for non public access	2016-06-13 15:24:41 +01:00
Henry Oswald	84db5ec23a	added logging and default calback	2016-06-13 13:38:30 +01:00
Henry Oswald	f3e48e332b	explicit call to UserCreator.createNewUser	2016-06-13 13:38:17 +01:00
Henry Oswald	3bc3153490	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-13 13:24:04 +01:00
Henry Oswald	c52af1393e	should be able to set first and last name via user details on registration	2016-06-13 13:21:44 +01:00
Brian Gough	49a7c3c27b	Merge branch 'per-user-containers-part-2' ... Conflicts: app/coffee/Features/Compile/ClsiManager.coffee app/coffee/Features/Compile/CompileController.coffee app/coffee/Features/Compile/CompileManager.coffee	2016-06-13 12:24:48 +01:00
Brian Gough	e6dcce21fd	use build_id and user_id instead of build and user	2016-06-10 12:11:47 +01:00
Brian Gough	8bc5f53562	Merge pull request #253 from sharelatex/per-user-containers-part-1 ... Per user containers part 1	2016-06-10 09:40:00 +01:00
Brian Gough	47574d7c7e	Merge pull request #252 from sharelatex/per-user-containers-part-0 ... Per user containers part 0	2016-06-08 15:55:17 +01:00
Shane Kilkelly	ad6e9e039d	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-08 15:31:24 +01:00
Shane Kilkelly	6ca2e2204b	If user is in beta program, show link to opt-out page on the settings page.	2016-06-08 15:31:14 +01:00
Shane Kilkelly	8f1fec8c4f	Add opt-out action to beta page	2016-06-08 15:11:39 +01:00
Brian Gough	6c244eb2f4	Merge pull request #251 from sharelatex/fix-download-urls ... fix filename of downloaded pdf files	2016-06-08 14:33:12 +01:00
Shane Kilkelly	58d7d7bf74	Re-work wording of beta opt-in page.	2016-06-08 11:38:14 +01:00
Shane Kilkelly	90dac348ff	refine beta opt-in workflow.	2016-06-08 11:04:44 +01:00
Shane Kilkelly	20485cbfed	Merge branch 'sk-beta-program'	2016-06-08 10:34:03 +01:00
Shane Kilkelly	009fa79589	remove trailing parens.	2016-06-08 10:33:21 +01:00
Shane Kilkelly	0dfd80d307	Use css to add the beta symbol to the beta-label	2016-06-07 14:04:02 +01:00
Shane Kilkelly	2598661c4c	Use correct title for Beta Opt-in page	2016-06-07 13:42:06 +01:00
Shane Kilkelly	618d3ee269	fix missing require	2016-06-07 13:41:50 +01:00
Shane Kilkelly	d8f1e8ec93	Add basic BetaProgram feature.	2016-06-07 11:15:56 +01:00