3933 commits

Author	SHA1	Message	Date
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	d35a48e683	minfiy css as well	2016-06-18 21:49:32 +01:00
Henry Oswald	ec727b70a5	reduced some other images	2016-06-18 19:59:39 +01:00
Henry Oswald	4fc9c9a263	compress to 7 levels and only watch public files	2016-06-18 19:16:45 +01:00
Henry Oswald	b1e4af098d	compress images using grunt imagemin	2016-06-18 16:52:38 +01:00
Henry Oswald	1d26be30a9	added grunt imagemin used to compress images	2016-06-18 16:50:56 +01:00
Henry Oswald	fed71ea0bd	minify algolia and moment.js	2016-06-18 16:43:10 +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	acdb7f0d5c	Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo	2016-06-17 14:55:41 +01:00
Paulo Reis	7316a429c0	Increase maximum brand image height.	2016-06-17 14:55:04 +01:00
Henry Oswald	9cd3698b0e	Merge branch 'ha_custom_image_logo' of https://github.com/sharelatex/web-sharelatex into ha_custom_image_logo	2016-06-17 14:41:35 +01:00
Paulo Reis	732a0fdca0	Fit brand image into container.	2016-06-17 14:37:39 +01:00
Henry Oswald	8b79587c9b	add settings as a value to reference in defaults file	2016-06-17 14:22:20 +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	0906bef5f9	change default bcrypt rounds to 12, to match default in AuthenticationManager	2016-06-17 13:50:32 +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
Paulo Reis	f167aacc08	Add sample rules file.	2016-06-16 15:29:00 +01:00
Brian Gough	5e30310aae	restore popupDownloads=true for pdf downloads	2016-06-16 15:20:57 +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	02e3f7a02b	change download links so they do not rely on build id ... prefer the top level files, because the build directories are more ephemeral. In a shared project they can expire if there are multiple compiles.	2016-06-16 14:05:21 +01:00
Brian Gough	f045eb65d3	add query string utility function	2016-06-16 14:03:42 +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
Paulo Reis	c54f3dae20	Create human readable logs module on top of LatexLogParser; use it in the PDF controller.	2016-06-16 11:14:45 +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	e28e959941	Quick fix require statements.	2016-06-15 13:46:40 +01:00
Paulo Reis	73d16b5c9c	Merge branch 'recompile_tooltip'	2016-06-15 13:42:51 +01:00
Henry Oswald	46374f39ff	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-15 12:08:16 +01:00
Henry Oswald	560b7f7177	grunt will auto recompile client and less now, run concurrently	2016-06-15 12:08:11 +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	d6964feb2f	Revert "enable per-user containers by default" ... This reverts commit e80b8cd907605d9a7aad16496d49efff4bb08810.	2016-06-14 16:30:06 +01:00
Brian Gough	d0a273fac1	Merge pull request #257 from sharelatex/fix-synctex-position-calculation ... Fix synctex position calculation	2016-06-14 15:07:48 +01:00
Brian Gough	77de4dd432	Merge pull request #258 from sharelatex/enable-per-user-container ... enable per-user containers by default	2016-06-14 15:07:37 +01:00
Brian Gough	ed6c384b68	fix urls of downloaded files to those provided by clsi	2016-06-14 14:51:33 +01:00
Brian Gough	ecd9bed1c2	enable per-user containers by default	2016-06-14 14:21:56 +01:00
Brian Gough	991d3c7aa1	avoid exception when switching between full and split pdf view	2016-06-14 12:49:06 +01:00
Brian Gough	2840a7757f	fix bug in synctex position calculation for syncToCode	2016-06-14 12:32:54 +01:00
Brian Gough	830d15136d	fix missing variables in pdf sync	2016-06-14 08:49:08 +01:00
Paulo Reis	c815ba6ed2	Added Paulo Reis photo for the about page.	2016-06-13 15:34:16 +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	3c31988e9a	enable on-demand viewing of pdfs for per-user compiles	2016-06-10 16:06:02 +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	42f2b262c2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-08 15:41:38 +01:00
Henry Oswald	895af7c07a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-08 15:36:20 +01:00
Henry Oswald	ed17bd026d	added delete user script in grunt	2016-06-08 15:36:08 +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	8c9d15a3e4	Tweak style of the beta-feature-badge class.	2016-06-07 13:42:27 +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
Henry Oswald	4029b76d9e	- make system messages default tab in admin panel ... - add manage site tab to dropdown	2016-06-06 16:11:26 +01:00
Henry Oswald	a297c07bbb	added null check into response.outputFiles?	2016-06-06 14:56:34 +01:00
Henry Oswald	79929eae73	Merge branch 'clsichecks'	2016-06-06 14:34:22 +01:00
Shane Kilkelly	fdacf13782	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-06 13:12:31 +01:00
Shane Kilkelly	4e63a3c7bd	Move betaProgram flag up to top-level of user object	2016-06-06 13:12:24 +01:00
Henry Oswald	829b37cd74	set user email on session again on change email	2016-06-06 10:50:45 +01:00
Henry Oswald	2339cda318	added contentful uni pages as fallback	2016-06-06 09:28:53 +01:00
Brian Gough	634c774592	make code clearer when compilation is per-user	2016-06-02 16:54:46 +01:00
Brian Gough	55a8e3cffe	extend tests for per-user compiles	2016-06-02 15:48:13 +01:00
Brian Gough	ce1524cd07	remove unnecessary build id in query string ... this is now in the url	2016-06-02 15:48:13 +01:00
Brian Gough	272625fbcc	add per-user compilation in client ... enabled only when query string includes isolated=true	2016-06-02 15:48:13 +01:00
Brian Gough	9d7f129b61	add per-user compilation in server ... when no user is defined, fallback to per-project compilation	2016-06-02 15:48:13 +01:00
Brian Gough	061d4934f1	use url attribute sent back by clsi	2016-06-02 15:46:55 +01:00
Brian Gough	5be1886d43	use path attribute sent back by clsi	2016-06-02 15:43:20 +01:00
Henry Oswald	8529cb50b6	rolled back underscore and added lodash in	2016-06-02 13:18:07 +01:00
Henry Oswald	14cbf4f1c8	removed priority url from proxy to clsi	2016-06-02 13:11:20 +01:00
Henry Oswald	c284465ba5	added clsiformat checker, wired in	2016-06-02 13:09:32 +01:00
Brian Gough	b8e31dfc71	fix filename of downloaded pdf files	2016-06-01 16:47:55 +01:00
Henry Oswald	8a5cb86c31	check _checkRecoursesForErrors before compile	2016-06-01 16:46:41 +01:00
Henry Oswald	66ad587c9c	bump underscore to 1.8.3	2016-06-01 16:46:11 +01:00
Shane Kilkelly	a5aab40320	Add the betaProgram feature to User model.	2016-06-01 16:17:28 +01:00
Henry Oswald	1437877b5a	spike to check latex for basic errors before compile ... Aims to solve following problems which are currently not visible to user: - project is too big, which files are worst offenders? - when there are duplicate file names so an 'old' version keeps overrighting a new version - when a file has the same path as a folder which blows up clsi i.e. images/research images/research/1.png	2016-06-01 12:28:54 +01:00
James Allen	daf8f6f3cf	Refresh the page if the user is not logged in when joining a project	2016-05-31 11:47:48 +01:00
James Allen	345d38c28d	Don't clean up a documents event listener until after the socket has disconnected on error	2016-05-27 14:39:33 +01:00
James Allen	36c8c197e1	Add more debug log lines	2016-05-27 14:14:08 +01:00
James Allen	fec3266726	Don't remove new instance of Document from openDocs when cleaning up old instance	2016-05-27 14:13:53 +01:00
James Allen	a605dae7ba	Don't show saving just because of pending ops ... When typing continuously, there is always a pending op present. The only time we're not saving is if the inflight op isn't changing. So long as this has changed, it means the previous one has been processed.	2016-05-27 14:08:46 +01:00
James Allen	4bc31ae2b9	Don't throw an error if we get an ack for our update more than once, since we may try sending it more than once	2016-05-27 10:46:14 +01:00
James Allen	6ea58d4d6c	Don't try to resend an update if the editor is not joined to the project	2016-05-27 10:46:14 +01:00
James Allen	39e57a9886	Throw fatal error if document update actually returns an error from the real-time service	2016-05-27 10:46:14 +01:00
James Allen	0175a86d4c	Add in debugging console.logs which only display if ?debug=true is in URL	2016-05-27 10:46:14 +01:00
James Allen	41f789a313	Add in metric to track client side error count	2016-05-27 10:46:14 +01:00
Brian Gough	b55c469b91	use Url instead for url for "url" module ... to avoid possible conflicts with use of url as a variable	2016-05-26 16:24:18 +01:00
Brian Gough	d83cd547fb	Merge pull request #247 from sharelatex/add-query-string-to-proxy-and-filter-synctex-requests ... Add query string to proxy and filter synctex requests	2016-05-25 15:08:49 +01:00
Brian Gough	c7363a9df6	provide separate routes for sync-pdf and sync-code with error checking	2016-05-25 15:00:31 +01:00
James Allen	f937f0bc5c	Remove missed debugging console.log	2016-05-25 10:38:40 +01:00
James Allen	a196531a58	Move spinner add logic into same code pathway as spinner remove logic	2016-05-24 15:13:08 +01:00
James Allen	36ba88297b	Don't hang request in the event of a spelling backend error	2016-05-24 15:11:14 +01:00
James Allen	3452a9870e	Show logs when compile fails correctly	2016-05-24 15:10:55 +01:00
James Allen	35442f7ce9	Prompt the user to open a file on the left if no doc is open	2016-05-23 15:03:26 +01:00
James Allen	887631e661	Don't error if the rootDoc_id no longer exists in the project when copying	2016-05-23 14:58:28 +01:00
Henry Oswald	a24f635531	removed uneeded passing of clsiServer to _parseOutputFiles and improve logging	2016-05-21 10:23:17 +01:00
Brian Gough	7f332c0436	support url object with query-string when proxying to clsi	2016-05-20 16:51:19 +01:00
Brian Gough	3c5eb9a730	clean up whitespace	2016-05-20 16:35:00 +01:00
Shane Kilkelly	0c454f5ddd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-05-20 14:34:55 +01:00
Shane Kilkelly	2441930fe9	Add a spinner when waiting for image preview to load.	2016-05-20 14:28:51 +01:00
Henry Oswald	c918028d14	removed clsi priorty url	2016-05-20 12:46:14 +01:00
Henry Oswald	11724fce13	Merge branch 'master' into clsi-dynamic-load	2016-05-20 12:34:42 +01:00
Brian Gough	eaa41e4361	support displaying output files using .url parameter from clsi	2016-05-20 11:34:22 +01:00
Shane Kilkelly	939c7a8c72	Force reload BinaryFile view when a new object is selected.	2016-05-20 11:20:00 +01:00
Shane Kilkelly	2e2354c574	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-05-20 09:17:35 +01:00
Shane Kilkelly	9a6876d237	Toggle the dots at the end of bib preview, based on size of payload.	2016-05-20 09:17:25 +01:00
Henry Oswald	61b9a683aa	put clsiCookie vals into subobject in settings	2016-05-19 16:55:58 +01:00
Henry Oswald	04e70735d2	Merge branch 'master' into clsi-dynamic-load	2016-05-19 16:26:54 +01:00
Henry Oswald	f03a076669	make cash bust add onto object not recreate it	2016-05-19 16:23:56 +01:00
Brian Gough	5497eb86d1	Merge pull request #245 from sharelatex/clean-up-log-requests-in-pdf-controller ... clean up log requests, avoid requesting blg file when not present	2016-05-19 16:13:21 +01:00
Shane Kilkelly	0ea16f0bcc	Index '.bib' file objects.	2016-05-19 14:58:12 +01:00
Henry Oswald	789257fd4a	use cookie key when setting cookie for jar	2016-05-19 13:52:18 +01:00
Henry Oswald	036b179ffe	put the clsiserverid onto qs object for correct server allocation	2016-05-19 13:28:20 +01:00
Henry Oswald	2abebd850c	Merge branch 'project_url_query' into clsi-dynamic-load	2016-05-19 13:08:20 +01:00
Shane Kilkelly	b649c13c17	Eliminate weird flicker when loading bibtex	2016-05-19 11:25:24 +01:00
Shane Kilkelly	b70a993572	Make bib previews more robust.	2016-05-19 11:11:23 +01:00
Shane Kilkelly	199844db2d	Fix styling of the bib-loading div.	2016-05-19 10:02:46 +01:00
Shane Kilkelly	3c298ed6ad	Preview up to Two Megabytes of bib files	2016-05-19 10:02:25 +01:00
Shane Kilkelly	5df5ba868c	Fix logic for showing error or loading message.	2016-05-19 10:02:07 +01:00
Shane Kilkelly	4509642914	use highlight colour for any font-awesome icons in file-tree.	2016-05-18 16:34:50 +01:00
Brian Gough	6305cea3e3	clean up log requests, avoid requesting blg file when not present	2016-05-18 16:17:38 +01:00
Shane Kilkelly	10f64004fc	Show a book icon for *.bib files.	2016-05-18 15:58:24 +01:00
James Allen	d813f45d28	Cherry-pick 0e70320 (Select icon based on file extension) from datajoy	2016-05-18 15:58:01 +01:00
Henry Oswald	d2cc75b73f	changed $scope.pdf.clsiServerId to ide.clsiServerId	2016-05-18 14:38:17 +01:00
Henry Oswald	dba8d96d11	pass clsiServerId to the client and use it as query stirng for requests	2016-05-18 12:50:50 +01:00
Shane Kilkelly	8621d497b4	Fix view so that bib preview only shows for bib files	2016-05-18 11:14:24 +01:00
Henry Oswald	b0baea5073	add query string to end of project resources	2016-05-18 10:09:22 +01:00
Shane Kilkelly	78e52d8c96	Update FileStoreHandlerTests	2016-05-18 09:58:57 +01:00
Shane Kilkelly	eae82a2b20	Preview bib files.	2016-05-17 17:00:14 +01:00
Shane Kilkelly	4f533147b1	enable range requests on files via ?range=m-n query string.	2016-05-17 16:59:47 +01:00
Shane Kilkelly	af78e893f9	Merge branch 'sk-file-based-ref-import'	2016-05-17 11:48:01 +01:00
Shane Kilkelly	30a778c8e8	add temp module	2016-05-13 13:30:00 +01:00
Brian Gough	40464fe5b5	Merge pull request #244 from sharelatex/add-fast-path-to-pdf ... Add fast path to pdf	2016-05-13 13:25:49 +01:00
Brian Gough	ac7aa5f936	request output files using /project/project_id/build/build_id/output/* route ... avoids using query string for build_id	2016-05-13 11:48:58 +01:00
Brian Gough	ee15bbeee0	support the direct path to a clsi output file /project/project_id/build/build_id/output/* ... this avoids use of the query string ?build=... and so we can match the url directly with the nginx location directive	2016-05-13 10:33:38 +01:00
Shane Kilkelly	ae85dc3f5d	Enable spaces after commas in references autocomplete	2016-05-12 15:13:00 +01:00
Shane Kilkelly	9eb2e933cd	enable autocomplete on citations like citeauthor	2016-05-12 12:03:08 +01:00
Shane Kilkelly	60cc1bfbff	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-05-12 11:02:54 +01:00
Shane Kilkelly	41a6fa1480	Fix uncompiled pdf view	2016-05-12 11:02:24 +01:00
Brian Gough	ab0bcd4f57	increase default pdfjs chunk size from 64K to 128K	2016-05-10 15:53:37 +01:00
James Allen	aafdc794cd	Remove text limit in content box of contact us	2016-05-10 10:44:51 +01:00
Henry Oswald	b8510301b6	expire cookie key from setting file length	2016-05-06 12:19:22 +01:00
Henry Oswald	ed4fdd48d7	clsi cookies are given an expire time via settings file	2016-05-05 16:50:18 +01:00
Henry Oswald	618935b643	hide hidden domains in hreflang head of html	2016-05-04 22:01:02 +01:00
Shane Kilkelly	48b7800c7f	Revert, because mistake.	2016-05-04 10:43:40 +01:00
Shane Kilkelly	a1552aa872	reset the 'failedLoad' state when a new entity is selected	2016-05-04 10:08:48 +01:00
Shane Kilkelly	9738703424	If image preview fails to load, just show the "no preview" message	2016-05-04 09:32:59 +01:00
Shane Kilkelly	aa301dacb9	Return callback with error if an error is emitted on filestore stream.	2016-05-04 09:32:13 +01:00
Henry Oswald	b237a022c3	added rate limiting on wiki endpoint	2016-04-28 17:24:00 +01:00
Henry Oswald	9db647491a	added different ldap config example	2016-04-28 17:21:07 +01:00
Shane Kilkelly	74205ce11b	Remove features.mendeley and features.zotero from User model	2016-04-28 16:01:47 +01:00
Henry Oswald	b00bd5cd94	if clsi cookies are not enabled don't call redis, return empty	2016-04-27 17:05:12 +01:00
Henry Oswald	78b08060ab	redis get not multi used for _getServerId	2016-04-27 16:56:21 +01:00
Henry Oswald	1ee94f9bf5	return server id for set server id and _populateServerIdViaRequest	2016-04-27 16:20:10 +01:00
Henry Oswald	ae522e8b9b	Merge pull request #235 from mdamien/patch-1 ... Correct alignment for word count dialog	2016-04-27 16:12:03 +01:00
Shane Kilkelly	07ad6eb704	actually use the rendering-error state.	2016-04-25 12:42:03 +01:00
Henry Oswald	616630200a	improve send calls and return correct stuff from _makeRequest	2016-04-20 17:08:11 +01:00
Henry Oswald	18560d8621	set server cookie on every compile response and don't expire on get	2016-04-20 16:17:06 +01:00
Henry Oswald	4d54de8b9a	renamed ClsiRequestManager to ClsiCookieManager and improved logging	2016-04-20 15:06:39 +01:00
Henry Oswald	b37595acf9	persist cookie in redis for compiles.	2016-04-19 16:48:51 +01:00
Shane Kilkelly	ce34ce6865	Merge branch 'master' into sk-tpr	2016-04-19 13:56:54 +01:00
Shane Kilkelly	d54515a9a7	add a featureToggle property to ide.	2016-04-19 11:53:27 +01:00
Caleb Cooper	145b201087	Put brackets around the example ca path for ldap starttls support in the default config. This resolves an issue where the system was breaking the path into an array and trying to act on the first item in that array, "/", rather than the full path.	2016-04-15 13:46:11 -04:00
Shane Kilkelly	fbf5d35fa5	Merge branch 'master' into sk-tpr	2016-04-15 09:46:16 +01:00
Shane Kilkelly	9d027b88ba	Bug fix: re-introduce the project-too-large error message	2016-04-15 09:45:48 +01:00
Henry Oswald	ffa04c7b55	add project url onto query string for compile hashing	2016-04-13 15:38:04 +01:00
Shane Kilkelly	939d7cd042	Merge branch 'master' into sk-tpr	2016-04-11 16:41:34 +01:00
Shane Kilkelly	749d2aa013	Merge branch 'sk-safari-freeze-fix'	2016-04-11 14:47:03 +01:00
Shane Kilkelly	76697599ae	Use the _ide version of browserIsSafari	2016-04-11 14:45:26 +01:00
Shane Kilkelly	e3b2ec9977	Add a ide.browserIsSafari boolean flag.	2016-04-11 14:35:59 +01:00
Shane Kilkelly	8d6003dcc5	Add commentary	2016-04-11 09:58:37 +01:00
Shane Kilkelly	4fd4a0372c	In Safari, limit iterations of the command-parsing loop.	2016-04-11 09:55:53 +01:00
Henry Oswald	010bb61baf	add michael pic	2016-04-11 08:26:06 +01:00
Henrique Dias	ae79ce75b7	Update settings.defaults.coffee	2016-04-06 11:32:08 -03:00
Henrique Dias	38c8eb868a	Update package.json	2016-04-06 11:30:26 -03:00
Henry Oswald	424e09ec05	getGroupSubscriptionMemberOf gets plan code	2016-04-05 16:03:46 +01:00
Henry Oswald	bd54218cc9	added grunt as depenency	2016-04-05 14:17:36 +01:00
Damien	77eba3ea22	Correct alignment for word count dialog ... on less than `md` sized screen	2016-04-04 23:47:40 +02:00
Henry Oswald	633839c98b	for support tickets include browser/os and hide email address if ... set already. This way we know who they are logged in with which has caused condfusion.	2016-04-04 16:05:42 +01:00
Shane Kilkelly	a686d187ad	Pull refProviders into user model	2016-04-01 11:36:19 +01:00
Henry Oswald	3d719af71e	if subscription is downgraded don't use plan code on subscription, use default instead	2016-03-31 18:04:20 +01:00
Henry Oswald	81cd2adfd3	member_ids != members_id	2016-03-31 17:36:06 +01:00
Henry Oswald	d80191c03b	added more logging and missing err handler in subscription updater	2016-03-31 17:28:03 +01:00
Shane Kilkelly	0ce514a5a6	Add features to the user object in ide.	2016-03-31 17:10:49 +01:00
Henry Oswald	5a201153c7	refactored subscription updater again adding _setUsersMinimumFeatures ... single place you can call and the users minimum features are set	2016-03-31 16:58:16 +01:00
Henry Oswald	cb3eb88af2	Merge branch 'subscriptionimprovements'	2016-03-31 11:58:56 +01:00
Henry Oswald	db8fb63bb5	fixed change payment details page ... also increased size of year field for firefox users and removed unnded options in new plan page	2016-03-31 11:54:52 +01:00
Shane Kilkelly	059d3432c2	Allow citations like -parencite[page 6]{ to work.	2016-03-30 11:28:56 +01:00
Henry Oswald	c7da9f1eef	added different check to contact-us modal	2016-03-29 14:25:59 +01:00
Henry Oswald	1a651b38f4	added sendgrid as email option	2016-03-29 14:15:33 +01:00
Henry Oswald	e2dffdf722	when user contact us put project url at bottom of message	2016-03-24 14:23:18 +00:00
Henry Oswald	e9478e0843	Merge branch 'templatessearch'	2016-03-24 12:06:41 +00:00
Henry Oswald	6662d4c2cd	wired up modal for learn and added translations	2016-03-24 12:05:54 +00:00
James Allen	63c183402c	Style active and focus states of search results too	2016-03-24 11:42:48 +00:00
James Allen	9b84e1b164	Improve styling of wiki search	2016-03-24 11:38:56 +00:00
Henry Oswald	ce2cfeaa5b	don't show search bar in templates if its not configured	2016-03-24 09:52:19 +00:00
Henry Oswald	6a4e13d3c8	added templates angular file forgoten in last commit	2016-03-24 09:35:11 +00:00
Henry Oswald	7634fcf3af	added missing page button (not wired up) to /learn	2016-03-23 18:23:09 +00:00
Henry Oswald	90092a0c61	improved styling, not perefect still	2016-03-23 16:05:38 +00:00
James Allen	3fe0674462	Revert "Add error handling in mkdir_p" ... This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319. Apparently mkdirp needs errors to be ignored to work...	2016-03-23 15:33:01 +00:00
James Allen	4d0fe3bf5d	Add error handling in mkdir_p	2016-03-23 15:18:10 +00:00
James Allen	ae5467894b	Standardise on one Errors file	2016-03-23 15:14:49 +00:00
James Allen	a95c941cb9	Fix FileStore unit tests	2016-03-23 15:13:32 +00:00
James Allen	bad9a0282d	Add missing error handler	2016-03-23 14:38:11 +00:00
James Allen	c827407a99	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-23 11:29:59 +00:00
James Allen	3d8ac9f292	Add in a few null checks ... These were discovered by using a project that was messed up with the moving folder bug where the folder ended up without an id, docs or fileRefs array	2016-03-23 10:54:36 +00:00
Henry Oswald	de0aa1035d	pulled tempaltes search into its own file	2016-03-22 22:29:18 +00:00
Henry Oswald	9cfbbfa504	template search works nicely, needs styling	2016-03-22 22:16:38 +00:00
Henry Oswald	cf45b8bd74	Merge branch 'master' into templatessearch	2016-03-22 21:35:36 +00:00
Henry Oswald	c554b0630d	if user has subscription before joining group is given option to cancel personal one	2016-03-22 16:59:47 +00:00
Shane Kilkelly	62ececeef8	show logs on failure.	2016-03-22 16:59:40 +00:00
Henry Oswald	a6859e22b3	if user is member of group on downgrade use the group subscription	2016-03-22 16:05:46 +00:00
Shane Kilkelly	2c321a4803	If the compile request errors out, set view to 'errors'.	2016-03-22 15:51:05 +00:00
Shane Kilkelly	b212f33505	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 15:21:00 +00:00
James Allen	9706585d21	Fix translate in delete modal confirm button	2016-03-22 14:44:13 +00:00
Shane Kilkelly	12b0e982c8	Don't raise an error if output.blg cannot be found.	2016-03-22 14:42:00 +00:00
Shane Kilkelly	d566ce3fd2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 14:38:56 +00:00
Shane Kilkelly	d5c280dc4d	Show the pdf if it was already loaded. ... This ensures the pdf will be visible if the user switches to fullscreen-view.	2016-03-22 14:38:48 +00:00
Henry Oswald	a89edde139	subscription tests fixed	2016-03-22 14:27:05 +00:00
Henry Oswald	cc84aaf834	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-22 14:19:54 +00:00
Henry Oswald	7fb0249b2b	null check subscription for custom accounts page	2016-03-22 14:19:46 +00:00
James Allen	a597ebfd90	Only show deleted files in track changes view	2016-03-22 14:13:50 +00:00
Henry Oswald	fbfd160c6d	default message to empty string	2016-03-22 14:02:15 +00:00
Shane Kilkelly	b8c3b427ee	Merge branch 'sk-pdf-error-display'	2016-03-22 14:00:12 +00:00
Shane Kilkelly	2dd9aa9424	Merge branch 'sk-environment-autocomplete'	2016-03-22 13:55:41 +00:00
Henry Oswald	cacb3bf39e	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-22 12:30:52 +00:00
Henry Oswald	69a7a1508b	modal != modal instance	2016-03-22 12:28:37 +00:00
James Allen	7637c858c8	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 12:14:18 +00:00
James Allen	4595c90363	Use translations for action in project delete modal	2016-03-22 12:12:11 +00:00
James Allen	aa1f2cc8a9	Remove #s in href on project list buttons	2016-03-22 12:11:59 +00:00
Henry Oswald	c777f498ad	Merge branch 'groove2'	2016-03-22 11:58:04 +00:00
James Allen	49bb4f07ea	Move delete docs into view in file-tree element	2016-03-22 11:15:52 +00:00
Shane Kilkelly	45077cfba9	Merge branch 'master' into sk-pdf-error-display	2016-03-22 10:56:59 +00:00
Shane Kilkelly	723031f7f3	un-show logs on successful run.	2016-03-22 10:32:55 +00:00
Shane Kilkelly	293cb3c73e	fix typo	2016-03-22 10:32:44 +00:00
Shane Kilkelly	4f3755318f	Clean up.	2016-03-22 10:24:58 +00:00
James Allen	f182fbf396	Convert 'anonymous-user' from real-time api in 'null' internally	2016-03-22 09:53:47 +00:00
Shane Kilkelly	59b131f251	First pass at refactoring the output panel views.	2016-03-22 09:39:33 +00:00
James Allen	2af2dd694e	Use null to represent anonymous user, as AuthorizationManager expects	2016-03-22 09:39:25 +00:00
James Allen	7791805949	Allow admin access to projects	2016-03-21 17:03:41 +00:00
Henry Oswald	840d3b75bb	listen for close not exit when working with unzip command ... sometimes the command will fail because stout has not finished yet	2016-03-21 16:37:29 +00:00
Henry Oswald	4d7ed1cb17	improved logging from unzip command	2016-03-21 16:00:12 +00:00
Shane Kilkelly	f58f1c3795	Account for the new too-recently-compiled error.	2016-03-21 15:16:17 +00:00
Shane Kilkelly	53dfa841cc	Add the beginnings of a clsi-maintenance-mode message	2016-03-21 15:00:25 +00:00
Shane Kilkelly	3b35605edc	Show logs, even if the compile timed out.	2016-03-21 14:05:26 +00:00
James Allen	9a0ec9c292	Don't throw fatal error when recently compiled	2016-03-21 13:54:45 +00:00
James Allen	8bfc613bb3	Log client side errors as warns so they don't show in Sentry	2016-03-21 13:29:34 +00:00
James Allen	6beb29f449	Don't treat no root resource as a fatal error	2016-03-21 13:28:53 +00:00
James Allen	8fb3e629e8	Require logins for all uploads to projects	2016-03-21 13:23:14 +00:00
Shane Kilkelly	9b22efbd98	split errors into normal error, and renderingError.	2016-03-21 13:20:03 +00:00
James Allen	0ba70e7ccc	Remove missing parameter in log lines	2016-03-21 13:15:57 +00:00
James Allen	2a9e451876	Refine error page to in all situations, and don't send sentry errors on not found errors	2016-03-21 11:55:59 +00:00
Henry Oswald	4e78e34cdf	finished contact us with groove ... for settings file: <a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>	2016-03-21 11:41:05 +00:00
Shane Kilkelly	a704289099	Show the error view, even when the pdf is in an error state.	2016-03-21 10:26:39 +00:00
James Allen	e7d67668e9	Improve error reporting and show 404 when project ids are malformed	2016-03-18 15:59:12 +00:00
James Allen	88b8ce1f80	Enable working settings acceptance tests	2016-03-18 15:59:12 +00:00
Henry Oswald	882297c353	working framework. not happy with groove. Can't set mailbox	2016-03-18 12:55:35 +00:00
Shane Kilkelly	35b5d3cc05	Update ReferencesHandlerTests.	2016-03-18 11:43:39 +00:00
Henry Oswald	209c8ebbfc	wip	2016-03-18 11:31:50 +00:00
Shane Kilkelly	f3db114654	Use the mongojs based apis to get Project and User information.	2016-03-18 11:20:33 +00:00
James Allen	de02928454	Merge branch 'master' into ja_email_tokens	2016-03-17 17:01:26 +00:00
Shane Kilkelly	11d77df898	Fix weird tab behaviour	2016-03-17 16:18:46 +00:00
Shane Kilkelly	020fd2e88d	De-dupe autocomplete entries	2016-03-17 15:58:57 +00:00
Shane Kilkelly	53b46e42cd	Refactor, take indentation into account.	2016-03-17 15:27:20 +00:00
Shane Kilkelly	229ced6f2f	Remove Indentation.	2016-03-17 14:43:34 +00:00
Shane Kilkelly	95a6e1900e	Add autocomplete entries for the end{} commands	2016-03-17 14:09:45 +00:00
Henry Oswald	c980382196	make calls to learn wiki run in parallel, ... only saves about 150ms but ever little helps	2016-03-17 12:55:28 +00:00
Shane Kilkelly	d655e99439	Parse existing begin commands too.	2016-03-17 12:07:21 +00:00
Shane Kilkelly	eebd25351d	Add the custom environments to the list of snippets	2016-03-17 11:23:53 +00:00
Shane Kilkelly	c25c2b676a	Parse \newenvironment{} commands.	2016-03-17 11:14:05 +00:00
Shane Kilkelly	115734f82e	Rename Snippets -> SnippetManager	2016-03-17 10:04:14 +00:00
Shane Kilkelly	7cc3f7613e	Move the getCompletions call for Snippets into the Snippets module.	2016-03-17 10:00:07 +00:00
Shane Kilkelly	2985a0b0b2	Account for later commands on the same line.	2016-03-16 11:42:30 +00:00
Shane Kilkelly	027c82ed6b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-15 16:02:54 +00:00
Shane Kilkelly	cff00c09b0	Add a '}' at the end of citation autocomplete if required.	2016-03-15 16:02:48 +00:00
James Allen	60a39f82c1	Fix off by one bug in moving folders from using an out of date project structure	2016-03-15 15:14:54 +00:00
James Allen	75d9912449	Use _.defaults to simplify assigning default features	2016-03-15 14:44:06 +00:00
James Allen	b7d226f434	Make privilege level check in EditorHttpController more explicit	2016-03-15 14:39:27 +00:00
James Allen	261466b042	Convert privilege levels to an enum	2016-03-15 14:35:01 +00:00
James Allen	398d43e2d1	Add missing ? check	2016-03-15 14:15:25 +00:00
James Allen	724e6b5263	Require explicit value of true for ENV variables in config	2016-03-15 14:14:33 +00:00
James Allen	fe1f71413e	Use ProjectGetter, not Project, in ProjectController.loadEditor	2016-03-15 14:12:43 +00:00
James Allen	d09705142e	Add in missing error checks	2016-03-15 14:07:34 +00:00
James Allen	5781894453	Do array null check in callback args	2016-03-15 14:05:59 +00:00
Henry Oswald	76b3a78988	added lock around move element	2016-03-15 12:29:41 +00:00
Henry Oswald	d07e084446	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-15 11:34:46 +00:00
Henry Oswald	ba9bc3a2e8	check that element being inserted has an _id	2016-03-15 11:29:59 +00:00
James Allen	b556d57f40	Remove missed console.log debugging lines in AuthenticationController.coffee	2016-03-14 17:11:23 +00:00
James Allen	71ef045728	Implement authorization guards in Authorization{Manager,Controller}	2016-03-14 17:06:57 +00:00
Shane Kilkelly	2d4ced6a1c	If user is not project owner, ask them to ask the owner to upgrade.	2016-03-14 16:19:08 +00:00
Henry Oswald	f24bc2c501	log out error when can't send to tpds worker	2016-03-14 14:44:45 +00:00
Henry Oswald	1b39b01114	check err on _putElement for file in project	2016-03-14 14:42:13 +00:00
Henry Oswald	8be55f760f	swallow error if tpdsworker can not be comunicated with on addFile	2016-03-14 10:49:28 +00:00
Henry Oswald	3fc357a343	Merge branch 'master' into projectsizelimit	2016-03-14 10:31:07 +00:00
Henry Oswald	086875d50c	added logging	2016-03-14 10:08:47 +00:00
Henry Oswald	15c6e49d1a	if user changes email then check if they have a site licence	2016-03-13 22:31:14 +00:00
Henry Oswald	88f8b701c8	Merge branch 'fschecks'	2016-03-13 15:52:13 +00:00
Henry Oswald	8812ff445e	change zip size check to spawn	2016-03-12 15:43:16 +00:00
Henry Oswald	f11ba97389	check stat.isFile and isDirectory rather then symlink	2016-03-12 15:05:29 +00:00
Henry Oswald	6664b67fba	check size of zip files	2016-03-12 12:38:21 +00:00
Henry Oswald	da242d90e6	added extra isSymLink checks into reading files	2016-03-12 12:01:36 +00:00
Henry Oswald	7e216391b7	wip	2016-03-12 10:55:17 +00:00
Shane Kilkelly	3ba5808074	Merge branch 'master' into sk-biber-errors	2016-03-11 13:54:06 +00:00
Shane Kilkelly	c4d49f6cf9	Update parser	2016-03-11 13:53:39 +00:00
Shane Kilkelly	5b9fa6d7d6	Upgrade parser.	2016-03-11 11:20:24 +00:00
James Allen	1bd8b8d1a3	Delete SecurityManager and replace with (unwritten) AuthorizationManager	2016-03-10 17:17:26 +00:00
James Allen	3e03164ed4	Remove dead auth_token code	2016-03-10 17:15:14 +00:00
Henry Oswald	36966f0c9b	wip	2016-03-10 17:11:28 +00:00
Shane Kilkelly	170d3f646b	Upgrade parser.	2016-03-10 16:01:54 +00:00
Henry Oswald	347bfe4a79	use cb for internal callbacks	2016-03-10 12:43:36 +00:00
Henry Oswald	3c4e74af4b	project duplicator works and tests pass. ... not so bad now.	2016-03-10 12:42:21 +00:00
Henry Oswald	d801ab623a	project duplicator works, tests don't	2016-03-10 11:58:05 +00:00
James Allen	e36be96ec9	Move public access setting to its own end point	2016-03-10 11:13:57 +00:00
James Allen	d235ab22ed	Add in tests for public read-only projects	2016-03-09 16:28:46 +00:00
James Allen	c46c083b31	Check write access to documents via real-time end point	2016-03-09 16:26:18 +00:00
Shane Kilkelly	9281d8029d	Upgrade the bib log parser to handle bibtex errors and warnings.	2016-03-09 16:11:25 +00:00
Henry Oswald	bf8f9f6d41	change key to maxEntitiesPerProject	2016-03-09 15:53:03 +00:00
James Allen	2116d0271c	Update acceptance tests for public projects	2016-03-09 15:30:23 +00:00
Henry Oswald	f108c01ea5	don't do a project rename if the name is the same ... this prevents double renaming which happens when you press enter as well as no name change	2016-03-09 14:47:57 +00:00
Henry Oswald	940586f654	sped up unit tests to improve speed ... also removed some unneeded requires.	2016-03-09 12:51:19 +00:00
James Allen	4f9f255153	Extend acceptance tests to include shared projects	2016-03-09 12:31:46 +00:00
Henry Oswald	a33b480c67	added more logging to subscription group handler	2016-03-09 11:20:17 +00:00
Henry Oswald	5be05a35d8	added WithProject versions of functions ... rather than project_or_id	2016-03-09 11:16:27 +00:00
Shane Kilkelly	cb28fe0891	use the renamed bib-parser.	2016-03-08 16:18:02 +00:00
James Allen	e1fa77dd72	Add beginnings of acceptance tests	2016-03-08 15:59:04 +00:00
Shane Kilkelly	6911de1149	Merge branch 'master' into sk-biber-errors	2016-03-08 14:55:19 +00:00
Henry Oswald	57f00d76bd	get project name on entity move	2016-03-08 14:46:53 +00:00
James Allen	37c966ba7e	Fix unit test	2016-03-08 14:42:11 +00:00
Shane Kilkelly	8f2d2cfeff	Merge branch 'ja_email_tokens' of github.com:sharelatex/web-sharelatex into ja_email_tokens	2016-03-08 14:38:31 +00:00
Shane Kilkelly	3e423b8a06	Another find->findOne	2016-03-08 14:38:25 +00:00
Henry Oswald	ede159d833	changed logging for archiving projects from delete to archived	2016-03-08 14:38:23 +00:00
James Allen	e53fc5f0b6	Remove dead code (Project.findPopulatedById)	2016-03-08 14:20:53 +00:00
James Allen	76af5e5563	Don't call deprecated findPopulatedById in loadEditor	2016-03-08 14:20:00 +00:00
James Allen	359689ffea	find -> findOne	2016-03-08 14:19:38 +00:00
Henry Oswald	3643f6ef4f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-03-08 14:13:40 +00:00
James Allen	0882eb2a99	Don't use deprecated Project.findPopulatedById in ReferencesManager	2016-03-08 14:05:56 +00:00
Shane Kilkelly	471cb95091	Clean up a bit, and upgrade parser.	2016-03-08 14:04:42 +00:00
Shane Kilkelly	08de7b8abe	Upgrade biber-log-parser.js	2016-03-08 13:56:17 +00:00
Shane Kilkelly	f6d02090d2	First pass at parsing and showing decent biber errors.	2016-03-08 13:20:23 +00:00
James Allen	b64c8e3d78	Delete dead code in User model	2016-03-08 12:07:50 +00:00
James Allen	40048d49a2	Fix unit test	2016-03-08 12:07:42 +00:00
James Allen	5f5445f625	Use TpdsUpdateSender to use CollaboratorsHandler	2016-03-08 11:54:45 +00:00
James Allen	e814dfa7a8	Proxy .gif files to the blog too	2016-03-07 16:39:16 +00:00
James Allen	a50bdaf5cc	Refactor LimitationsManager to use CollaboratorsHandler	2016-03-07 15:32:04 +00:00
James Allen	bedc8a0492	Remove ProjectGetter.populateProjectWithUsers	2016-03-07 15:25:10 +00:00
James Allen	2ba2b72fd1	Refactor ProjectDeleter to use CollaboratorHandler	2016-03-07 12:27:40 +00:00
James Allen	6d93076d51	Refactor getCollaborators http method to use CollaboratorsHandler	2016-03-07 12:02:48 +00:00
James Allen	1a689aa1fd	Move findAllUsersProjects from Project to ProjectGetter	2016-03-03 17:19:03 +00:00
James Allen	120a142733	Add in required abstracted functions to CollaboratorsHandler	2016-03-03 16:13:19 +00:00
Brian Gough	d89e855314	add client-side spelling cache to reduce load on server	2016-03-03 16:00:10 +00:00
Shane Kilkelly	020e1b9b34	Add styles for the references search hint.	2016-03-03 11:44:11 +00:00
Henry Oswald	4af0341e84	don't stop if add entity doens't make it to tpdsworker	2016-03-02 17:34:21 +00:00
Henry Oswald	789abe504d	added random ticket number to groove tickets	2016-03-02 12:23:51 +00:00
Henry Oswald	8a4a320f4b	done -> close on modal for sharing	2016-03-01 20:17:15 +00:00
Shane Kilkelly	d76e5fdbf4	Styles for references search journal	2016-03-01 16:29:19 +00:00
Henry Oswald	39c7010d72	fixed broken tests	2016-02-29 22:51:46 +00:00
Henry Oswald	76591ebb23	made ProjectGetter.getProject more robust ... it can deal with multiple types of query better, including mongoose ids which are not being matched like mongojs ids.	2016-02-29 19:01:46 +00:00
Henry Oswald	6a7395a287	brought back the project_or_id style ... Added functionality into project getter, its a big performance improvement for things like cloning projects. Clone a 500 element project, 1 mongo get or 500.	2016-02-29 17:34:38 +00:00
Henry Oswald	b5dd96aa71	fixed some mongo calls in project entity handler ... need to specify fields you want to not get array back.	2016-02-29 16:03:22 +00:00
Shane Kilkelly	ca43d27244	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-29 15:52:09 +00:00
Shane Kilkelly	b005f8233e	guard against null and undefined keys in \cite{} autocomplete	2016-02-29 15:52:02 +00:00
Henry Oswald	1e8523c227	don't emmit to room new entities if they errored.	2016-02-29 13:05:37 +00:00
Henry Oswald	8f0d1dc73e	add in the calls to block large projects	2016-02-29 13:05:17 +00:00
Henry Oswald	8aec86af4e	moved count element to project entity handler and added tests	2016-02-26 13:25:09 +00:00
Henry Oswald	d95526bd8b	ProjectGetter.findRootDoc moved to mongojs	2016-02-26 08:35:10 +00:00
Henry Oswald	eedaa43b58	move project duplicator to mongojs	2016-02-26 08:32:00 +00:00
Henry Oswald	6ca69f88ac	Move project locator to mongojs	2016-02-26 08:31:47 +00:00
Henry Oswald	586d4cbae1	replaced all mongoose Project.find with mongojs calls	2016-02-26 08:23:43 +00:00
Henry Oswald	b6d62a677b	ProjectDeleter.archiveProject doesn't need to get entire project	2016-02-26 08:13:41 +00:00
Henry Oswald	447568aa91	ProjectDetailsHandler.getDetails does not need full project	2016-02-26 07:56:26 +00:00
Henry Oswald	43102e0ffc	lowercase and trim add user to group email address	2016-02-25 14:15:56 +00:00
James Allen	155831c3e7	Skip top-level directory if it exists in zip upload	2016-02-24 17:21:20 +00:00
James Allen	d3e3deb679	Fix padding around active toolbar links	2016-02-24 16:37:03 +00:00
James Allen	71ca358e0e	Show confirmation if upload will overwrite files	2016-02-24 16:37:03 +00:00
James Allen	c6dcb64b18	Overwrite text files from uploads	2016-02-24 16:37:03 +00:00
Henry Oswald	09ac8f8c7a	move .putElement into ProjectEntityHandler with tests	2016-02-24 15:36:39 +00:00
Shane Kilkelly	34bfdcc246	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-24 10:27:44 +00:00
Shane Kilkelly	4f3a4880d9	remove margin above search results.	2016-02-24 10:27:29 +00:00
Henry Oswald	a8060109fd	spike of limit	2016-02-24 08:06:40 +00:00
Henry Oswald	1e6f5997dc	use cb for internal async callbacks and inline call	2016-02-23 15:50:30 +00:00
Henry Oswald	7a28eeeaa0	ProjectEntityHandler.addFolder take only project id and ... only gets project folder structure	2016-02-23 15:45:40 +00:00
Henry Oswald	2a6e09a41b	remove console.log	2016-02-23 15:37:23 +00:00
Henry Oswald	1278081b51	mkdirp only needs folder strucutre	2016-02-23 15:36:59 +00:00
Henry Oswald	1d76850ebd	copyFileFromExistingProject does not need the whole project	2016-02-23 15:34:31 +00:00
Henry Oswald	6f474d9a00	put element just needs project folder structure not docs inside	2016-02-23 15:27:55 +00:00
James Allen	2c20b7d16f	Bring full screen PDF icon into scrollable div	2016-02-23 15:25:04 +00:00
James Allen	ff7632d6c7	Don't reload editor with file tree or PDF viewer hidden	2016-02-23 15:21:54 +00:00
James Allen	fde7efbb9f	Fix rename button styling in editor	2016-02-23 15:21:54 +00:00
James Allen	f21aa0dd94	Don't allow project names to be blank	2016-02-23 15:21:53 +00:00
Henry Oswald	b504732733	fixed calls to addUserToGroup and added more logging	2016-02-22 16:50:41 +00:00
Henry Oswald	103bb1c88f	add more error logging to group handler	2016-02-22 16:01:26 +00:00
Shane Kilkelly	1e1f57a80b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-22 12:04:43 +00:00
Shane Kilkelly	2d954baa62	match cite commands like footcite too.	2016-02-22 12:04:15 +00:00
Henry Oswald	85a8bc97ed	add leave group button for group subscriptions	2016-02-19 12:27:32 +00:00
Shane Kilkelly	b505f0d455	Merge branch 'sk-references-search' ... Conflicts: app/coffee/Features/References/ReferencesController.coffee	2016-02-19 11:30:55 +00:00
James Allen	bf36413491	Improve styling of upgrade messages	2016-02-18 14:53:49 +00:00
Shane Kilkelly	ef1cec8582	update the search_example.gif	2016-02-18 13:54:13 +00:00
Henry Oswald	29e4b324fd	improve calls for invite notifications and auto mark as read	2016-02-18 11:43:43 +00:00
Henry Oswald	f824a3e28a	kill off dead code in group handler	2016-02-18 11:42:26 +00:00
Shane Kilkelly	8384433231	Clean up and add comments to references-search styles.	2016-02-18 10:47:28 +00:00
Henry Oswald	bd54cc722a	fixed broken tests in AuthenticationController	2016-02-18 10:16:50 +00:00
Henry Oswald	fc4bd94a6e	don't create notification if user is already part of group	2016-02-18 10:06:21 +00:00
Shane Kilkelly	d94e3181c3	update references search preview gif.	2016-02-17 16:44:41 +00:00
Henry Oswald	c8084406d3	user notifications auto created on login for joinging groups	2016-02-17 16:24:09 +00:00
Henry Oswald	8a417035ea	remove unned debug line	2016-02-17 16:23:52 +00:00
Shane Kilkelly	f23a11eacb	Refine call-to-action styling in references upgrade dialog.	2016-02-17 15:45:04 +00:00
Shane Kilkelly	9c9a9c5c76	preview gif for references search.	2016-02-17 14:49:37 +00:00
Henry Oswald	5f719e7105	change robots.txt to ignore all	2016-02-16 12:38:27 +00:00
Henry Oswald	735f7bd51e	change res.send to res.sendStatus for new express	2016-02-16 12:38:27 +00:00
Henry Oswald	4017eab888	don't show outline on new doc/folder/upload buttons on select	2016-02-16 12:38:27 +00:00
Henry Oswald	f5910762c1	fixed missign translation for when email is already registered	2016-02-16 12:38:27 +00:00
James Allen	b3a2d44937	next -> callback	2016-02-16 11:12:07 +00:00
Shane Kilkelly	e7e6b1008b	styles for spinner.	2016-02-15 16:11:59 +00:00
Henry Oswald	87ef2cc563	Merge branch 'nodemailer2'	2016-02-15 14:52:58 +00:00
Henry Oswald	ef148da7aa	remove un needed require	2016-02-12 17:15:13 +00:00
Henry Oswald	05bf048885	upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending ... on what is in settings file	2016-02-12 17:13:45 +00:00
Shane Kilkelly	2901d12eaa	update styles for search modal.	2016-02-12 16:24:35 +00:00
James Allen	e4960e782f	Merge branch 'ja-multi-select'	2016-02-12 11:56:10 +00:00
James Allen	9d8b91532b	Fix parent highlight bug in jquery ui	2016-02-11 15:41:56 +00:00
Shane Kilkelly	8542a08927	Refine styles.	2016-02-11 15:03:19 +00:00
Henry Oswald	0538ca2de5	added box shadow to notifications alert and made it info	2016-02-11 12:34:38 +00:00
Henry Oswald	8e5907f79e	have null array as default for notifications	2016-02-11 12:10:30 +00:00
Henry Oswald	5c5888b5dc	Merge branch 'pr/221'	2016-02-11 11:44:45 +00:00
Shane Kilkelly	a5386dcdc7	minor adjustments to search result style	2016-02-10 16:54:43 +00:00
Shane Kilkelly	1dc62bdeca	styling for search results in references search modal	2016-02-10 16:37:11 +00:00
James Allen	938b042f8c	Include selected entity in multi selection on first click	2016-02-10 15:59:51 +00:00
James Allen	8359029503	Improve drop zones and feel of dragging in file tree	2016-02-10 15:54:25 +00:00
James Allen	d47f6801c2	Don't trigger delete event on move to avoid switching to root document	2016-02-10 15:26:26 +00:00
James Allen	1d13015726	Update jquery ui	2016-02-10 15:25:53 +00:00
Shane Kilkelly	aa20661372	css for hit class.	2016-02-10 13:24:07 +00:00
James Allen	4487ae1253	Look for queued-http in the correct place	2016-02-10 11:38:01 +00:00
Shane Kilkelly	63c9b91a7b	basic css for references search form	2016-02-10 10:39:04 +00:00
James Allen	03a3e1ceb3	Added missing files	2016-02-09 15:20:59 +00:00
James Allen	506d2224aa	Allow Cmd+Clicking to multi select entries in the file tree	2016-02-09 15:13:58 +00:00
Shane Kilkelly	326d9e59f8	Refactor ReferencesSearch* to just References*.	2016-02-08 17:04:27 +00:00
James Allen	b978171e0c	Fix "cannot set headers after sent" in setting doc end point ... If somehow a project ends up with the same doc/file in two locations in the file tree, then projectLocator.findElement will return the callback for both entries. This then tries to end the request multiple times. Of course this should never be a state the project is in, but if it is we should catch it.	2016-02-05 15:39:26 +00:00
Henry Oswald	de0589b051	added notifications calls for sending to api and mark as read ... not creating it yet	2016-02-05 14:13:38 +00:00
James Allen	835b43cab2	Don't remove replace command so Ctrl+H is an option in Vim mode	2016-02-05 11:15:00 +00:00
James Allen	a6793be3cf	Improve presentation of hotkeys and add bold+italics	2016-02-04 15:52:38 +00:00
James Allen	5cfd4e0d1f	Fix toggle comment hotkey for European keyboards	2016-02-04 15:42:54 +00:00
Henry Oswald	f136486f4b	cleanup layout of notifications	2016-02-04 14:28:31 +00:00
James Allen	6143b2218c	Send user_id on Dropbox requests through to doc updater	2016-02-04 14:27:00 +00:00
James Allen	8a095a5144	Upgrade to PDF 1.3.91	2016-02-04 14:27:00 +00:00
James Allen	d88cbc342a	Adjust btn-group for correct borders on PDF buttons	2016-02-04 14:26:59 +00:00
Henry Oswald	9d61a58710	slighly change layout of notifications & insert html via angular	2016-02-04 12:11:45 +00:00
Shane Kilkelly	9880df496f	Display ellipsis instead of previous args if they are too long.	2016-02-04 10:49:01 +00:00
Henry Oswald	47eebb1840	add null check and default empty object for subscirption dashboard	2016-02-03 17:41:05 +00:00
Henry Oswald	8af9aa6396	move wufoo form on plans page to groovehq	2016-02-03 16:50:34 +00:00
Shane Kilkelly	7d6f5be7e9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-03 16:46:41 +00:00
Shane Kilkelly	90fd6eb8a1	Autocomplete with many parameters to cite.	2016-02-03 16:46:34 +00:00
Henry Oswald	7994528c92	make site licence regex more specific	2016-02-03 16:08:29 +00:00
Shane Kilkelly	7ef96be7dc	Handle cite commands like citep and citet, etc.	2016-02-03 15:08:52 +00:00
Shane Kilkelly	7fceb2b3af	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-02-03 11:08:58 +00:00
Shane Kilkelly	d0835fd2ba	Fully enable references autocomplete.	2016-02-03 11:08:51 +00:00
James Allen	65a42c551d	Update \documentclass regex so that it does match on '\documentclass{...} % comment with \documentclass'	2016-02-03 10:19:25 +00:00
James Allen	4c626f23e7	Merge pull request #224 from sharelatex/ja_draft_mode ... Draft mode for compiles	2016-02-02 15:04:21 +00:00
James Allen	425a9b9db2	Add in option to compile in draft mode	2016-02-02 14:50:48 +00:00
James Allen	14cfb2dec7	Namespace toolbar CSS properly to only affect top level anchor tags so that dropdown links are not styled	2016-02-02 14:48:22 +00:00
James Allen	f55b0b3819	Add in default config for references api	2016-02-02 14:36:30 +00:00
Henry Oswald	aaa258099e	added tests to check rate limiter works without session	2016-02-02 14:26:23 +00:00
Henry Oswald	6cd66c7304	allow rate limiter to work on api router where session does not exist	2016-02-02 12:31:54 +00:00
Henry Oswald	a05a7b984f	refresh scope after contact us request	2016-02-01 15:41:43 +00:00
Henry Oswald	7f05ac54f8	improved contact us form progress feedback	2016-02-01 15:22:22 +00:00
Henry Oswald	1f6b43e1b1	added universties site angular controler	2016-02-01 14:33:50 +00:00
James Allen	a0e129b880	Remove tag from projects when deleted	2016-02-01 11:36:04 +00:00
James Allen	1ee0ef2cde	Remove console.log line	2016-02-01 10:36:38 +00:00
James Allen	3d9f326219	Update translation strings for tags	2016-02-01 10:18:57 +00:00
James Allen	b32178182d	Explicitly create tags and get their id	2016-02-01 10:18:56 +00:00
James Allen	77cc6af35e	Update add tag end point to use tag_id	2016-02-01 10:18:56 +00:00
James Allen	f1e65cc776	Use tag_id for deleting tags from project	2016-02-01 10:18:56 +00:00
James Allen	1bd5aef85f	Allow renaming of tags	2016-02-01 10:18:56 +00:00
James Allen	1a86e69d1f	Allow tags to be deleted	2016-02-01 10:18:56 +00:00
Shane Kilkelly	280a0fa54c	Remove debug prints.	2016-01-28 10:22:19 +00:00
Shane Kilkelly	50a451970b	Merge branch 'master' into sk-references-2	2016-01-28 10:06:41 +00:00
Shane Kilkelly	3a700a5af2	More tests for indexAll	2016-01-27 16:03:40 +00:00
Shane Kilkelly	cc818695ef	Split References.index into index and indexAll.	2016-01-27 16:00:53 +00:00
Shane Kilkelly	ec8a12d445	Flush changes to mongo before sending request to references service	2016-01-27 13:33:42 +00:00
Shane Kilkelly	fed10280ab	Use docstore url rather than going through web api.	2016-01-27 09:58:54 +00:00
Brian Gough	5316451f90	update logger-sharelatex to v1.3.1 to improve sentry logging	2016-01-26 16:53:54 +00:00
Shane Kilkelly	a043f28d9b	Remove extra event emission. add debug print.	2016-01-26 16:49:54 +00:00
Shane Kilkelly	6866d45c3c	Delete dead code	2016-01-26 16:39:47 +00:00
Shane Kilkelly	6e3dba52e5	Set up feature flag for references autocomplete.	2016-01-26 16:35:58 +00:00
Shane Kilkelly	d1e53f0cb8	Test ReferencesSearchHandler.index	2016-01-26 16:14:17 +00:00
Brian Gough	0d42b3cb93	don't log csrf errors to sentry	2016-01-26 15:55:51 +00:00
Shane Kilkelly	8a991b0d06	Start testing ReferencesSearch feature	2016-01-26 14:29:23 +00:00
Henry Oswald	690b195f1a	move login success to .json as it sends json over	2016-01-25 17:35:57 +00:00
Shane Kilkelly	a3cee72663	Remove old routes and debug prints.	2016-01-25 13:56:07 +00:00
Henrique Santos	9429e49cf8	finishing frontend	2016-01-22 18:08:39 -02:00
Shane Kilkelly	c911b7d6a3	Broadcast references-key changes back to connected clients.	2016-01-22 15:59:43 +00:00
Shane Kilkelly	af75bb8a60	wip: change how indexing of references works.	2016-01-22 14:23:59 +00:00
Henrique Santos	25f9bd30b6	fix config file	2016-01-22 03:54:38 -02:00
Henrique Santos	2d11705837	fix issues in first commit	2016-01-22 03:41:22 -02:00
Henrique Santos	476eaa8b84	add notification backend and unit test ... add notification init frontend	2016-01-21 18:42:50 -02:00
Shane Kilkelly	307f78b831	WIP: send multiple bib files and get back keys	2016-01-21 17:01:24 +00:00
Shane Kilkelly	d5d5ba9066	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-01-20 14:02:24 +00:00
Shane Kilkelly	6cc18cd2fb	Add test.	2016-01-20 14:02:14 +00:00
Shane Kilkelly	0b28e7e964	send a fullIndex flag along to references service.	2016-01-20 13:53:28 +00:00
James Allen	bcb9e1180b	Add jobs page	2016-01-20 11:56:08 +00:00
James Allen	38876a9d4c	Don't show publish buttons when showing free trial for templates	2016-01-19 16:10:50 +00:00
James Allen	ed5872702a	Pass image to wordcount end point in CLSI	2016-01-19 14:17:01 +00:00
James Allen	5125aa0089	Make templates a premium feature	2016-01-19 13:37:22 +00:00
Shane Kilkelly	58edb87c61	Dumbest bug ever. Fix latex autocomplete.	2016-01-19 12:58:18 +00:00
Shane Kilkelly	41aaefc1f6	Enable pre-indexing of references	2016-01-18 11:41:30 +00:00
Shane Kilkelly	dbbc3bbbbb	Fetch the keys when autocomplete is triggered on a cite element.	2016-01-18 10:29:13 +00:00
Shane Kilkelly	2a7894f6e4	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-01-15 14:41:12 +00:00
Shane Kilkelly	20757b11b8	Add code to automatically index bib files on project load.	2016-01-15 14:41:05 +00:00
James Allen	03d75944b0	Allow image name to be configured	2016-01-15 10:26:36 +00:00
Shane Kilkelly	b49ed15c14	Fix missing comma	2016-01-14 15:13:19 +00:00
Shane Kilkelly	ca0a625dcc	Begin work on indexing the references when project is opened.	2016-01-14 14:53:08 +00:00
Shane Kilkelly	6244d013af	Null check before regex match	2016-01-14 10:18:12 +00:00
Shane Kilkelly	d5edea77db	Put the references autocomplete feature behind a feature flag for now.	2016-01-13 14:42:35 +00:00
Shane Kilkelly	1e904e6ab7	Merge branch 'master' into sk-references-ac	2016-01-13 11:31:58 +00:00
Brian Gough	d3971e4d4f	upgrade logger-sharelatex to v1.3.0 to fix sentry reporting bugs	2016-01-08 14:19:40 +00:00
Henry Oswald	d202538504	added ng-cloak to successful subscription page	2016-01-04 12:22:31 +00:00
Henry Oswald	a181905ab8	removed console.log	2016-01-04 11:42:54 +00:00
Henry Oswald	5f66dbebf4	2015 -> 2016	2016-01-04 11:12:10 +00:00
Shane Kilkelly	77333c923b	Merge branch 'master' into sk-references-ac	2016-01-04 09:37:10 +00:00
Shane Kilkelly	a63028bad3	Test the ReferencesSearchHandler	2015-12-31 10:28:19 +00:00
Shane Kilkelly	9280dd240b	Test getKeys.	2015-12-31 09:39:48 +00:00
Shane Kilkelly	d9ca9fc06d	Fix comically long lines.	2015-12-31 09:22:35 +00:00
Shane Kilkelly	877ea1d376	Test remaining failure cases.	2015-12-30 16:20:14 +00:00
Shane Kilkelly	ffb149b923	Test failure conditions.	2015-12-30 16:15:31 +00:00
Shane Kilkelly	5d80ce9ca5	More tests.	2015-12-30 15:24:57 +00:00
Shane Kilkelly	86d69f3275	Start testing ReferencesSearch.	2015-12-30 15:08:12 +00:00
Shane Kilkelly	3bd52f4aaf	Better matching against keys. ... Allows for successive matching as you type.	2015-12-30 11:27:58 +00:00
Shane Kilkelly	7aa8f3a5da	autocomplete the cite{key part.	2015-12-30 11:11:30 +00:00
Shane Kilkelly	b0f3d9e6f4	load the keys if the command is a 'cite'	2015-12-29 15:48:42 +00:00
Shane Kilkelly	e94863d026	Get reference keys when project loads.	2015-12-29 13:30:57 +00:00
Shane Kilkelly	a48abcab0b	load references keys for autocomplete.	2015-12-29 11:02:59 +00:00
Henry Oswald	134e733b01	change succesful subscription message	2015-12-21 10:31:22 +00:00
Shane Kilkelly	bd0f1c0e29	keep the references keys.	2015-12-18 16:20:58 +00:00
Shane Kilkelly	4d46804b9f	Remove debug prints.	2015-12-18 16:12:55 +00:00
Shane Kilkelly	8c9c476dd7	Fetch the list of keys from references index.	2015-12-18 16:00:24 +00:00
Shane Kilkelly	c9db11edbe	Change to using project_id rather than user_id in references index.	2015-12-18 14:57:36 +00:00
Shane Kilkelly	e684968a59	Add ability to request the doc as plain text, rather than a json object. ... This makes it much easier to stream-parse the document.	2015-12-18 13:36:25 +00:00
Brian Gough	1b70e08f82	reinstate the chaosmonkey	2015-12-18 09:55:24 +00:00
Shane Kilkelly	1ea13a74dd	Refresh the references when the bib file is closed.	2015-12-17 15:13:02 +00:00
Shane Kilkelly	249dd638ec	experimental: update references index from fronted.	2015-12-17 11:51:14 +00:00
Henry Oswald	1ad27bb6ed	changed left menu test to show random benefit to users	2015-12-16 12:40:34 +00:00
Henry Oswald	501763bb4e	changed add doc to use ligher mongo call (folders only)	2015-12-15 13:27:41 +00:00
Henry Oswald	e801f288f2	add tabs to snippets	2015-12-12 11:53:33 +00:00
Henry Oswald	763f16f43c	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-12-12 11:39:54 +00:00
Henry Oswald	3ed4c0fb72	change name of test cancelation-view -> cancelation-options-view	2015-12-12 11:17:17 +00:00
James Allen	e8f21986dd	Refactor registration so it can be called from modules	2015-12-11 17:11:20 +00:00
James Allen	58604d3c91	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-12-11 14:25:25 +00:00
James Allen	c0dfdb3bd8	Use translations for activation page	2015-12-11 14:25:17 +00:00
James Allen	c5e3a22e80	Merge pull request #206 from mathsguy42/master ... Updated package warning parser	2015-12-11 14:18:41 +00:00
James Allen	c40b882ee2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-12-11 11:30:20 +00:00
James Allen	1e8ab5357b	Improve pre-registered account activation process	2015-12-11 11:30:06 +00:00
Henry Oswald	13af9b7b56	find project by name should only find active projects	2015-12-10 17:06:00 +00:00
Brian Gough	ba6c361afa	decrease sentry sample rate to 1%	2015-12-10 14:18:20 +00:00
Henry Oswald	297e33f1a0	remove unneeded hide on cancelation basic	2015-12-09 14:44:26 +00:00
Henry Oswald	d5cf8f6886	simplified cancelation logic	2015-12-09 13:58:26 +00:00
Henry Oswald	7a88afc953	make button for downgrade centered and lower	2015-12-09 12:09:17 +00:00
Henry Oswald	bdc2206ef1	yes_please != yes_please!	2015-12-09 12:03:18 +00:00
Henry Oswald	db8349351d	escape html in cancel message	2015-12-09 12:01:55 +00:00
Henry Oswald	e6f92c181f	ill_take_it != ill_take_it!	2015-12-09 12:00:31 +00:00
Henry Oswald	17cfbf8000	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-12-09 11:49:33 +00:00
Henry Oswald	56fa51f9b2	got translations done for subscription dashboard	2015-12-09 11:24:14 +00:00
Henry Oswald	aafdeb031e	wip - downgrade options it all works, need unit tests & translations	2015-12-08 18:23:28 +00:00
Henry Oswald	8fb1f9e00b	wip: downgrade to student if they are a collab monthly	2015-12-08 15:45:52 +00:00
Brian Gough	91a047ea7a	added sentry error reporting	2015-12-08 12:16:00 +00:00
Henry Oswald	5c05d02840	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-12-08 11:38:29 +00:00
Henry Oswald	fc7ca5ef74	tried changing a couple of sentry ignore to regex's	2015-12-08 11:38:21 +00:00
Brian Gough	cd4ab35fbc	only send a 5% sample of sentry errors	2015-12-08 11:34:11 +00:00
Henry Oswald	7e31851949	fix margin for modal alerts on upload	2015-12-08 08:50:11 +00:00
Henry Oswald	156f646613	increase number of files that can be uploaded & limit 1 concurent	2015-12-07 16:50:09 +00:00
Henry Oswald	88799fc881	add help link when user needs to refresh page	2015-12-04 08:43:55 +00:00
James Allen	50112a59d4	Monitor memory usage and do periodic GC	2015-12-03 10:52:06 +00:00
Henry Oswald	25411189a7	redirect to login if session expired in file upload	2015-12-02 15:40:14 +00:00
Henry Oswald	9383977ca5	remove socket.io as a dependency	2015-12-01 21:18:00 +00:00
Henry Oswald	6738fdd1fc	added translation for rate limit message to client	2015-12-01 13:11:19 +00:00
Henry Oswald	8590af3e49	added rate limit on server side for file uploads	2015-12-01 13:08:49 +00:00
Henry Oswald	a6aea41fb1	added max of 20 files which can be uploaded at same time to client	2015-12-01 12:55:35 +00:00
Henry Oswald	69734c20c0	added heapdump endpoint	2015-11-30 16:16:16 +00:00
Henry Oswald	4fa38178be	ignore some common errors in sentry	2015-11-30 13:49:46 +00:00
Henry Oswald	5213be4fe9	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-25 11:54:40 +00:00
Henry Oswald	91a84cb232	increase compile throttle limit	2015-11-25 11:07:53 +00:00
Henry Oswald	1ddf95e746	accesabble != accessible	2015-11-24 16:53:44 +00:00
Henry Oswald	8ca962b734	added missing convert handler	2015-11-24 14:17:40 +00:00
Henry Oswald	4f3b01ed43	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-23 17:11:06 +00:00
Henry Oswald	89b2cd8477	added secure banner to both payment forms	2015-11-23 17:10:53 +00:00
Henry Oswald	61182451f1	removed SubscriptionDomainHandler from user controller	2015-11-23 15:12:30 +00:00
Henry Oswald	333c1be68f	added dropbox and github promo on left hand side	2015-11-23 15:12:17 +00:00
James Allen	dea97bb9dc	Fix bad connection debugging parameters	2015-11-19 13:15:51 +00:00
James Allen	442ae638de	Revert "Report unsaved changes after 60 seconds" ... This reverts commit 44a7e598f2fdbd91d18cc340de477ca3d33a1338.	2015-11-19 12:04:35 +00:00
James Allen	99bca31766	Error and hard refresh document after 30 seconds unsaved changes	2015-11-19 12:04:12 +00:00
James Allen	bf452bf306	Keep the connection.id up to date with socket.io client id ... The meta.source of an update is populated on the server side so we need to keep our local connection id up to date with it. When a duplicate op is submitted we must send all possible client ids that it could have been sent with.	2015-11-19 12:04:12 +00:00
James Allen	cde5144c42	Retry updates that have not been acknowledged. ... If we do not get a reply from the server acknowledging our update after 5 seconds, send it again. If it never got to the server, this is like normal. If the update got to the server, but we never received the ack then we need to rely on ShareJs's duplicate handling. We set the dupIfSource parameter on any retried updates which let ShareJs know that it's a dup if we already have an op with this version number and client id. The doc-updater and real-time services need changes to correctly send another ack only to the submitting client in the case of a duplicate update.	2015-11-19 12:04:12 +00:00
Henry Oswald	6eb9b095bd	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-19 11:52:19 +00:00
Henry Oswald	dc066dfbdb	added adminDN and adminPW fields to ldap settings	2015-11-19 11:52:11 +00:00
Henry Oswald	b3bdbb3fb7	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-19 11:51:53 +00:00
James Allen	2476c1e868	Report unsaved changes after 60 seconds	2015-11-18 15:23:23 +00:00
Henry Oswald	003cdc01fc	consolidated 2 options in payment left menu	2015-11-18 15:21:48 +00:00
Henry Oswald	f40e984e10	Updated ldap settings to make them clearer	2015-11-17 16:27:29 +00:00
Henry Oswald	3836142cee	don't create 2 sessions in sixpack	2015-11-17 16:16:37 +00:00
Henry Oswald	5a9174b1de	use user_id for client side six pack. also change name of editor free trial test	2015-11-17 15:54:59 +00:00
Henry Oswald	76be671e26	fix the popup alert when starting a new trial	2015-11-17 14:56:03 +00:00
Henry Oswald	b1c0dfb0e4	show discount rate on pricing page	2015-11-17 12:23:27 +00:00
Henry Oswald	631e84f5d6	copy coupon code over when switching to student	2015-11-17 11:47:28 +00:00
Henry Oswald	264839e27d	don't show tax or subtotal if there is no info on it	2015-11-17 11:44:31 +00:00
Henry Oswald	d959a51f36	show normal price if there is a discount	2015-11-17 11:42:03 +00:00
Henry Oswald	fefe7c2022	ignore ldap in modules	2015-11-17 11:41:52 +00:00
Henry Oswald	ef3613371f	don't show coupon area for upgrades	2015-11-17 11:41:39 +00:00
Henry Oswald	471b285ad7	changed plan choice using ab sixpack not ga	2015-11-16 16:40:14 +00:00
Henry Oswald	9d3c49242d	added api into angular sixpack	2015-11-16 16:22:27 +00:00
Henry Oswald	f7854649e2	added 20% off option	2015-11-16 15:58:04 +00:00
Henry Oswald	89381e84eb	switch to student switches to free trial	2015-11-16 15:51:54 +00:00
Henry Oswald	05c45cd658	changed upgrade to list features	2015-11-16 14:36:59 +00:00
Henry Oswald	3ef18a09eb	removed finished sixpack test	2015-11-16 12:21:24 +00:00
Henry Oswald	ba58509a67	increased length rate limit is in effect for	2015-11-16 12:21:06 +00:00
Henry Oswald	56635d2221	set timeout for sixpack server dynamically, needs to be longer for local dev	2015-11-12 12:43:55 +00:00
Henry Oswald	49e6f4db87	set NODE_TLS_REJECT_UNAUTHORIZED to 0 for testing ... allows us to talk to staging sixpack	2015-11-12 12:38:35 +00:00
Henry Oswald	8a6c3b5838	covert payment-left-menu test	2015-11-12 09:57:06 +00:00
Henry Oswald	377cc11c3b	added sixpack to server side	2015-11-12 09:29:44 +00:00
Henry Oswald	3a61f48068	added payment page with security seal	2015-11-11 17:59:35 +00:00
Henry Oswald	e4b36e6c5c	moved where ask_proj_owner_to_upgrade_for_history shows up in rendering issue	2015-11-11 17:25:28 +00:00
Henry Oswald	cf6998cac3	added ab test into payment page left hand feature list	2015-11-11 16:42:04 +00:00
Henry Oswald	453415ff7c	fixed tab index on payments page	2015-11-11 16:22:07 +00:00
Henry Oswald	4e8eebb482	increase rate limit threshold on pdf downloads	2015-11-11 09:00:38 +00:00
Henry Oswald	16670cb3e3	only rate limit full pdf downloads	2015-11-10 16:23:55 +00:00
Henry Oswald	da9535f442	fix an alignment issue	2015-11-10 15:38:05 +00:00
Henry Oswald	b6b252b1f8	only participate in track changes test if they are shown view	2015-11-10 15:14:27 +00:00
Henry Oswald	5598624ee1	only run participate test for sign up if user has no projects	2015-11-10 14:06:06 +00:00
Henry Oswald	23fd12c67d	dropped throttle for full pdf download to 30 over 5 mins ... 1 download every 10 seconds which seems ample	2015-11-10 11:53:11 +00:00
Henry Oswald	615e4b448a	fix search on project list page. ng-if breaks it but ng-show does not for some reason	2015-11-10 11:36:11 +00:00
Henry Oswald	c8ba7b72ab	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-10 10:36:06 +00:00
Geri Morales	6f93362fdc	Updated package warning parser	2015-11-08 23:02:41 -06:00
James Allen	a153c6682a	Put in client side check for document getting too long	2015-11-06 12:51:43 +00:00
James Allen	9dcc251017	Copy header values so they can be modified by modules each request	2015-11-05 16:52:50 +00:00
James Allen	8128200d55	Don't show pop up when leaving page in Safari	2015-11-05 10:18:40 +00:00
James Allen	16b7bf222a	Merge branch 'contacts'	2015-11-05 10:14:25 +00:00
James Allen	21f702a42e	Fix bug with click on share button registering	2015-11-04 14:33:27 +00:00
James Allen	34d13d5b2d	Include latest translations	2015-11-03 12:00:57 +00:00
Henry Oswald	77d349dd8f	added more long form list of features on track changes upgrade	2015-11-02 18:44:26 +00:00
Henry Oswald	0ef8d77ce3	project list minimal to work with projects	2015-11-02 18:44:12 +00:00
Henry Oswald	c4d3537e1d	remove sixpack from default settings	2015-11-02 16:28:30 +00:00
Henry Oswald	79c4c6e26b	added split test for on boarding, doing cut down view	2015-11-02 16:15:56 +00:00
James Allen	c46f62cfc1	Ensure that a user can only be added to project once	2015-11-02 15:21:41 +00:00
James Allen	7359fc16ee	Add in show-on-hover CSS classes	2015-11-02 13:59:34 +00:00
Henry Oswald	cf48c94725	rate limit pdf downloads	2015-10-30 11:56:01 +00:00
Shane Kilkelly	c05c5ac7c8	Clear drag/drop highlight explicitly after the drop has completed. ... Solves a problem where sometimes the Jquery drag/drop plugin fails to remove the highlight class from drop target.	2015-10-28 12:17:50 +00:00
Henry Oswald	730088b6ab	set button colour to red for free trial	2015-10-27 23:35:13 +00:00
Henry Oswald	2d03410c42	removed some editor actions sent to google analytics as we are sending too much data	2015-10-27 23:28:54 +00:00
Henry Oswald	6c75a6dbe5	change six pack key and add into default settings	2015-10-27 11:37:11 +00:00
Henry Oswald	97c2b5fb11	removed excess logging for sixpack	2015-10-27 11:20:54 +00:00
Henry Oswald	b9187ebd08	added test to wording for datajoy popup	2015-10-27 10:58:51 +00:00
Henry Oswald	8f1d09beea	added six pack to web	2015-10-27 10:58:27 +00:00
Henry Oswald	5e19d710ba	change error handling on spelling	2015-10-22 20:15:50 +01:00
Henry Oswald	084b0d8548	update ldap default settings for server pro	2015-10-22 10:42:50 +01:00
Henry Oswald	1c91de0395	added function to get project with only folders for quicker adding of files to large projects	2015-10-21 16:56:06 +01:00
Henry Oswald	885915916a	check if user exists on recurly callback	2015-10-21 11:27:13 +01:00
Henry Oswald	d9734953a6	don't archive project in track changes for moment	2015-10-20 17:36:37 +01:00
Henry Oswald	79a694b5c8	for spelling attach error handler first	2015-10-20 09:55:12 +01:00
Henry Oswald	f61d97a4f6	added null check on user when checking permissions	2015-10-19 22:29:36 +01:00
Henry Oswald	2b8dd7248a	added subscription handler null check	2015-10-19 22:29:11 +01:00
Henry Oswald	d80179ecc6	added missing null check in	2015-10-19 22:14:52 +01:00
Henry Oswald	a94a03fc3e	added missing stubbed module call breaking tests	2015-10-19 15:48:59 +01:00
Henry Oswald	0c74673e04	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-10-19 15:44:54 +01:00
Henry Oswald	2c32126f68	archive in track changes as well as docstore	2015-10-19 15:44:50 +01:00
James Allen	36678301e6	Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project	2015-10-16 12:34:33 +01:00
James Allen	bafd3a1cb4	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-10-16 12:31:21 +01:00
James Allen	144f1396b7	Fix problem with pasting multiple emails	2015-10-15 17:03:22 +01:00
James Allen	fb42489803	Improve formatting of users, groups and tags	2015-10-15 16:43:53 +01:00
James Allen	b0895cc6aa	Support adding groups to projects via share modal	2015-10-15 13:53:46 +01:00
Henry Oswald	bbe510099e	change auto disconnect to 24 hours and expose it publicly for easier testing	2015-10-15 11:38:23 +01:00
Henry Oswald	2f48568f76	fix free trial button on timeout view	2015-10-15 11:38:01 +01:00
Henry Oswald	9eb4dd1b3b	on firefox don't show retrying connected message if the user clicked to change page ... it creates a bit of worry for the user as it looks like the connection was not there.	2015-10-14 18:07:12 +01:00
James Allen	d996ed6e47	Refactor addUserToProject for better access by groups	2015-10-14 17:29:58 +01:00
Henry Oswald	a1f57f220b	inline ng-clock as it does not work for firefox in base.less quickly enough	2015-10-14 16:22:32 +01:00
Henry Oswald	aba8f164fc	copy right 2015 not 2014	2015-10-14 14:44:48 +01:00
Henry Oswald	f5162d424f	if a user is inactive for 12 hours disconect them.	2015-10-14 14:28:24 +01:00
Henry Oswald	28e507b007	Revert "A tiny cache-busting change" ... This reverts commit 1241b397d32cf982c9bb92865c725ce1e431e409.	2015-10-09 10:12:08 +01:00
Henry Oswald	ea5046ef20	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-10-09 10:11:57 +01:00
Henry Oswald	e593b3f717	append string to ide.js min which we can use for testing via status cake	2015-10-09 10:11:38 +01:00
Shane Kilkelly	8676ce9538	A tiny cache-busting change	2015-10-09 08:45:50 +01:00
James Allen	c4e4f2c77a	Add modules hook for contacts and support groups in auto complete	2015-10-08 18:17:53 +01:00
James Allen	78c5741d06	Add contact when adding collaborator	2015-10-08 16:42:23 +01:00
James Allen	d11d536994	Refactor adding and removing collaborators to not go through EditorController	2015-10-08 14:15:36 +01:00
James Allen	8cc7869b03	Pull in contacts from contacts api and send to tag-input for autocomplete	2015-10-07 17:32:35 +01:00
Henry Oswald	f1d07811df	update the entire users features on assign bonus bu don't update ... the user features if there is nothing to update when assigning bonus	2015-10-07 13:50:51 +01:00
Henry Oswald	a73b2ceb37	Merge branch 'connect-failed'	2015-10-07 11:30:48 +01:00
Henry Oswald	b69ec9768d	bonus allocater does not need to check if user has subscription any more.	2015-10-05 16:50:34 +01:00
James Allen	64ffcde3df	Namespace subscription groups as SubscriptionGroup	2015-10-05 16:37:03 +01:00
Henry Oswald	fae7d431f4	after subscription is updated always check bonus	2015-10-05 16:33:13 +01:00
Henry Oswald	9a60617162	change referral allocated to only upgrade features and to find highest level ... i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.	2015-10-05 12:30:03 +01:00
Henry Oswald	89256f9d5f	added connect timeout option to socket.io.connect needed for the firing of connect_failed. Best way to test is drop connect timeout to 10ms and remove some transports from realtime.	2015-10-05 00:43:37 +01:00
Shane Kilkelly	ae10cc5755	Update default raven version to 1.1.22	2015-09-30 10:40:20 +01:00
Shane Kilkelly	12f1a798c6	Add raven version 1.1.22	2015-09-30 10:38:52 +01:00
Shane Kilkelly	15847f8921	Add the 'release' attribute to Sentry configuration.	2015-09-29 15:41:25 +01:00
Shane Kilkelly	b4c7209a11	Try to reconnect either on editor-cursor move, or when any thing in the page is clicked.	2015-09-29 10:23:21 +01:00
Shane Kilkelly	8bd83f64e0	Try to reconnect when the editor cursor is moved.	2015-09-28 16:18:09 +01:00
Shane Kilkelly	b393de1450	Try to reconnect when the user types in the editor.	2015-09-28 15:45:14 +01:00
Shane Kilkelly	54de12d908	Fix alignment of inputs in Search-Replace panel.	2015-09-28 14:16:10 +01:00
Henry Oswald	27c02f5ef5	added some robots to the blocked list	2015-09-22 14:27:14 +01:00
Shane Kilkelly	30a63d1e42	Remove ng-click on output files, which was causing a double-request for download.	2015-09-22 10:11:03 +01:00
Henry Oswald	011f628de8	lock down translations version	2015-09-17 10:26:29 +01:00
Henry Oswald	24007affa7	change admin link to /admin/user ... this is the page for the admin panel, if the panel is installed then it will load, otherwise a redirect to register users has been added in.	2015-09-16 12:17:58 +01:00
Henry Oswald	70611da833	added a null check to getRequestUserAndProject	2015-09-15 12:47:48 +01:00
Henry Oswald	5ffd76c670	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-09-14 15:36:08 +01:00
Henry Oswald	9a72667e91	added word count UI feature.	2015-09-14 15:28:19 +01:00
Shane Kilkelly	5e157bcd16	Fix a case where a null user would cause displayName to crash.	2015-09-14 12:27:27 +01:00
Shane Kilkelly	77ac6c1baf	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-09-14 12:08:11 +01:00
Shane Kilkelly	7bc9218b3c	Fix up a bunch of issues with the track-changes list view. ... - not crash when a user is null - fix alignment of user color square - if first and last name are absent, display email instead - truncate overly long display name with '...'	2015-09-14 12:08:05 +01:00
Henry Oswald	507e8d13a6	Merge pull request #200 from heukirne/wordcount ... Wordcount hook	2015-09-11 16:22:15 +01:00
Shane Kilkelly	778f588741	Merge pull request #199 from sharelatex/sk-missing-users ... When a user is null in track-changes UI, display them as "Anonymous".	2015-09-11 14:24:08 +01:00
Henrique Dias	3be0425b45	add unit tests for wordcount	2015-09-11 10:21:05 -03:00
Henrique Dias	d228fd88ab	add worcount file param	2015-09-11 09:53:06 -03:00
Henrique Dias	77c2162872	add wordcount clsi handler	2015-09-10 12:41:48 -03:00
James Allen	662050b3f9	Only show services header if we have some services to render	2015-09-10 16:01:12 +01:00
Shane Kilkelly	4a315a0474	When a user is null in track-changes UI, display them as "Anonymous".	2015-09-10 14:35:09 +01:00
James Allen	1c9f9274a9	Remove uneeded and now wrong Sentry error capturing	2015-09-08 11:48:39 +01:00
James Allen	25b9a9be19	Upgrade Ace to 'package 11.07.15' ... This required a refactor of all code that listen to events changes since the API has changed. See https://github.com/ajaxorg/ace/pull/1745 for more details.	2015-09-07 17:04:05 +01:00
James Allen	5fdb50958e	Fix logs dropdown to work with Angular 1.3	2015-09-03 13:13:28 +01:00
James Allen	95db287fef	Fix more dropdown menu in project list for new Angular	2015-09-03 13:02:43 +01:00
James Allen	c64891a61b	Fix folder dropdown to work with new Angular	2015-09-03 12:54:11 +01:00
James Allen	aa06eb55b7	Merge branch 'master' into angular_1.3.15	2015-09-03 12:52:08 +01:00
James Allen	7446572ed9	Group online users into dropdown menu when more than 3	2015-09-02 14:33:51 +01:00
James Allen	34c8f22dd7	Allow multiple collaborators to be added at once with a list of emails	2015-09-02 14:33:43 +01:00
James Allen	639424f664	Don't error on project clone if not root doc is set	2015-09-02 14:32:21 +01:00
James Allen	40704b486e	Don't lock up on very long lined documents	2015-08-28 16:52:09 +01:00
Shane Kilkelly	0aaeb6671e	Keep password reset token in session, and strip it from reset page url. ... This fixes an issue where the reset token was leaked in the referrer header when navigating away from the password reset page to an external site. Now we get the token from the query string, store it in the session, then redirect to the bare url of the password reset page, which then uses the stored token to render the reset form.	2015-08-24 11:53:33 +01:00
Henry Oswald	a53e3b80cf	if blog or universities site is down don't crash, send 500	2015-08-20 16:55:16 +01:00
Shane Kilkelly	23bd5d317c	A few extra cases which should not be treated as html.	2015-08-20 15:58:36 +01:00
Shane Kilkelly	ebf754904f	More thorough tests for the FileStoreController when downloading .html files.	2015-08-20 15:56:56 +01:00
Shane Kilkelly	aab7a8713e	Catch the case where filename is shorter than the extension length.	2015-08-20 15:56:30 +01:00
Shane Kilkelly	85c1704fc5	Test that content-type is set for mobile-safari user-agents.	2015-08-20 14:03:12 +01:00
Shane Kilkelly	ce248f56d7	Un-break FileStoreControllerTests by mocking out the req.get method.	2015-08-20 12:28:51 +01:00
Shane Kilkelly	2dd56d0b32	If we're sending a html file to mobile-safari, do so as plain text. ... This prevents safari from trying to render the page, which it does because it ignores the "Content-Disposition" header.	2015-08-20 12:02:43 +01:00
Shane Kilkelly	936b41ff2a	Merge branch 'sk-unpublish-buttons'	2015-08-19 15:44:02 +01:00
Henry Oswald	038c5a33a2	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-08-19 12:00:58 +01:00
Henry Oswald	0e9ec00f85	added stubbed logger in document controller tests	2015-08-19 11:58:59 +01:00
Henry Oswald	63580f6a79	remove useClsi2 flag in project collection	2015-08-19 11:58:41 +01:00
Henry Oswald	a777fcc5a6	changed post to deactivate projects to set params via body rather than query params	2015-08-19 11:55:35 +01:00
Henry Oswald	50fc886c94	changed inactive to active as its more effienct query in mongo	2015-08-19 11:54:30 +01:00
Shane Kilkelly	18f75bba79	Generalize this style to all .btn elements under the .template-details-section	2015-08-19 09:59:01 +01:00
Shane Kilkelly	865372d13f	Add some whitespace around buttons in template-details.	2015-08-18 14:45:44 +01:00
Shane Kilkelly	96619bde8c	Move the template-browser code into the 'templates' module. ... Now located to be located at `modules/templates/public/coffee/main/index.coffee`, moved to complete a migration of template related code into the templates module. Corresponding commit in sharelatex-web-modules: 625c556e42072d30f30d474aaef72deff24ca154	2015-08-18 14:21:35 +01:00
Shane Kilkelly	6b295fde28	Add shane image.	2015-08-17 14:23:36 +01:00
Henry Oswald	d3499acd7b	pass options through stating how long ago want to archive from and limit	2015-08-14 14:11:53 +01:00
Henry Oswald	70b825fd2a	fixed call to ProjectUpdateHandler.markAsOpened and made it async	2015-08-14 11:27:11 +01:00
Henry Oswald	66b87df17c	added deactivate project endpoint	2015-08-14 11:26:11 +01:00
Henry Oswald	bec9bf5c87	replace lodash with underscore in this project	2015-08-14 09:42:27 +01:00
Henry Oswald	68e970cd69	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-08-14 09:31:25 +01:00
Henry Oswald	21a67ddab4	added deactivate old projects endpoint	2015-08-13 22:50:39 +01:00
Henry Oswald	a0142d4415	added inactive and reactivate project logic	2015-08-13 22:40:28 +01:00
Brian Gough	a25373d53e	update metric-sharelatex to v1.2.0 for mongodb-core support	2015-08-06 09:44:47 +01:00
James Allen	ec5e03bd01	Fix subscription currency dropdowns	2015-08-04 15:58:31 +01:00
Henry Oswald	04d3e527d6	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-08-04 10:46:19 +01:00
Henry Oswald	53dc0b63c8	v1 of enago	2015-08-04 10:45:19 +01:00
Brian Gough	2bc003894b	use latest version of metrics with commit id until ready to tag	2015-08-02 15:55:26 +01:00
Brian Gough	c5cc639bff	upgrade mongoose from 3.8.28 to 4.1.0	2015-08-02 15:24:17 +01:00
Henry Oswald	3e55aef25a	show error if socket io fails to connect. Not tested yet.	2015-07-31 15:42:47 +01:00
Henry Oswald	417fd4f5f5	add logging to tell us how long since a project that is being opened was last updated	2015-07-22 10:38:48 +01:00
Henry Oswald	c12213b46b	added logging around load editor times	2015-07-22 10:38:28 +01:00
Henry Oswald	a786b623a8	added logging to help debug slow project list page loading	2015-07-22 01:06:23 +01:00
Henry Oswald	3ecf201eda	send -> sendStatus	2015-07-08 16:56:38 +01:00
Henry Oswald	9028bcf830	set body parser limit to 2mb	2015-07-08 14:35:03 +01:00
Henry Oswald	39df8964cf	added route that got lost in merge	2015-07-08 13:29:10 +01:00
Henry Oswald	9a49ce4a0e	removed extra req.session.destroy	2015-07-08 12:58:02 +01:00
Henry Oswald	258a8e3f04	added picture of kiri and geri	2015-07-08 11:30:02 +01:00
Henry Oswald	8020cd8f47	removed tpds from settings.defaults.coffee, if not set updates are now not queued	2015-07-02 12:09:08 +01:00
Henry Oswald	56346ad88c	remove analytics router and fixed bad package.json	2015-07-01 15:48:23 +01:00
Brian Gough	e6a670533d	added default mongoose connection	2015-07-01 15:36:50 +01:00
Henry Oswald	7fd29b18a8	destroy users session before creating a new one for them after login ... session changed to prevent against fixation attacks	2015-07-01 15:29:02 +01:00
Henry Oswald	4f0b922a5d	changed name used when project or file uploaded, this changed when ... we started using https://github.com/expressjs/multer * originalname - Name of the file on the user's computer * name - Renamed file name	2015-07-01 15:28:49 +01:00
Henry Oswald	3ab57f6830	put express locals on webRouter, this prevents problem with accessing sessions in locals, they should also only be used on web routes not api routes	2015-07-01 15:28:30 +01:00
Henry Oswald	941d407231	added saveUninitialized option to session which is now required	2015-07-01 15:26:17 +01:00
Henry Oswald	15a57f5dc4	removed req.session.destorys from endpoints now on the api router which are not needed	2015-07-01 15:26:05 +01:00
Henry Oswald	1cc0cbe8fc	split site into 2 routers, webRouter and apiRouter ... web router has things like sessions etc added onto it. Api router is minimal, doesn't include things like csrf	2015-07-01 15:23:18 +01:00
Henry Oswald	665bdcf538	v1 of express4 conversion	2015-07-01 15:17:43 +01:00
James Allen	c75cdf24b5	Fix selectAll for angular upgrade	2015-06-29 13:43:44 +01:00
Brian Gough	a4f99c4224	remove fairy from exception handler	2015-06-23 14:16:06 +01:00
Brian Gough	893de9d8ac	updated metrics package version	2015-06-23 13:54:05 +01:00
Brian Gough	3de841dd71	added event loop monitor	2015-06-23 13:50:42 +01:00
Henry Oswald	84bf0dd9a3	added timeout and logging for tpdsworker queing via http	2015-06-23 11:19:23 +01:00
Henry Oswald	b83fe4dcf9	put tpdsworker url in from settings	2015-06-23 11:13:05 +01:00
Henry Oswald	2ec925b45e	fairy removed from web, makes http request to tpds worker now	2015-06-22 22:33:04 +01:00
Henry Oswald	706c1824f0	changed package.json to use our fairy fork	2015-06-18 15:43:42 +01:00
James Allen	559e26145b	Run module unit tests with main tests	2015-06-16 10:54:15 +01:00
James Allen	30eb79dfdc	Add link to DataJoy that shows randomly 50% of the time	2015-06-09 15:36:16 +01:00
James Allen	0eec715bb5	Upgrade to Angular 1.3.15 and latest ui-bootstrap	2015-06-09 14:59:12 +01:00
Henry Oswald	fc72ca601e	update package.json	2015-06-09 10:19:24 +01:00
Henry Oswald	eeead86fba	updated mongoose	2015-06-02 16:24:40 +01:00
Henry Oswald	aaa902cca9	fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page	2015-06-01 14:38:09 +01:00
Henry Oswald	33aa5c732f	if a domain licence link has expired render a nice message explaining they need to retry	2015-06-01 12:43:42 +01:00
Henry Oswald	cb48242b74	changed email expire to 1 day for verifying account	2015-06-01 12:22:46 +01:00
Henry Oswald	6727c3ee00	changed ShareLaTeX thoughts to go into type form	2015-05-29 16:27:35 +01:00
Henry Oswald	d3f6c0c614	Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv	2015-05-29 12:17:54 +01:00
Henry Oswald	e4011b9ba1	Merge branch 'emailverification'	2015-05-29 12:10:02 +01:00
Henry Oswald	702fdc1480	improved views for domain licence invites	2015-05-29 12:09:28 +01:00
Henrique Dias	f709ddf3eb	add csv export unit tests	2015-05-28 17:22:49 -03:00
Henrique Dias	f50eb0398f	add export csv group feature	2015-05-28 16:54:41 -03:00
Henry Oswald	43c4531e51	kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere	2015-05-28 13:02:08 +01:00
Henry Oswald	e454d2f059	don't allow renaming in client if user is not owner	2015-05-28 12:59:02 +01:00
Henry Oswald	ca28d8ee70	changed views to use translations	2015-05-27 22:15:46 +01:00
Henry Oswald	b657c5207e	cleaned up the views a bit	2015-05-27 21:45:29 +01:00
Henry Oswald	22b94e9246	renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler	2015-05-27 20:57:54 +01:00
Henry Oswald	4773d6d22f	added tests around new endpoints for joining groups	2015-05-27 20:50:16 +01:00
Henry Oswald	f27c072ae1	pull logic checking if user is already part of a group out of controller into handler	2015-05-27 16:33:47 +01:00
Henry Oswald	72e528e9d1	if you are alread in the group show the custom group page	2015-05-27 15:50:28 +01:00
Henry Oswald	79fa49a43d	if a user is elelable to be part of a group subscription and they go to ... /user/subscription it should redirect them to the group subscription invite	2015-05-27 15:35:31 +01:00
Henry Oswald	1d21bddcf5	fix Onetime token handler path	2015-05-27 15:06:36 +01:00
Brian Gough	a5d14f4ffb	handle unexplained case where smokeTestModule is undefined	2015-05-26 16:33:02 +01:00
Henry Oswald	481bd67fbd	changed paths to use hyphens and add succesfull join page	2015-05-26 15:26:45 +01:00
Henry Oswald	94b26e71a4	ignore test script	2015-05-26 15:25:24 +01:00
Henry Oswald	841231dbf8	make PasswordResetTokenHandler generic so it can be used for invites	2015-05-26 15:24:09 +01:00
Brian Gough	e51cdb81bd	port leak fixes from smoke-test-sharelatex module	2015-05-26 10:54:55 +01:00
Henry Oswald	12bf268978	Merge branch 'master' into emailverification	2015-05-25 11:51:46 +01:00
Henry Oswald	d774ca7e0a	added sigma-master	2015-05-25 11:37:53 +01:00
Henry Oswald	cad8d8a23b	v1 basic invite works, not pretty or tested	2015-05-22 13:57:15 +01:00
Brian Gough	cc9c8fdc94	freeze Date in Recurly tests before all calls ... beforeEach freezes and resets for each subtest, which does not give the desired result as the time increases between each subtest, we want to freeze once at the beginning and reset at the end using before/after.	2015-05-19 15:00:30 +01:00
Henry Oswald	f5c39efcac	patched xss hole with messages not setting the content type correctly	2015-05-19 11:04:52 +01:00
Henry Oswald	47d4ed9631	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-05-18 16:10:07 +01:00
Henry Oswald	2bc39ddf0b	added sigma.js lib used for module spike	2015-05-18 16:09:47 +01:00
Brian Gough	3051d7dab6	modify LockManager test to avoid dependence on timing	2015-05-18 09:14:28 +01:00
Diego Giovane Pasqualin	7c6ed0ff77	Update bcrypt to 0.8.3 ... This new version compiles successfully on nodejs newer than 0.10.	2015-05-11 16:43:29 -03:00
Brian Gough	1bb7ae3996	always remove the spinner, even if it is not spinning	2015-05-11 14:12:24 +01:00
Brian Gough	92836f49fc	avoid unnecessary spell checks on session change	2015-05-11 10:07:11 +01:00
Henry Oswald	8fc41e9e05	added templateLinks property to example config for ShareLaTeX server pro	2015-05-10 13:10:03 +01:00
Brian Gough	3ad517e1c2	Merge pull request #177 from sharelatex/fix-ace-extension-errors ... prevent loading error for ace language tools extension in development	2015-05-05 14:47:44 +01:00
Brian Gough	6014085e8e	prevent loading error for ace language tools extension in development	2015-05-05 14:33:18 +01:00
Henry Oswald	72af6748c9	Merge pull request #157 from oskanberg/patch-1 ... Rename 'javscript' to 'javascript'	2015-05-05 14:28:27 +01:00
Henry Oswald	bb071e99fa	make startup message consistent	2015-04-30 15:03:07 +01:00
Henry Oswald	9764ab258b	added complex password validation to password resets	2015-04-30 12:05:46 +01:00
Henry Oswald	312c56a24e	allow password resets to be performed when site is not public by adding routes into white list	2015-04-30 11:58:26 +01:00
Henry Oswald	a7640b5bbd	changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist	2015-04-30 11:57:40 +01:00
Henry Oswald	635f79d2f6	added password strength check to change password	2015-04-28 18:30:19 +01:00
Henry Oswald	65b91930d1	field != feild	2015-04-28 17:50:06 +01:00
Henry Oswald	11a5c009a6	make default password rules very permisive	2015-04-28 17:42:30 +01:00
Henry Oswald	a1e24eb064	Merge branch 'passwordStrength'	2015-04-28 17:39:46 +01:00
Henry Oswald	cdbc239a62	config the password options via the settings	2015-04-28 17:39:35 +01:00
Henry Oswald	f385a7a4b5	open chat links in new window	2015-04-28 16:20:24 +01:00
Henry Oswald	fa4a51b5a3	email address is not allowed as part of password	2015-04-28 16:20:12 +01:00
Brian Gough	82c35d9b82	example of using controller to access other fields	2015-04-27 16:38:40 +01:00
Henry Oswald	639f73ea74	mvp for password validation	2015-04-27 14:42:32 +01:00
Henry Oswald	7d109ce77d	null check error in pdf view	2015-04-23 10:40:11 +01:00
Henry Oswald	6669884f44	Merge branch 'tpds-cleanup'	2015-04-23 10:06:26 +01:00
Henry Oswald	31a51b73d8	improved linkify so data is correctly sanitized, used inbuilt angular lib ... don't know how I missed that last time!	2015-04-22 17:58:33 +01:00
Henry Oswald	7a46b98c82	fixed unit tests for deleting files sent from tpds	2015-04-22 15:08:29 +01:00
James Allen	6c585adb3c	Merge branch 'buffer_sharejs_ops'	2015-04-22 13:59:19 +01:00
Brian Gough	d0c759c6fb	always send the latest position when emitting updatePosition event ... Avoid sending outdated position by capturing the current position in $scope.currentPostion on every call and sending it the when the timer for updatePosition runs.	2015-04-20 14:26:56 +01:00
James Allen	87d625b5e0	Delay flushes performed after getting an op acknowledgement as well	2015-04-17 17:32:23 +01:00
James Allen	8a32ca1b64	Reduce buffer delay to 1 second	2015-04-17 16:45:17 +01:00
James Allen	af85c83877	Buffer updates when only a single user is editing a document ... Add in 5 second delay between flushing updates when only a single user is editing a document. As soon as an update is received from another user we switch to sending updates immediately again so there is no latency between collaborators. The logic applies to individual docs, so two users can be editing different docs and will still buffer updates since they will not affect each other.	2015-04-17 11:24:28 +01:00
Henry Oswald	c583903e04	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-04-16 21:02:47 +01:00
Henry Oswald	dbd076849b	updated online user management to only send cursor position when people are collaborate ... if someone is in the project with them cursor info is sent every 500ms, if they are by themself it is sent every 5mins so they are still marked as online.	2015-04-16 21:01:03 +01:00
Brian Gough	396644d314	proposed fix to delete tpds dump files after use	2015-04-15 14:41:38 +01:00
James Allen	5c30a7de67	Add in option for global login requirement (defaults to on)	2015-04-15 11:14:53 +01:00
Henry Oswald	52f3248869	null check entity in filetree for orderByFoldersFirst	2015-04-14 17:05:13 +01:00
James Allen	893ff85521	Don't allow password resets for holding accounts	2015-04-14 13:11:49 +01:00
James Allen	33f56b71a2	Remove redundant body parser line	2015-04-14 13:04:49 +01:00
James Allen	8b4ccae60a	Read cookie session length from settings file	2015-04-14 13:04:29 +01:00
Henry Oswald	5f6bdaf700	show the social buttons by default in settings	2015-04-13 11:30:59 +01:00
Brian Gough	2ed934120c	Fix display of annotations when switching files in ace editor ... The annotations (error markers) were not preserved when switching between files. The setAnnotations method was being called before the document is ready -- when the document is attached to ace the content is deleted and reinserted, which caused the annotations to be removed. To fix the problem we set the annotations after attaching.	2015-04-08 14:39:39 +01:00
Brian Gough	10cd5186c2	add pdfjs-1.0.712 back in for existing clients ... clients with the old page loaded still making requests to it	2015-04-01 14:24:39 +01:00
Brian Gough	52b041c0bf	update pdf text layer builder with improvements from pdfjs 1.0.1040	2015-03-31 14:55:05 +01:00
Brian Gough	b893446b9c	use new pdfjs getDestination method in pdfRenderer ... gives faster lookup of link destinations in pdf file	2015-03-31 14:54:36 +01:00
Brian Gough	0684fa36fd	upgrade pdfjs to version 1.0.1040	2015-03-31 14:53:27 +01:00
Mick O'Brien	9f037384b6	Update word regex for spellcheck ... Adds Latin Extended-A characters to word regex to prevent splitting words half way through on characters like ąęćółżźńś.	2015-03-23 16:14:38 +00:00
James Allen	358242a5e0	Merge pull request #159 from SibrenVasse/adblock_fix ... Fix for adblock blocking loginscreen.	2015-03-23 12:29:40 +00:00
James Allen	f82f5e5479	Release version 0.1.4	2015-03-20 19:08:48 +00:00
James Allen	8483f249ee	Actually proxy websocket connections	2015-03-20 19:08:48 +00:00
Brian Gough	b0a32b1ef8	make new pdf viewer the default for all users ... remove old pdf viewer	2015-03-20 11:28:28 +00:00
James Allen	ff55e4c5ed	Merge branch 'private_registration'	2015-03-20 10:34:17 +00:00
James Allen	393169bc2a	Create a grunt task to create the admin user	2015-03-19 17:36:50 +00:00
James Allen	e2d515f957	Allow public registration module to hook into email system	2015-03-19 17:19:56 +00:00
James Allen	185514ea35	Fix failing unit test	2015-03-19 16:41:09 +00:00
Brian Gough	3bdf2158c1	avoid exception on page size change	2015-03-19 14:26:06 +00:00
James Allen	9b8cf7bcfa	Remove public registration and require that a user be registered by an admin	2015-03-19 14:22:48 +00:00
Brian Gough	6320fcccec	remove underscore from pollSavingStatus ... the underscore module is not loading in time for some users on MacOS	2015-03-19 14:22:22 +00:00
James Allen	d76ef86077	Tell user to contact admin email to register	2015-03-18 16:20:26 +00:00
James Allen	93a088618a	Return proper error from registration handler	2015-03-18 16:19:48 +00:00
James Allen	cb948fede2	Move email sending into registration controller	2015-03-18 15:57:01 +00:00
Brian Gough	adb98d05b5	sentry 1.1.16 does not yet support release parameter, use build tag instead	2015-03-18 15:50:26 +00:00
Sibren Vasse	f4f74a2baf	Fix for adblock blocking loginscreen.	2015-03-17 20:14:55 +01:00
Brian Gough	5d788ca7c5	add grunt version target to report version to sentry ... it writes the git commit id and Jenkins build number into the sentry configuration	2015-03-17 16:59:17 +00:00
Oliver Skånberg-Tippen	5df9f49a4e	Rename 'javscript' to 'javascript'	2015-03-10 18:56:46 +00:00
James Allen	0f69ee0f22	Add in proxy for /socket.io so that we don't need to faff with real-time service location	2015-03-09 14:09:09 +00:00
James Allen	bb61dfe34a	Show nice error page if socket.io could not be loaded	2015-03-09 13:57:13 +00:00
James Allen	d376acdaa9	Allow an __appName__ parameter in translations	2015-03-09 12:14:30 +00:00
Brian Gough	b41cdb424b	Merge branch 'master' of github.com:sharelatex/web-sharelatex ... # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.	2015-03-06 15:03:52 +00:00
Brian Gough	24b2844ece	avoid race condition loading underscore ... make underscore.coffee angular module depend on libs, which depends on underscore-1.3.3 Have avoided adding an extra dependency on underscore itself so that the version number is not duplicated. We could have a single definition of underscore in the requirejs config, to keep the version number in one place.	2015-03-06 15:03:30 +00:00
Henry Oswald	97f0fad525	add vat number option to payment form	2015-03-04 18:08:06 +00:00
Henry Oswald	80dc2f9224	send coupon code server side to be applied to users subscription	2015-03-04 17:50:24 +00:00
Henry Oswald	69806c02d0	improve behaviour of trying to rename a file to empty	2015-03-04 14:19:47 +00:00
Henry Oswald	9805c6a9ff	doc model no longer has lines or rev in it	2015-03-04 11:10:59 +00:00
Henry Oswald	fe3b9bf07a	clients can not rename docs/files/folders to blank name. ... Client and server side checks added	2015-03-04 11:10:59 +00:00
Brian Gough	8d092fc84d	replace .filter with _.filter to remove dependency on ES5	2015-03-03 16:45:37 +00:00
Brian Gough	c52a122966	workaround for lack of DOM element .remove in IE	2015-03-03 16:44:26 +00:00
Brian Gough	edc83b905c	remove circular references when reporting to sentry	2015-03-03 16:41:21 +00:00
Brian Gough	0ff5f54bf6	fix unit test for build parameter	2015-03-02 15:33:45 +00:00
Brian Gough	c1cde643ef	use send build identifier to clsi only for new pdf viewer ... old pdf viewer will continue to use the main ouput.pdf file	2015-03-02 14:59:53 +00:00
Brian Gough	7aea33b562	keep existing behaviour when loading other output files	2015-03-02 12:18:10 +00:00
Brian Gough	0315954b47	Merge branch 'master' into support-cached-pdfs	2015-03-02 09:20:00 +00:00
Brian Gough	caed778117	load output files from cached build when known	2015-02-26 16:47:47 +00:00
Brian Gough	a64b8724bd	include the build parameter in the compile unit tests	2015-02-26 16:21:44 +00:00
Brian Gough	5b9f2e8fc1	pass build id through to clsi when requesting pdf	2015-02-26 16:21:44 +00:00
James Allen	c495e5c492	Release version 0.1.3	2015-02-26 11:48:42 +00:00
Henry Oswald	8100f988b2	comment out ldap in settings.defaults	2015-02-26 11:40:02 +00:00
Henry Oswald	40b30b957a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-24 22:07:43 +00:00
Henry Oswald	161f24ffdf	add flag which requires login for /learn	2015-02-24 22:07:36 +00:00
Henry Oswald	387a8b8ae3	hide some forms in user settings if authentication is managed by external system	2015-02-24 13:41:46 +00:00
Henry Oswald	3a9c6503ee	null check mathjax	2015-02-23 17:46:17 +00:00
Henry Oswald	9a7f73ed89	null check response.outputFiles	2015-02-23 17:43:22 +00:00
Henry Oswald	4f11974c85	added null check when looking for deletedByExternalDataSource	2015-02-23 17:33:05 +00:00
Henry Oswald	5028665913	ignore errors from https://pstatic.datafastguru.info its malware we have ... no control over	2015-02-23 17:29:38 +00:00
Henry Oswald	c98c2db6be	change Raven?.captureException to not log json, might be causing error	2015-02-23 17:27:35 +00:00
Henry Oswald	8638b531a5	fire off register to newsletter on user registration as it can be slow	2015-02-23 16:03:45 +00:00
Henry Oswald	c33956c0af	fix jade warnings about missing space, need to escape the module html ... insertions a different way. != func rather than !{func}	2015-02-23 10:18:48 +00:00
Henry Oswald	f7f681d2a3	deal with nan tax rate if user is not in taxable location for subscription dashboard/change plan	2015-02-22 18:35:59 +00:00
Henry Oswald	d112ad22a8	added ldapjs to package.json	2015-02-20 15:23:24 +00:00
Henry Oswald	6a3f760c6f	added ShareLaTeX server pro options with ldap into settings.defaults	2015-02-20 12:09:35 +00:00
Henry Oswald	78b4bccba1	remove qq upload loading gif, just 404's atm and is not missed	2015-02-19 11:42:57 +00:00
Henry Oswald	e4121d8a28	forgot comma in ignoreUrls	2015-02-19 11:25:06 +00:00
Henry Oswald	4eed88c1ab	broken a err and null check into 2 lines	2015-02-19 10:54:28 +00:00
Henry Oswald	67f4929e49	null check on loadRootFolder	2015-02-18 22:31:45 +00:00
Henry Oswald	e8b50e2ffd	null check highlights before removing them	2015-02-18 22:29:07 +00:00
Henry Oswald	2c3b19e43d	null check on deleting entry from scope	2015-02-18 22:28:02 +00:00
Henry Oswald	ad5de0e93a	added null check on Facebook	2015-02-18 22:25:58 +00:00
Henry Oswald	5d09999da5	ignore errors from twitter loading	2015-02-18 22:19:49 +00:00
Henry Oswald	c15484db6b	added null check on log entry files in the client	2015-02-18 22:16:29 +00:00
Henry Oswald	4ec05364bb	set chat message to empty string by default	2015-02-18 22:06:18 +00:00
Henry Oswald	a9660a3a07	add err and null project test for locating project element	2015-02-18 21:57:21 +00:00
Henry Oswald	455d78773e	change the meta tags a little to help with so	2015-02-18 21:57:21 +00:00
Henry Oswald	f8e3fa6308	increase the auto compile limit a little	2015-02-18 21:57:21 +00:00
Henry Oswald	21a01d94d4	check that content exists before adding it to getAllDocs. ... causing error which I think is blowing up the mongo driver elsewhere	2015-02-18 21:57:21 +00:00
James Allen	766bfbf5ef	Provide easy way out of track-changes	2015-02-18 17:50:14 +00:00
James Allen	000f01fbeb	Remove unneeded uid module	2015-02-17 11:21:50 +00:00
James Allen	1a7d4f6be1	Fix smoke tests	2015-02-17 11:21:14 +00:00
Henry Oswald	4c4aaac7a9	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-17 10:59:25 +00:00
Henry Oswald	c4b21f3184	added some null checks to message.user.id	2015-02-16 23:16:38 +00:00
Brian Gough	3d69033212	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-02-13 15:56:51 +00:00
Brian Gough	c29714f427	avoid unnecessary infinite scroll loadUntilFull calls ... allow the dom to update before checking if more data is needed	2015-02-13 15:53:59 +00:00
James Allen	8e13ded360	Regenerate the session id after logging in or registering	2015-02-13 11:18:17 +00:00
James Allen	f037c466cd	Quieten noisy Ace warnings	2015-02-12 12:17:21 +00:00
James Allen	18d627baba	Add missing localStorage.coffee... oops	2015-02-12 11:55:52 +00:00
James Allen	7dd1ab84d5	Wrap calls to localStorage in an exception handler	2015-02-12 11:32:27 +00:00
James Allen	4dde3e4979	Update Ace to 'package 20.12.14'	2015-02-12 10:37:10 +00:00
Henry Oswald	65859468de	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-12 09:21:48 +00:00
Henry Oswald	216c9cefe3	don't error on subscription dashboard page if there is no subscription.taxRate	2015-02-12 09:21:45 +00:00
James Allen	50048a53b5	Don't throw an exception if there is an error with unzip	2015-02-11 11:34:49 +00:00
Henry Oswald	bf38fb7459	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-10 18:05:51 +00:00
Henry Oswald	1d6c928c81	fix bug which showed all plans as monthly in payment form. ... Also use translations for string of month/year	2015-02-10 18:05:39 +00:00
James Allen	18723c2e26	Bump version to 0.1.2	2015-02-10 14:05:51 +00:00
James Allen	bd5f303712	Remove dropbox js include	2015-02-10 14:05:51 +00:00
James Allen	b44e9b1dcb	Move template front end code to module	2015-02-10 13:02:43 +00:00
James Allen	01cf220d57	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-02-10 11:38:43 +00:00
James Allen	e4b77a2563	Merge branch 'dropbox-module'	2015-02-10 11:38:32 +00:00
James Allen	001a5d751b	Pull out templates logic into its own module	2015-02-10 11:24:34 +00:00
James Allen	2875958363	Merge pull request #140 from metbosch/fix/124_scroll_large_images ... Allowed scroll on binary-file container	2015-02-09 13:32:57 +00:00
Brian Gough	353e9c86a8	sample only 1% of pdf exceptions due to volume of requests to sentry	2015-02-09 11:18:46 +00:00
Henry Oswald	08420a305a	autolink chat messages	2015-02-07 16:15:33 +00:00
Henry Oswald	7918ea4bc3	don't evaulate wiki/learn html with angular	2015-02-07 15:55:27 +00:00
Henry Oswald	6f5b524b56	use currency for change plan pricing	2015-02-06 17:08:42 +00:00
Henry Oswald	79e7f82a36	only setup recurly once for subscription dashboard and apply async to make sure updates on pricing are applied	2015-02-06 16:54:11 +00:00
Henry Oswald	7030d5f822	change plan shows price including tax	2015-02-06 16:19:52 +00:00
Henry Oswald	86f963a7ec	recurly tax updates ... - get all accounts does get all of them by looping through all pages - creating coupons requires which plan the coupon is for - fixed the total price shown to people so it includes tax	2015-02-06 16:19:52 +00:00
James Allen	6c387edbe2	Remove Dropbox front end logic from main sharelatex repo	2015-02-05 18:20:34 +00:00
James Allen	f75376124e	Update open source branding	2015-02-05 16:56:35 +00:00
James Allen	d7afb4e513	Clean up unused real-time code in web	2015-02-05 16:37:37 +00:00
James Allen	3aad31069c	Always show chat name or email	2015-02-05 13:05:57 +00:00
James Allen	ae3175c805	Show cookies error message on forbidden response	2015-02-05 12:57:44 +00:00
James Allen	5a922e2356	Include email address explicitly in welcome email to avoid any confusion	2015-02-05 12:52:50 +00:00
James Allen	888ebd5d7b	Attempt to stop superfish malware from loading	2015-02-05 11:23:45 +00:00
James Allen	366a0403a6	Clear rate limit in smoke tests	2015-02-05 10:18:18 +00:00
James Allen	e35d80211e	Log when rate limit is hit	2015-02-05 09:52:40 +00:00
Henry Oswald	993c5bcee7	dont show generic error message on subscriptions if they are part of a group	2015-02-04 20:56:50 +00:00
Henry Oswald	7fdb8009a0	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-04 20:20:16 +00:00
Henry Oswald	e4a54cbdfc	added recurly subscription null checks ... this deals with a user who has an expired old subscription then is added to a group subscription.	2015-02-04 20:17:55 +00:00
James Allen	4235c90623	Add in rate limit to opening projets	2015-02-04 15:05:35 +00:00
Henry Oswald	42d8f1f222	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-03 14:10:27 +00:00
James Allen	753a80ada5	Navigate away from deleted docs. Closes #141	2015-02-03 13:51:56 +00:00
James Allen	0d299b308e	Ignore generated sharejs.js lib	2015-02-03 12:58:26 +00:00
James Allen	bd8311e1cf	Merge pull request #146 from sharelatex/fix-pdfng-no-background-digests ... Fix pdfng no background digests	2015-02-03 12:11:46 +00:00
Henry Oswald	e9ab77351a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-03 11:36:16 +00:00
James Allen	2aa229d145	Add in profiling end point	2015-02-03 11:05:23 +00:00
Henry Oswald	e4976539d9	show generic error handler only on error	2015-02-03 10:41:58 +00:00
James Allen	860de1528f	Load default coupon code if provided in query string	2015-02-02 17:42:27 +00:00
James Allen	48a17729e4	Show change plan list on clicking change plan, not hide	2015-02-02 14:53:45 +00:00
Henry Oswald	7f0b4e5ba5	Merge branch 'master' into sitelicences	2015-02-02 11:15:14 +00:00
Henry Oswald	ee83ed6e81	started using underscore.string to check domain emails	2015-02-02 11:15:04 +00:00
Henry Oswald	49e13128a0	forgot new moment lib	2015-01-30 10:13:32 +00:00
Henry Oswald	69b5eaad19	fixed the classic "UI Layout Callback Error"	2015-01-29 19:23:04 +00:00
Henry Oswald	cb889efb6a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-01-29 18:32:26 +00:00
Henry Oswald	948eeb87ba	improved momentjs ... - access it via amd not global - remove warning message - updated 2.7.0 -> 2.9.0	2015-01-29 18:31:11 +00:00
Henry Oswald	5a15e826a7	moved mathjax to be served locally	2015-01-29 18:29:53 +00:00
James Allen	36513f443c	Ensure we are in a digest loop when updating validation errors	2015-01-29 14:43:38 +00:00
James Allen	3731c62e17	Get validation working with address fields and Angular digest loop	2015-01-29 14:22:57 +00:00
James Allen	2a78a7843a	Allow subscriptions with no free plans, and adjust styles	2015-01-29 14:11:25 +00:00
Henry Oswald	69c3f48c1e	if there is a validation error re enable the button	2015-01-29 13:56:19 +00:00
Henry Oswald	0a64c1c8ac	on register try and auto allocate a group licence if one exists	2015-01-27 18:22:51 +00:00
Henry Oswald	3360b3c35a	added basic domain allocation feature	2015-01-27 18:09:56 +00:00
Brian Gough	a13e78e853	catch rejected promises in pdfviewer	2015-01-26 16:07:49 +00:00
Brian Gough	b4f527b099	handle rejected promises in pdf viewer	2015-01-26 16:07:49 +00:00
Brian Gough	182dfabbae	fix pdf loadcount (no ?: operator in coffeescript)	2015-01-26 16:07:49 +00:00
Brian Gough	1a8438be5f	handle error loading pdf	2015-01-26 16:07:49 +00:00
Brian Gough	d9a3776183	make sure the progress bar always goes to 100% before removing	2015-01-26 16:07:49 +00:00
Brian Gough	5a47b1bac2	use .25-second delay before loading indicator is removed	2015-01-26 16:07:49 +00:00
Brian Gough	940c6a4b8d	replace console.logs with error callbacks	2015-01-26 16:07:48 +00:00
Brian Gough	a5900c4b9a	handle case where Raven is not defined in pdf renderer	2015-01-26 16:07:48 +00:00
Brian Gough	192918dda1	replace $timeout by setTimeout in pdf viewer	2015-01-26 16:07:48 +00:00
Brian Gough	63fd1f7c78	remove comments	2015-01-26 16:07:48 +00:00
Brian Gough	20d1a8b0f7	queue all pdf rescale/relayout events to avoid duplicate redraws ... delay spinner by 100ms, since it now shows sooner	2015-01-26 16:07:48 +00:00
Brian Gough	866de306d6	added comment about double resize event	2015-01-26 16:07:48 +00:00
Brian Gough	3d1fe22f00	remove layout-ready event from pdfjs, we get it from jq layout	2015-01-26 16:07:48 +00:00
Brian Gough	bd8cfb1dae	fix pdf viewer to work without background scope.apply	2015-01-26 16:07:48 +00:00
Brian Gough	1160560bfb	add missing scope.$apply in pdf viewer event handlers ... shows up now there are no apply's coming from the unsaved file check	2015-01-26 16:07:48 +00:00
Brian Gough	994b307e3f	added comment for background polling change	2015-01-26 16:06:50 +00:00
Henry Oswald	bebe94a128	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-01-26 15:38:34 +00:00
Henry Oswald	b06c9f509e	if chat errors don't keep trying to get more chat messages ... causes loop which is why we have so many sentury errors	2015-01-26 15:36:34 +00:00
Brian Gough	5050c8c023	optimise common case for highlights (triggered on mousemove)	2015-01-26 15:14:55 +00:00
Brian Gough	5244fddce2	optimise common case for closing context menu (triggered on scroll)	2015-01-26 15:04:30 +00:00
Brian Gough	e62a2c7a6f	only set watch on attrs.layoutDisabled when attribute is defined	2015-01-26 15:04:30 +00:00
Brian Gough	0453c657da	prevent $scope.$apply from firing on every unsaved files check ... only trigger a digest when there is a change in the saved state	2015-01-22 17:00:56 +00:00
Brian Gough	b407fde6e3	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2015-01-21 15:26:38 +00:00
Brian Gough	58750140f4	enable new pdf viewer by default for newly created users	2015-01-21 15:26:01 +00:00
Brian Gough	e66cd6dc58	Merge pull request #142 from sharelatex/pdfng-scrollhandler ... Pdfng scrollhandler performance improvements	2015-01-21 15:25:29 +00:00
Brian Gough	4ab0f00b8d	do not render offscreen pdf pages yet ... they cause a delay without a visible spinner	2015-01-21 14:37:59 +00:00
Brian	f510c5d19f	render current page immediately	2015-01-20 21:33:49 +00:00
Brian	62d5916883	replace $timeout by setTimeout in pdf viewer update	2015-01-20 21:06:53 +00:00
Brian	ed6eedd9e2	remove unused functions in pdfRenderer	2015-01-20 20:36:43 +00:00
Brian	c8012dc22c	fix getVisiblePages in pdf viewer to allow optimisation	2015-01-20 20:35:29 +00:00
Brian Gough	debc3037ae	remove debugging from pdf viewer	2015-01-20 16:22:34 +00:00
Brian Gough	441bc63935	use setTimeout instead of $timeout in pdf scrollhandler	2015-01-20 16:20:38 +00:00
Brian Gough	591498a056	fix dom position calculation in pdf viewer	2015-01-20 16:20:19 +00:00
Brian	53e9086094	remove useless scope.$apply in pdf scrollhandler	2015-01-20 15:37:11 +00:00
Brian	721843695b	avoid using jquery in pdf scrollhandler to improve peformance	2015-01-20 15:36:52 +00:00
Brian Gough	96af4e0b4a	fix selection of prerender pages in pdf viewer	2015-01-20 14:28:43 +00:00
Brian Gough	f18f862be2	handle different page size in pdf viewer	2015-01-20 14:28:14 +00:00
Brian Gough	c9e019b4a7	clean up calculation of visible pdf pages and display on redraw	2015-01-20 11:06:40 +00:00
metbosch	43d723bcfb	Allowed scroll on binary-file container ... Set overflow in auto mode to allow large images.	2015-01-19 23:34:49 +01:00
Henry Oswald	90bb12db40	added state to payment form	2015-01-19 20:27:01 +00:00
Brian Gough	776535f9f3	move pdf page visibility calculation up into pdfViewer directive ... removes per-page watch for visibility	2015-01-19 16:55:44 +00:00
Henry Oswald	208dfea5c8	pull right the total prices on the payment page	2015-01-19 15:35:05 +00:00
Brian Gough	2e021b64d8	remove per-page $watch on default page size in pdf viewer	2015-01-19 14:36:20 +00:00
Brian Gough	906c9114cd	replace per-page pdf highlight $watch with highlight event	2015-01-19 14:26:14 +00:00
Brian Gough	adab8c6769	delay pdf spinner by 100ms	2015-01-19 14:24:52 +00:00
Henry Oswald	00810eaf21	Merge branch 'recurlyv3'	2015-01-19 13:51:02 +00:00
Henry Oswald	08000f647d	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-01-19 10:49:45 +00:00
Henry Oswald	17fe30ca0f	sanitise the ref for universities site. and remove unneeded sanitise	2015-01-19 10:49:40 +00:00
Brian	06330e6506	add pdfng scroll handler using requestAnimationFrame	2015-01-16 15:51:22 +00:00
Brian Gough	4e31833131	Merge pull request #138 from sharelatex/pdfng-use-browser-fonts ... use font-face for pdfjs rendering	2015-01-16 14:31:37 +00:00
Brian Gough	751166d987	Merge branch 'master' into fix-pdfng-progress-bar ... Conflicts: public/coffee/ide/pdfng/directives/pdfRenderer.coffee public/coffee/ide/pdfng/directives/pdfViewer.coffee	2015-01-16 14:19:59 +00:00
Brian Gough	df9cb03dcc	Merge pull request #134 from sharelatex/pdfng-reload-on-error ... Pdfng reload on error	2015-01-16 14:18:17 +00:00
Brian Gough	d832406923	pdfng: add comment about getDestinations vs getDestination	2015-01-16 12:50:08 +00:00
Henry Oswald	a0f5c09cb9	remove raven source map line	2015-01-15 15:22:45 +00:00
Henry Oswald	f2bc98bc3c	Change debuging to stringify messages in exception message	2015-01-15 15:18:15 +00:00
Brian Gough	157424c7b6	use font-face for pdfjs rendering	2015-01-13 16:39:49 +00:00
Brian Gough	8d568d9663	increase pdfng page load/render timeouts to 1 minute	2015-01-13 16:38:40 +00:00
Brian Gough	5e06043fcb	add loadedCallback to pdfng, detects when pdf is fully loaded	2015-01-13 16:28:24 +00:00
Brian Gough	953821959d	hide progress bar when pdfng has loaded	2015-01-13 16:27:04 +00:00
Brian Gough	1d3d316595	capture all pdfng error callbacks with raven	2015-01-13 15:47:27 +00:00
Brian Gough	823bdcf583	fix scope error in pdf viewer	2015-01-12 17:03:03 +00:00
Brian Gough	887423f8d7	report timeout errors to sentry	2015-01-12 17:02:51 +00:00
Brian Gough	560919b78f	avoid exception in pdf viewer ... if file was previously bigger, current position could be greater than the number of pages	2015-01-12 16:47:38 +00:00
Brian Gough	bf8bc27de0	catch errors in pdf viewer and reload if necessary ... if more than 3 reloads, display error to the user	2015-01-12 16:46:17 +00:00
Brian Gough	7f750ae692	add an error callback to the pdf renderer ... use page load and render timeouts of 30 seconds to detect hanging pages	2015-01-12 16:45:24 +00:00
Henry Oswald	4bcc9fb5c9	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-01-07 16:51:15 +00:00
Henry Oswald	7ec0264fe2	added missing currency symbols to subscription formatter	2015-01-07 16:51:05 +00:00
Henry Oswald	7508ba6c47	improved validation so that fields recurly said are wrong get highlighted	2015-01-07 16:43:20 +00:00
Henry Oswald	f6e9c544e6	slightly improved the breakdown form. Still not very pretty.	2015-01-07 14:59:56 +00:00
Henry Oswald	5d6a96ba4f	made form thinner	2015-01-07 14:51:54 +00:00
James Allen	dd5562f9b6	Send more data to sentry about messages.reverse error	2015-01-07 13:16:38 +00:00
James Allen	10653c12fd	Send more data to Sentry to track down error	2015-01-07 13:16:38 +00:00
James Allen	923fbfc574	Correctly handle quote characters in template name when downloading	2015-01-07 13:16:38 +00:00
James Allen	aec80fb1db	Include FreeTrialModalControler in main.coffee	2015-01-07 13:16:38 +00:00
Henry Oswald	f9843b3709	tax auto updates on change of address now. Is also preset based on users ip address	2015-01-07 13:16:19 +00:00
Henry Oswald	aaaf28f916	added some helper methods into recurly wrapper which can be used by ... our one time scripts	2015-01-07 12:02:07 +00:00
Henry Oswald	7e64b88fcf	fix cancel subscription on delete user	2015-01-02 10:37:59 +00:00
Henry Oswald	d678af4417	only validate credit card an cvv if there is data in them	2014-12-28 22:19:15 +00:00
Henry Oswald	735dd0811c	changed credit card/paypal logs from offical ones to font very good ones ... upgraded fontamerican to 4.2	2014-12-28 22:14:39 +00:00
Henry Oswald	1716b16fb0	added placeholder info to address	2014-12-28 22:03:12 +00:00
Henry Oswald	afab06bcac	removed safe message from payment form.	2014-12-28 21:56:17 +00:00
Henry Oswald	474fa5fe19	only validate expiry when both are set	2014-12-28 21:53:12 +00:00
Henry Oswald	1a4825a47b	pulled total price down a little	2014-12-28 19:08:36 +00:00
Henry Oswald	0efb1bba5b	adjusted post code and country field sizes	2014-12-28 19:06:01 +00:00
Henry Oswald	2d03e0532f	adjusted style of payment options	2014-12-28 19:04:47 +00:00
Henry Oswald	40aeed74ce	added little ssl secure message	2014-12-28 18:55:29 +00:00
Henry Oswald	bd52594f23	added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center	2014-12-28 18:43:53 +00:00
Henry Oswald	673140b620	got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false	2014-12-28 18:35:44 +00:00
Henry Oswald	9d57288809	centered the billing forms	2014-12-28 18:23:08 +00:00
Henry Oswald	236d4d7ab3	made the fields smaller and pushed plan name to header	2014-12-28 18:16:55 +00:00
Henry Oswald	137b9c1077	removed some labels and added paypal/credit card logos	2014-12-28 17:59:29 +00:00
Henry Oswald	baa0a42825	coupon field is shown if query string scf is shown	2014-12-28 17:51:36 +00:00
Henry Oswald	7f979e77db	- fixed new payment page so it uses correct plan and currency ... - submit button is disabled while processing - removed test data	2014-12-28 17:16:21 +00:00
Henry Oswald	ecb71d5bbf	pull recurely pub api key from settings file	2014-12-23 12:08:01 +00:00
Henry Oswald	12a28d91f2	removed month names	2014-12-23 12:00:41 +00:00
Henry Oswald	74347611e9	don't show the form until we have some data from recurly	2014-12-23 11:44:42 +00:00
Henry Oswald	03311311dd	added translations in	2014-12-23 11:42:56 +00:00
Henry Oswald	e2819c3bc6	added generic error handling to recurly processing and required fields	2014-12-23 11:04:54 +00:00
Henry Oswald	a7eb836c79	redirect to /thank-you on success and fix broken unit test from a few commits ago	2014-12-22 16:37:09 +00:00
Henry Oswald	d0c9783718	added paypal option in, not tested as we don't have paypal in stag	2014-12-22 15:51:50 +00:00
Henry Oswald	fb0a083b36	added address 2	2014-12-22 15:19:40 +00:00
Henry Oswald	6cedfb19d9	cleaned up form and added basic validation	2014-12-22 15:07:55 +00:00
Henry Oswald	fa1ec44e22	coupons work	2014-12-22 14:06:39 +00:00
Henry Oswald	a47b25d4b2	works with multi plan and currency, auto updates view on change	2014-12-22 12:55:29 +00:00
Henry Oswald	5305cbfd3e	got more correct details making it to recurly and improved form.	2014-12-19 11:17:35 +00:00
Henry Oswald	cc545db17b	can add account just about into recurly	2014-12-18 18:59:29 +00:00
Henry Oswald	47fb2a0878	basic angular form which has data bound to it	2014-12-18 17:48:23 +00:00
Brian Gough	505675803b	increase sentry sample rate to 100%	2014-12-18 09:31:38 +00:00
Brian Gough	7429e7845d	add sentry exclusion list and set logging sample rate to 1%	2014-12-16 11:34:48 +00:00
James Allen	2a2dc458e8	Merge pull request #127 from sharelatex/pdfng-server-fixes ... pdfng server fixes	2014-12-16 10:30:22 +00:00
Brian Gough	79b560f96b	update tests for new pdf viewer server fixes	2014-12-16 09:44:25 +00:00
James Allen	2819935a52	Add photo of Brian	2014-12-15 15:13:34 +00:00
Brian Gough	660bb75df4	add query string parameters for compileGroup= and pdfng= ... compileGroup will bypass mongo check for compileGroup priority pdfng will pass pdf Range: headers through from user request to CLSI	2014-12-12 16:47:43 +00:00
James Allen	b260287965	Merge pull request #125 from sharelatex/clientside-error-logging ... Clientside error logging	2014-12-12 15:54:23 +00:00
Brian Gough	fbf9111d80	Revert "revert to original CLSI proxy call" ... This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.	2014-12-12 15:43:36 +00:00
Brian Gough	d3b38c8dc2	Revert "Revert test changes for proxied headers when requesting pdfs from clsi" ... This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.	2014-12-12 15:43:21 +00:00
Brian Gough	419d84564c	add support for client-side error logging using sentry	2014-12-12 13:58:07 +00:00
Brian Gough	5ffdcc2bbb	make git ignore for 'modules' specific to top-level directory ... to prevent match with public/coffee/modules/	2014-12-12 13:27:20 +00:00
Henry Oswald	0561adde4b	added more logging	2014-12-12 12:21:14 +00:00
Henry Oswald	bd77d0e020	add null check in on project	2014-12-12 10:27:14 +00:00
Henry Oswald	5c7d77a853	added logging around docstore setting	2014-12-11 16:22:00 +00:00
Brian Gough	f005c5e8dc	Revert test changes for proxied headers when requesting pdfs from clsi	2014-12-11 13:42:51 +00:00
Brian Gough	8a77d619a8	revert to original CLSI proxy call ... due to problems with cost of authentication when byte-serving	2014-12-11 13:15:13 +00:00
Brian Gough	724116bcc1	Merge branch 'master' into pdfng	2014-12-10 13:18:02 +00:00
Brian Gough	50e03e93ba	poll the element for the pdf viewer if it is zero size ... avoid invisible pdf forever waiting for layout-ready event when switching between full-screen and split-screen	2014-12-09 14:40:54 +00:00
Brian Gough	1acc924e0b	comment out console.logs in pdfng	2014-12-09 14:39:58 +00:00
Brian Gough	843fa6f847	handle shutdown of pdf viewer/rendering with destroy method	2014-12-09 13:46:44 +00:00
Brian Gough	b157323eb7	defer loading of pdf destinations until required	2014-12-09 13:45:12 +00:00
Brian Gough	1e2e1ecb9c	stream in the whole pdf file after loading the required page	2014-12-09 13:41:49 +00:00
Henry Oswald	268de7d739	make the user.name more robust	2014-12-09 11:11:06 +00:00
Henry Oswald	611916119a	changed where online users name logic is so it catches all cases.	2014-12-08 18:56:46 +00:00
James Allen	b94a9aab0d	Hide loading bar once loaded enough to render	2014-12-08 17:48:57 +00:00
James Allen	48d4e96221	Remove development styles	2014-12-08 17:39:33 +00:00
James Allen	8c40432e18	Use fixed sized spinner	2014-12-08 17:39:24 +00:00
Brian Gough	63ac1093bc	keep pages visible after a recompile until they are ready to rerender	2014-12-08 17:00:43 +00:00
Brian Gough	c3569dd45f	add a progress event in the pdfng viewer	2014-12-08 17:00:26 +00:00
Brian Gough	2a66651ec9	flash the pdf controls in pdfng	2014-12-08 15:32:16 +00:00
Brian Gough	863c8b9586	prevent exception when scrolling during rerender in pdfng	2014-12-08 15:32:05 +00:00
Brian Gough	206e7db144	add spinners and classes for feedback on pdfng loading and rendering	2014-12-08 14:46:59 +00:00
Brian Gough	89d63c4f44	handle fullscreen mode in pdfng ... default to scale = 1 when containing div size is zero	2014-12-08 10:28:02 +00:00
Brian Gough	0ae83d9be4	rescale pdf on parent size initialisation in addition to resizes	2014-12-05 19:42:16 +00:00
Brian Gough	407cecc0d3	save the pdf state when the directive is destroyed	2014-12-05 19:40:33 +00:00
Brian Gough	5915bfd885	prevent change to navbar url in pdf viewer ... return false from pdf <a> click handler	2014-12-05 14:59:00 +00:00
Brian Gough	265ad4439c	Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng	2014-12-05 14:43:01 +00:00
Brian Gough	1284ce613c	support pdf double click	2014-12-05 14:33:06 +00:00
Brian Gough	4c0f3c55d7	clear the pdf renderqueue faster after the initial page has rendered	2014-12-05 12:14:40 +00:00
Brian Gough	7ea20c4266	avoid exception on pdfPage destroy	2014-12-05 12:12:17 +00:00
Brian Gough	c167e86ba5	use timeout instead of requestAnimationFrame in pdf scroll handler ... for simplicity as the time delay is large compared with rAF	2014-12-05 12:12:01 +00:00
Henry Oswald	70d0af519b	reset project to large state each time	2014-12-05 00:10:46 +00:00
Brian Gough	2074326237	render pdf pages in ascending order, fix bug where pages could be left unrendered	2014-12-04 16:52:11 +00:00
Brian Gough	4faac88065	handle destroy event in pdf page view and remove pending timeouts	2014-12-04 16:50:38 +00:00
Brian Gough	f8c1c5b025	avoid unnecessary retrieval of pdf viewport when rendering	2014-12-04 16:50:00 +00:00
Brian Gough	44057a9632	only check pdf page visibility on scroll every 50ms	2014-12-04 16:49:24 +00:00
Brian Gough	a15a6d877f	avoid exception when elements in pdf view have been removed	2014-12-04 16:44:41 +00:00
Brian Gough	ce4fb7ec04	remove the pdf spinner, it causes unwanted reflow/repaint	2014-12-04 16:44:14 +00:00
Brian Gough	b388c587e5	remove debugging log for pdf featureswitch	2014-12-04 16:42:28 +00:00
Brian Gough	05af3573b6	try disabling pdfjs font face usage for performance ... each new font face rule causes a full screen repaint	2014-12-03 15:18:58 +00:00
Brian Gough	a4ddfd5725	whitelist proxied headers when requesting pdfs from clsi	2014-12-03 15:09:46 +00:00
James Allen	4020c2f760	Update wrong synctex tooltip	2014-12-03 11:01:41 +00:00
James Allen	31ee8eea8b	Show sync panel for everyone except anonymous users	2014-12-03 10:09:40 +00:00
Brian Gough	35b6abe79c	fix tests for pdf header passing	2014-12-02 16:36:19 +00:00
Brian Gough	138170be60	pass headers through when proxying request to allow for byte-range/etag handling	2014-12-02 14:53:46 +00:00
Brian Gough	94448ed447	comment out logs/unused code in pdf viewer	2014-12-02 11:43:14 +00:00
Brian Gough	25521d1a26	insert the pdf text and annotations after the page has been rendered	2014-12-02 11:03:07 +00:00
Brian Gough	7071ee3540	set the size of the pdf container using jquery methods	2014-12-02 11:02:09 +00:00
Brian Gough	85750dfeb6	need to set the height of the container to get the pdf spinner working	2014-12-02 11:01:45 +00:00
Brian Gough	d6e47c2701	display empty div.pdf-canvas element as a blank page while it is being rendered	2014-12-02 11:00:33 +00:00
Brian Gough	ce8b5dd11c	generate fingerprints for the new pdf.js files	2014-12-01 16:48:40 +00:00
Brian Gough	f260b141a0	use the current stable version of pdfjs - previously committed HEAD version by accident	2014-12-01 16:27:24 +00:00
Brian Gough	4888ae8766	fix infinite loop in translated coffeescript for pdfng text layer	2014-12-01 16:26:48 +00:00
Brian Gough	5053536fff	load the compatibility library from the correct version of pdf.js	2014-12-01 15:41:17 +00:00
Brian Gough	440c1d3987	avoid exception	2014-12-01 15:24:19 +00:00
Brian Gough	0420e4638d	exclude pdf.js from the compiled build, to allow switching	2014-12-01 14:36:23 +00:00
Brian Gough	be91bc2754	disable PDF.js autofetch only when used in new pdf viewer	2014-12-01 14:35:58 +00:00
Brian Gough	25bebe1104	support old and new pdf viewers depending on feature switch	2014-12-01 14:35:12 +00:00
James Allen	c70c048aae	Send clear cache requests to the correct CLSI group	2014-12-01 12:19:01 +00:00
Brian Gough	3fd8bfb221	make the pdf viewer directive conditional depending on user feature switch	2014-12-01 11:47:56 +00:00
Brian Gough	3c05e032bd	rename the new pdf directive to pdfng	2014-12-01 11:46:52 +00:00
Brian Gough	a7f9a68159	removed duplicated pdf controllers	2014-12-01 11:45:56 +00:00
Brian Gough	608e6cd0d9	remove autogenerated file	2014-12-01 10:42:57 +00:00
Brian Gough	ff04e1662a	moved new pdf viewer under base App module	2014-12-01 10:42:47 +00:00
James Allen	e0178b17b5	Pass compile group correctly to Clsi._buildRequest	2014-12-01 10:28:09 +00:00
Brian Gough	175de30967	Merge branch 'master' into pdfng	2014-12-01 10:09:04 +00:00
Henry Oswald	a570d05132	fixed bug with setting root doc which would fail if the document class isn't on the top line	2014-12-01 01:07:03 +00:00
Brian Gough	57b09e1d60	started making pdf viewer conditional - work in progress	2014-11-28 16:59:39 +00:00
Brian Gough	57f4177f30	added pdfjs-1.0.712 in a subdirectory	2014-11-28 16:01:14 +00:00
Brian Gough	f09807cf33	Revert "upgrade pdf.js to v1.0.712" ... This reverts commit 1ace92f67d91395d047281047be2f0cff5ea7848.	2014-11-28 15:25:29 +00:00
Brian Gough	d8e07731e0	clean up unnecessary redraws	2014-11-28 15:08:24 +00:00
Brian Gough	7485b564bc	fix off by one error in viewport retrieval	2014-11-28 14:39:17 +00:00
Brian Gough	23011cf221	convert page indices from 1-based to 0-based to match pdfListView positions	2014-11-28 14:34:05 +00:00
James Allen	175dfae085	Look up compile group and features from project owner, not current user	2014-11-28 14:26:21 +00:00
James Allen	2c5f3c728c	Highlight \vref like \ref	2014-11-28 13:58:27 +00:00
James Allen	dbd7b95823	Close spell check menu on scroll so it doesn't appear in the wrong position	2014-11-28 13:27:25 +00:00
Brian Gough	f914c75712	highlights working for moving to position in pdf from source	2014-11-28 11:57:23 +00:00
James Allen	793763f206	Merge pull request #120 from watercrossing/POSTFix ... Declare forms to use method="POST" explicitly	2014-11-28 11:11:18 +00:00
Brian Gough	ea310f0248	highlights/dblclick in pdfng - work in progress	2014-11-27 16:58:38 +00:00
Henry Oswald	20a5ad6e27	fixed where project to large code is passed from	2014-11-27 16:22:39 +00:00
Henry Oswald	fa755c6521	added project to long check from clsi2 (bit of a punt)	2014-11-27 15:42:37 +00:00
Brian Gough	3694bea956	use margin for height/width in pdfng	2014-11-27 14:16:32 +00:00
Brian Gough	b8377bca7b	fix offset calculation to match pdflistview	2014-11-27 13:46:22 +00:00
Brian Gough	7b4ca6501b	update the margin size of pdfng	2014-11-27 13:42:05 +00:00
Brian Gough	21e5fb08cd	replicate the pdflistview classes in pdfng viewer	2014-11-27 13:41:48 +00:00
Henry Oswald	0bc76b6d92	mkdir p changed so it does not get entire project, now without doc lines	2014-11-27 12:07:49 +00:00
Henry Oswald	63deb0a508	Revert "added lock to update merger" ... This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.	2014-11-27 11:46:17 +00:00
Henry Oswald	280895bdf5	added lock to update merger	2014-11-27 10:46:52 +00:00
Henry Oswald	ca8a21c425	change async to series ... no real gain from parallel, series might reduce the cpu load if it finds the doc early	2014-11-26 21:53:57 +00:00
Henry Oswald	5e570d52a0	modfied setRootDocAutomatically to work async ... was causing cpu to block for along time on big projects	2014-11-26 17:19:21 +00:00
Brian Gough	a15ee57d77	working on zoom/fit buttons	2014-11-26 16:52:54 +00:00
Brian Gough	6c1cee1431	save pdf position and scale	2014-11-26 16:18:59 +00:00
Brian Gough	7b66802bf5	set up pdf viewer app in base	2014-11-26 16:18:39 +00:00
Brian Gough	d0fb34b2aa	Merge branch 'master' into pdfng	2014-11-26 15:42:42 +00:00
Henry Oswald	393a637673	remove a couple of required coffee-scritps which are not required	2014-11-26 15:37:53 +00:00
Henry Oswald	857d867191	added locks into editor controller for new/move/deletes ... filesystem import manager uses the unlocked version	2014-11-26 15:32:23 +00:00
Brian Gough	33d94af930	Merge branch 'master' into pdfng	2014-11-26 14:17:02 +00:00
Henry Oswald	bd841b4795	coppied the lock manager over from doc updater	2014-11-25 16:52:27 +00:00
Brian Gough	643bda6095	add pdfng module and use it by default	2014-11-25 16:49:09 +00:00
Brian Gough	81b8594944	upgrade pdf.js to v1.0.712	2014-11-25 15:58:01 +00:00
Henry Oswald	ba784c3e62	changed swiss franks to show Fr for display issues	2014-11-25 13:18:57 +00:00
Henry Oswald	d070c0acd8	fixed SGD collab price	2014-11-25 13:14:38 +00:00
Henry Oswald	3bae278c92	Revert "increased timeout for geoip to 3 seconds" ... This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.	2014-11-25 13:10:00 +00:00
Henry Oswald	d91064a369	increased timeout for geoip to 3 seconds	2014-11-25 11:51:03 +00:00
Henry Oswald	dbecadcaea	Merge branch 'master' into multicurrency	2014-11-25 11:35:59 +00:00
Henry Oswald	dd37436da2	delete old cookie keys	2014-11-25 11:35:46 +00:00
Henry Oswald	02ef07dca4	broken free trial func into own file. added ab test on upgrade button colour	2014-11-24 23:59:55 +00:00
Henry Oswald	6c0f03e9c7	added ab test to show collar plan to people in editor	2014-11-24 16:21:03 +00:00
James Allen	afca9ba0cb	Fix unit tests	2014-11-24 14:26:51 +00:00
James Allen	b8fdbdb406	Handle errors in request pipes	2014-11-24 13:58:41 +00:00
James Allen	970125b7a8	Check for null project in joinProject	2014-11-24 13:43:08 +00:00
James Allen	3578e41c9c	Add null check into FileTypeManager isDirectory check	2014-11-24 13:39:07 +00:00
James Allen	d4af0fe36d	Wrap smoke test in domain to catch errors	2014-11-24 13:36:10 +00:00
James Allen	c28e09076b	Add missing logger include in smoke test	2014-11-24 13:33:03 +00:00
Henry Oswald	a52b91691a	Merge branch 'master' into multicurrency	2014-11-21 13:16:29 +00:00
Henry Oswald	6d22bda88f	added new currencies removed ab test as well	2014-11-21 13:13:53 +00:00
James Allen	485459c839	Use real-time server for websockets	2014-11-21 12:44:41 +00:00
Henry Oswald	24b3226fcf	bump redis version	2014-11-20 12:50:55 +00:00
Henry Oswald	851764f269	bump package.json	2014-11-20 11:10:22 +00:00
Henry Oswald	6c746d9aec	added redis health check in	2014-11-19 23:18:20 +00:00
Henry Oswald	458e4335de	added a load more currencies	2014-11-19 21:34:13 +00:00
Henry Oswald	57abc2cb24	lock down the version of redis	2014-11-19 16:45:10 +00:00
Henry Oswald	9e63b6c3a1	use redis 0.0.6	2014-11-19 16:41:12 +00:00
Henry Oswald	cd8c233c05	Revert robust redis connection code	2014-11-19 15:06:05 +00:00
Henry Oswald	dbb1d68b66	added SEK and CAD currencies	2014-11-19 14:52:59 +00:00
James Allen	8b9a26d6f3	Add in http health check end points for redis subscription channels	2014-11-19 14:12:37 +00:00
James Allen	34e20e99f5	Pull redis from github master temporarily	2014-11-19 11:09:59 +00:00
James Allen	d6532c63f8	Use new robust subscription model	2014-11-19 11:09:42 +00:00
James Allen	5ec9e587f0	Roll back real-time settings for now	2014-11-19 11:09:32 +00:00
James Allen	22346f5532	Revert "Pull redis from github master temporarily" ... This reverts commit 919fbdf8945bdd2cdb5ddda5a7ac8c5b7395597b.	2014-11-18 18:01:58 +00:00
James Allen	f8cbc5d51a	Pull redis from github master temporarily	2014-11-18 15:55:08 +00:00
Ingolf Becker	9d71073a5c	Added more POST declarations	2014-11-17 15:19:11 +00:00
Henry Oswald	bb5ec10609	don't try and get angular min map file	2014-11-17 14:55:48 +00:00
Ingolf Becker	fd28751db0	Change Login and Register methods to use POST rather than GET	2014-11-17 14:55:28 +00:00
James Allen	e559c72491	Connect to configurable websocket service	2014-11-17 13:38:44 +00:00
Henry Oswald	804bc16bc8	redirect users to /register when coming from templates or share url ... redirect to /login when going anywhere else (/project /project/1234)	2014-11-13 17:12:39 +00:00
Henry Oswald	efe8667e5e	changed the top level on bonus	2014-11-13 15:23:13 +00:00
Henry Oswald	f5d3801bfb	changed findElementByPath to not call cb more than once & deal with nulls	2014-11-11 14:44:44 +00:00
Henry Oswald	948183b685	return done in smoke test	2014-11-10 16:33:36 +00:00
Henry Oswald	ae897cb41d	try catch encodeURIComponent	2014-11-10 16:30:02 +00:00
Henry Oswald	c920874872	added null check to compile features	2014-11-10 11:26:40 +00:00
Henry Oswald	29ae816432	added next into controller for error	2014-11-10 11:23:07 +00:00
Henry Oswald	e077108993	null check user in logging	2014-11-10 11:21:59 +00:00
Henry Oswald	4c905c168a	do null check on csrf token in smoke test	2014-11-10 11:20:34 +00:00
Henry Oswald	e9232eb197	try catch converting id to object id	2014-11-09 23:08:23 +00:00
James Allen	6d10e45135	Fix unit test	2014-11-07 12:35:10 +00:00
James Allen	84c08edcf3	Factor out common joinProject logic to provide and HTTP end point for the real-time API	2014-11-07 12:31:47 +00:00
James Allen	218f5fedf8	Fix broken template creation route	2014-11-07 11:21:55 +00:00
James Allen	f7e6b24ff6	Save template description on modal close	2014-11-07 10:26:09 +00:00
James Allen	a59a2dcf39	Make sure to send description before publishing	2014-11-07 10:20:29 +00:00
James Allen	c9e5583394	Use local versions of jquery and angular	2014-11-07 09:49:30 +00:00
James Allen	9c5ae5adf4	Remove unused old update method	2014-11-07 09:39:17 +00:00
James Allen	d27af25bc9	Convert template publishing to use HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	7b6ec86cef	Access Dropbox status via HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	e596b60af0	Move collaborator HTTP end points into the Collaborators feature	2014-11-06 14:39:40 +00:00
James Allen	5c3e8e6d88	Add and remove collaborators with HTTP requests, not websockets	2014-11-06 14:39:40 +00:00
James Allen	94a17bd36d	Remove unused socket.io endpoints	2014-11-06 14:39:40 +00:00
Henry Oswald	1a2411d4c2	removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter	2014-11-06 12:07:50 +00:00
Henry Oswald	a2f99bc04f	prevent spell check from running twice on doc load	2014-11-04 14:20:59 +00:00
Henry Oswald	908926a0cc	compiled pdf.worker with closure compiler manually	2014-11-04 12:44:45 +00:00
Henry Oswald	05a872763e	revert updated pdf worker and don't minify it ... This reverts commit ffbf6f052f1800b55c7636a98e4f16fdf629c376.	2014-11-04 12:16:06 +00:00
Henry Oswald	be6f0c1ad7	updated pdf worker	2014-11-04 12:10:21 +00:00
Henry Oswald	15285b67cc	minify more assets	2014-11-04 12:01:53 +00:00
Henry Oswald	b9dd2d826e	added null check on subscription for group plans	2014-11-04 10:53:03 +00:00
James Allen	22f5c5dcb9	Keep spacing consistent	2014-11-03 14:25:53 +00:00
James Allen	1d6647e67d	Add in github to plans page	2014-11-03 14:23:12 +00:00
Henry Oswald	16e93b6f1b	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-11-03 12:07:53 +00:00
Henry Oswald	edf715919d	send user to 404 if templates returns 404	2014-11-03 11:48:56 +00:00
Henry Oswald	4c7293f8c2	remove lang from page title in wiki article	2014-11-03 11:48:43 +00:00
James Allen	528ff743e8	Remove github feature flat	2014-11-03 10:55:35 +00:00
Henry Oswald	ccae47979f	added chinese flags under cn	2014-10-31 13:21:04 +00:00
Henry Oswald	30100f2a07	fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync	2014-10-31 12:41:06 +00:00
Henry Oswald	aeb956c8a4	wiki will try and get spanish version of page then fall back to english if it is not there	2014-10-31 12:15:03 +00:00
Henry Oswald	e0aae65050	added file ref null check	2014-10-31 10:50:20 +00:00
Henry Oswald	0f4d9771aa	added null check to where we insert elements into a project	2014-10-31 10:37:44 +00:00
Henry Oswald	d428e7e5b4	handle a null in the file refs list ... this seems to happen now and then when there is networking issues	2014-10-31 10:34:21 +00:00
Henry Oswald	4f590d7acb	added chinese flags in	2014-10-30 11:52:45 +00:00
Henry Oswald	14d32af6bf	allow ace to scoll off screen	2014-10-30 08:33:54 +00:00
Henry Oswald	56efefd6d4	renamed variable	2014-10-30 08:33:18 +00:00
James Allen	ca664e0063	Get subscription status correctly for showing upgrade/bonus link	2014-10-27 15:00:46 +00:00
James Allen	2a69e185ce	Append spell check menu to body so it isn't hidden by PDF view resizer	2014-10-27 14:51:28 +00:00
James Allen	184189fa3f	Disable hotkeys for layout panels since they interfere with text editing	2014-10-27 14:47:06 +00:00
James Allen	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +00:00
Henry Oswald	f4be1884d3	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-27 11:23:50 +00:00
Henry Oswald	011bdc4617	explicitly set the file types to delete ... the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents	2014-10-24 12:01:52 +01:00
James Allen	2debba6bbc	Update PGP key	2014-10-24 11:55:30 +01:00
Henry Oswald	0a123418ac	insert ref data into uni page	2014-10-23 14:13:40 +01:00
Henry Oswald	fab0dc5cbc	change button to a	2014-10-23 11:51:35 +01:00
Henry Oswald	b067e0d0a4	fixed email us button on templates	2014-10-23 11:18:04 +01:00
Henry Oswald	0f8519f619	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-21 14:57:52 +01:00
Henry Oswald	c60f11519f	added ga logging of starting free trial again	2014-10-21 14:06:53 +01:00
Henry Oswald	8097e6ad71	made 7 day free trial the default	2014-10-21 13:48:46 +01:00
James Allen	281c4eb4e3	Style tweaks for uni site	2014-10-21 13:39:47 +01:00
Henry Oswald	4bd0708029	put the compile group on the session so proxied requests are sent to the correct place ... I know this is premature optimisation however we do make a lot of requests to the clsi for each compile and this will save mongo a lot of calls	2014-10-21 09:34:58 +01:00
Henry Oswald	fb53be7ce4	Revert "priority compiles are proxyed to the priority servers" ... This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.	2014-10-21 09:16:23 +01:00
Henry Oswald	250606472d	priority compiles are proxyed to the priority servers	2014-10-20 17:48:00 +01:00
Henry Oswald	36136a99ca	fixed escaping of html	2014-10-20 15:46:42 +01:00
Henry Oswald	9be31a2ac1	removed type: from log lines	2014-10-20 14:24:39 +01:00
Henry Oswald	7ba6689ea0	add clsi2_priority to settings.defaults	2014-10-20 12:21:58 +01:00
Henry Oswald	3cf64ce34f	pass new compile features to client side, don't show timeout upgrade for premium users	2014-10-20 12:21:40 +01:00
Henry Oswald	fc4bc08fc2	added upgrade to get faster compiles message to timeout	2014-10-17 16:01:26 +01:00
Henry Oswald	b9d6d5bbf1	set the request timeout to a few mins for the compile	2014-10-17 13:23:29 +01:00
Henry Oswald	e7906f7018	timeout option passed to clsi	2014-10-16 18:43:48 +01:00
Henry Oswald	7293ccf06d	if user has premium compile send them to a different server set	2014-10-16 17:52:21 +01:00
Henry Oswald	5a4a90924b	added default opts for users compile features	2014-10-16 16:57:51 +01:00
Henry Oswald	1506f86a5f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-16 16:34:25 +01:00
Henry Oswald	d97e42a959	get users features for compile options i.e. timeout and which compiler	2014-10-16 16:34:21 +01:00
Henry Oswald	d8cc3b7b61	fixed leaky test	2014-10-16 16:02:31 +01:00
James Allen	8fa8a64c6f	Update email templates	2014-10-16 12:46:38 +01:00
James Allen	f3a1ba93a4	Fix argument signature of mergeUpdate and deleteUpdate	2014-10-16 11:43:54 +01:00
James Allen	46ecaf9f6c	Fix broken argument signature of addFolder	2014-10-16 11:27:10 +01:00
James Allen	9f1a7c7396	Send source of update to doc updater and allow external updates to be ignored in UI	2014-10-16 11:27:10 +01:00
Henry Oswald	1b893ff502	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-15 16:22:01 +01:00
Henry Oswald	750b050358	added ab test in for multi currency	2014-10-15 16:21:45 +01:00
James Allen	7e9318814d	Send source of update to doc updater on setDocument request	2014-10-15 15:36:08 +01:00
James Allen	6800c1a15e	Track the source of updates through the system on adding/updating of docs and files	2014-10-15 15:18:31 +01:00
James Allen	4f2ab51ebd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-10-15 14:11:11 +01:00
James Allen	941f550d6c	Remove all traces of soa-req-id	2014-10-15 14:11:02 +01:00
Henry Oswald	af769c7871	allow ip to set via query string for plans page	2014-10-15 11:58:35 +01:00
Henry Oswald	e443809206	free trial length is show correctly at bottom of plans page	2014-10-15 11:49:20 +01:00
James Allen	fd8991f62e	Sort out responsive flow	2014-10-15 10:23:08 +01:00
James Allen	64fe2a2404	Improve CSS and layout of feature list on new subscription page	2014-10-15 10:22:03 +01:00
James Allen	b32375530c	Refactor card css for use in new subscription page	2014-10-14 15:46:44 +01:00
Henry Oswald	b2b13ef9a7	pass plan to payment page to get the number of collaborators	2014-10-14 12:14:24 +01:00
Henry Oswald	19a08f82a6	default to USD if there is no match	2014-10-14 12:14:03 +01:00
Henry Oswald	4a774981cf	Merge branch 'master' into multicurrency	2014-10-14 11:52:03 +01:00
Henry Oswald	2538d16e63	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-14 11:50:10 +01:00
Henry Oswald	3bac4dc39f	increase auto compile limit	2014-10-14 11:50:06 +01:00
Henry Oswald	6437f74cd3	use req.ip not x-forwarded-for to get ip address for multi currency	2014-10-13 17:55:18 +01:00
Henry Oswald	3382c5bb17	added blurb to payment page	2014-10-13 17:51:59 +01:00
Henry Oswald	5a0d74753f	plans page will auto redirect to best guess currency	2014-10-13 17:39:44 +01:00
Henry Oswald	52c54e7300	added ability to change currency on payment page	2014-10-13 17:28:00 +01:00
Henry Oswald	58f6ae323b	fix which plan is "your plan" on dashboard	2014-10-13 16:33:01 +01:00
Henry Oswald	2bbdea3433	renamed change currency function and sorted out recommended currency	2014-10-13 16:27:27 +01:00
Henry Oswald	2bf34bba4d	added currency to subscription view model	2014-10-13 16:14:13 +01:00
Henry Oswald	f55ef2f1b4	made what is returned for multi currency more explicit	2014-10-13 16:13:31 +01:00
James Allen	3c058edfb4	Add github feature flag to user model	2014-10-13 15:45:19 +01:00
Henry Oswald	7964616f02	changing email address should lowercase the email	2014-10-13 15:44:45 +01:00
James Allen	5edefe2498	Add in compile timeout and group feature options	2014-10-13 15:42:11 +01:00
James Allen	cfb3969b88	Fix alignment in left menu	2014-10-13 14:45:45 +01:00
Henry Oswald	36264706f6	hooked the plans page up to the geo ip lookup	2014-10-13 14:10:15 +01:00
Henry Oswald	3ca04e25fd	add 1 second timeout to geoiplookup ... response times generally seem to be around 0.05s from our servers	2014-10-13 13:15:48 +01:00
Henry Oswald	2e6c2c1926	default to USD in geo ip lookup. ... Decided to put default logic in the GeoIpLookup.getCurrencyCode as we are going to want this default everywhere we use it.	2014-10-13 13:08:11 +01:00
Henry Oswald	e78e4d46b0	use first ip passed though in string for ip lookup	2014-10-13 13:04:20 +01:00
Henry Oswald	259871cbdd	added geoip lookup feature	2014-10-13 00:45:45 +01:00
Henry Oswald	40c3c3e1ce	added customAccount to subscription model	2014-10-10 15:57:27 +01:00
Henry Oswald	7b37bed2cd	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-10 15:45:09 +01:00
Henry Oswald	b90003b11e	added custom user dashboard page	2014-10-10 15:44:53 +01:00
Henry Oswald	3ba3a91043	if its a custom account redirect to /user/subscription/custom_account	2014-10-10 15:11:22 +01:00
James Allen	a8afe3a0d7	Improve file uploader CSS	2014-10-10 13:40:00 +01:00
Henry Oswald	c7a3cb87c2	added modules folder	2014-10-10 09:50:53 +01:00
Henry Oswald	e5ab40c911	added example session invalidation code	2014-10-09 18:10:01 +01:00
Henry Oswald	e7984a90d7	unlink dropbox when a user cancels	2014-10-09 17:05:41 +01:00
Henry Oswald	9924882b59	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-09 16:45:26 +01:00
Henry Oswald	9803f8bd70	changed uni page holder and footer	2014-10-09 16:45:04 +01:00
James Allen	4743b460f5	Only show rename or deleted message once	2014-10-09 09:13:38 +01:00
James Allen	bc94ea56cb	Add projects to tag after creating the tag	2014-10-09 08:39:15 +01:00
James Allen	3bf7948510	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-10-08 17:18:57 +01:00