5969 commits

Author	SHA1	Message	Date
Paulo Reis	8d933d9b5f	Toggler style adjustments.	2016-11-23 16:10:35 +00:00
Paulo Reis	f61aac0bb3	Make toggler label clickable.	2016-11-23 14:44:04 +00:00
Paulo Reis	e655e85e6d	Integrate toggler in review panel.	2016-11-23 14:34:55 +00:00
Paulo Reis	ba5118d02a	Merge branch 'master' into ja-review-panel	2016-11-23 10:41:20 +00:00
Paulo Jorge Reis	ff0a5395e5	Merge pull request #374 from sharelatex/pr-wrap-ab-test-header ... PR Wrap header labels AB test	2016-11-23 09:49:53 +00:00
Shane Kilkelly	cee3326ce3	fix omission of 'length'	2016-11-22 17:06:05 +00:00
Shane Kilkelly	f9b1862ddb	Merge branch 'master' into sk-post-login-redirect	2016-11-22 16:54:12 +00:00
Shane Kilkelly	8a4352fff2	Set redirect when redirecting from restricted	2016-11-22 16:54:03 +00:00
Shane Kilkelly	2edd75de96	Allow the 500/Error page to render, even if res.locals aren't set up yet.	2016-11-22 16:48:13 +00:00
Shane Kilkelly	8089bb55a4	use session for the post-login redirect, remove redir query string.	2016-11-22 14:24:36 +00:00
Paulo Reis	dce272462a	Remove test-related mark-up.	2016-11-22 10:39:56 +00:00
James Allen	db93bc8cff	Grey out and add extra info to resolved comments	2016-11-21 17:13:17 +00:00
Paulo Reis	fc6730f5bf	Lower brightness in smaller username text spans; limit avatar text to 1 char.	2016-11-21 14:51:01 +00:00
Paulo Reis	ad857a15f9	Style resolved comments in the current file pane.	2016-11-21 11:16:23 +00:00
James Allen	5814d93f5e	Order entries in the overview panel based on their place in the document	2016-11-18 16:30:41 +00:00
James Allen	6ea61472ec	Add tooltip to add comment indicator	2016-11-18 16:08:02 +00:00
Paulo Reis	f029c7a7b2	Control click behaviour on comments; relayout when toggling panels.	2016-11-18 15:08:16 +00:00
Shane Kilkelly	da1be67aff	Merge branch 'sk-ext-auth-show-email'	2016-11-18 09:34:05 +00:00
James Allen	bf20799478	Allow comments to be resolved an deleted	2016-11-17 18:06:08 +00:00
James Allen	7a8af8a21a	Show file names in overview panel	2016-11-17 16:05:12 +00:00
James Allen	4a93e02407	Goto a change when clicked in the overview panel	2016-11-17 15:55:18 +00:00
Shane Kilkelly	6606375cd7	Remove dead code: SessionInvalidator	2016-11-17 15:27:58 +00:00
Shane Kilkelly	fa146a1558	Remove redundant !!	2016-11-17 14:48:15 +00:00
Shane Kilkelly	3b8fbe8249	If using external auth, show non-editable email field. ... Also defend server-side against setting email when using external auth.	2016-11-17 14:34:02 +00:00
James Allen	15d8f6c661	Sort out scroll bar positions and scroll position transitions	2016-11-17 14:29:35 +00:00
James Allen	e2f21a67d2	Sort of positioning and scrolling of overview panel	2016-11-17 12:09:07 +00:00
James Allen	1e8f2a89a1	Refactor layout and CSS to be more manageable with overview classes	2016-11-17 11:47:20 +00:00
Paulo Reis	f170fd4b83	Refactor Ace directive to have a single events bridge.	2016-11-17 10:40:08 +00:00
Paulo Reis	706b0793ab	Pull callouts into entries directives.	2016-11-16 16:21:24 +00:00
Paulo Reis	32b3ba6bbb	Pull indicators into entries directives.	2016-11-16 16:13:39 +00:00
Paulo Reis	6153bd3022	Wrap add comment entries in a directive	2016-11-16 15:47:05 +00:00
Paulo Reis	24f82c3c35	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 15:34:49 +00:00
James Allen	fc3fd5c73c	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 15:27:48 +00:00
James Allen	379afe4aa5	Refactor scroll handling into directive	2016-11-16 15:23:29 +00:00
Paulo Reis	00a6df156b	Wrap comment entries in a directive	2016-11-16 15:12:58 +00:00
Paulo Reis	9ffb05cd98	Wrap insert and delete entries in a directive	2016-11-16 14:56:34 +00:00
Brian Gough	277894631a	try out new pdfjs font fix ... https://github.com/mozilla/pdf.js/pull/7705	2016-11-16 14:50:09 +00:00
Paulo Reis	d7d21b106c	Isolate review-panel markup.	2016-11-16 14:42:07 +00:00
Shane Kilkelly	f9774141b1	Fix up makeRequest, so it copes with analytics.url being un-configured.	2016-11-16 14:40:38 +00:00
James Allen	479ea83e36	Dump everything (unstyled) into the review panel	2016-11-16 13:51:30 +00:00
James Allen	711f282575	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-16 13:26:33 +00:00
Paulo Reis	f640c17d4d	Add review panel substate toggling.	2016-11-16 12:31:47 +00:00
Paulo Reis	db5dc6ef15	Positive action buttons on the right.	2016-11-16 11:03:29 +00:00
James Allen	b443c5d7dc	Make mini review panel entries scroll and stack like main panel	2016-11-15 17:07:06 +00:00
James Allen	829ccb6641	Resize on toggling review panel	2016-11-15 16:21:45 +00:00
Paulo Reis	8a11c8c3ca	Show add comment button when review panel is off.	2016-11-15 16:02:12 +00:00
James Allen	09074f5413	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-15 15:48:17 +00:00
James Allen	4542d1094d	Keep separate persistent change tracker for each doc	2016-11-15 15:48:12 +00:00
Henry Oswald	5b3cd7ed2b	use makeRequest func in analytics manager	2016-11-15 15:36:26 +00:00
Paulo Reis	7bf55823b2	Hide review panel when there are no entries.	2016-11-15 15:04:29 +00:00
Henry Oswald	a822cc0c92	don't log events from health check user	2016-11-15 13:41:15 +00:00
Henry Oswald	6776aa61f1	use new way to send status in express for healthcheck controlller	2016-11-15 11:04:13 +00:00
Henry Oswald	411b5324df	don't try and send requests when analytics isn't enabled	2016-11-15 10:54:48 +00:00
Henry Oswald	d87067bc2f	Merge branch 'announcments'	2016-11-15 10:38:01 +00:00
Henry Oswald	15564102a0	Update ProjectController.coffee	2016-11-15 10:34:57 +00:00
Paulo Reis	0c600ba9b8	Support overflowing panes in UI layout.	2016-11-15 10:34:19 +00:00
Shane Kilkelly	6c381b127c	Count saml as an external authentication system.	2016-11-14 13:33:48 +00:00
James Allen	c89579e1df	Focus on the focused change	2016-11-14 12:47:46 +00:00
Paulo Reis	7201bde2a3	Add comment UI.	2016-11-14 11:19:00 +00:00
Henry Oswald	e397b76fba	commended out jade so can go live with rest of code quietly	2016-11-14 10:54:36 +00:00
Henry Oswald	47ed17aab3	remove unneeded package and comma in jade	2016-11-14 10:50:49 +00:00
Henry Oswald	666bfdf967	stop the /announcements call at controller level	2016-11-11 17:15:36 +00:00
Henry Oswald	5a13ee1077	use anlaytis api ... - don’t talk to postgres - show recent blog post announcments - proxy all events to analytics api	2016-11-11 17:03:09 +00:00
James Allen	747e14dffe	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-11 16:16:10 +00:00
Paulo Reis	d04d7f834e	Adjustments in the threaded comments, mocked comments responses.	2016-11-11 16:10:26 +00:00
James Allen	9509e87dc1	Update entries in place and position via DOM attributes directly	2016-11-11 16:09:32 +00:00
Shane Kilkelly	2cf2199964	WIP: enable non-csrf routes from modules	2016-11-11 13:48:29 +00:00
Paulo Reis	6c5c1549b6	Add comment replies via enter keypress.	2016-11-11 10:51:32 +00:00
Paulo Reis	78e409593b	Threaded comments.	2016-11-10 17:19:41 +00:00
Paulo Reis	8dcbb6ea4f	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-10 15:09:56 +00:00
Paulo Reis	c5e6ca5200	More entry styling.	2016-11-10 15:08:41 +00:00
James Allen	593e59450b	Use different UserSessions keys for cluster vs normal redis session store	2016-11-10 14:31:48 +00:00
Paulo Reis	997addf355	More entry header styling + entry body.	2016-11-10 12:35:35 +00:00
James Allen	4e2dd55cfd	Fix merge issues	2016-11-10 10:53:30 +00:00
James Allen	812ee82af1	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade	2016-11-10 10:52:40 +00:00
James Allen	34b2b665a3	Accept and reject changes	2016-11-10 10:52:09 +00:00
Paulo Reis	950fc0179c	Basic support for action icons.	2016-11-10 10:19:52 +00:00
James Allen	ca178c1a85	Fix indentation	2016-11-09 17:12:01 +00:00
James Allen	f62d95dd8c	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 17:11:02 +00:00
James Allen	2e719fc450	Start adding callouts in review panel	2016-11-09 17:10:58 +00:00
Paulo Reis	013df17192	Entry header layout.	2016-11-09 17:09:57 +00:00
Paulo Reis	f28119aacb	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 16:36:12 +00:00
Paulo Reis	341a092231	Merge + basic layout for entries.	2016-11-09 16:36:06 +00:00
James Allen	184b421b1f	Show user name in comments	2016-11-09 16:34:23 +00:00
James Allen	b44f1cde10	Add user data into changes	2016-11-09 16:23:08 +00:00
Paulo Reis	19241e571f	Distinguish between inserts and deletes in the entries repeater.	2016-11-09 15:58:03 +00:00
James Allen	c5532bd8a3	Add cancel buttons for comments	2016-11-09 15:51:40 +00:00
James Allen	6d7f4e9e6a	Add basic comment replying	2016-11-09 15:25:41 +00:00
James Allen	707ed43a7d	Very crude adding of comments	2016-11-09 14:50:58 +00:00
Shane Kilkelly	c3860dd7a7	Remove stray commented-out code, use mapSeries instead of map.	2016-11-09 14:36:25 +00:00
James Allen	446ca7212a	Track timestamps of changes	2016-11-09 12:19:48 +00:00
Shane Kilkelly	f6de4cbb44	Merge branch 'master' into sk-sessions-cluster	2016-11-09 12:10:46 +00:00
Shane Kilkelly	5f3098df38	Replace multi-ops with Async.series, tests passing	2016-11-09 11:03:03 +00:00
James Allen	064ae1945a	Toggle review panel and track changes with ui elements	2016-11-08 16:43:01 +00:00
Shane Kilkelly	bfa0e7cf89	WIP: start moving web sessions to cluster	2016-11-08 15:32:36 +00:00
Henry Oswald	d556cbaacf	Merge pull request #361 from djwf/master ... Pass ignoreTLS option to nodemailer	2016-11-08 11:26:42 +00:00
Brian Gough	6f41dddb42	disable spell check for anonymous users ... these requests always fail	2016-11-04 16:03:18 +00:00
Brian Gough	307f08e6bb	Merge pull request #363 from sharelatex/bg-lock-editor-when-connection-down ... lock editor when connection down	2016-11-04 11:04:30 +00:00
Brian Gough	49a06f8489	modal for lost connection	2016-11-03 12:37:44 +00:00
James Allen	091eb7e462	Merge branch 'master' into ja-review-panel ... Conflicts: public/coffee/ide.coffee public/stylesheets/app/editor.less	2016-11-03 10:07:37 +00:00
David J. Weller-Fahy	5efee51ed8	Pass ignoreTLS option to nodemailer	2016-11-02 13:14:54 -04:00
Paulo Reis	559350eaa2	Avoid showing the history upgrade teaser when user is not the project owner.	2016-11-02 16:08:47 +00:00
Shane Kilkelly	e7b09a81a7	Merge branch 'sk-passport-ldap'	2016-11-02 15:39:32 +00:00
Paulo Jorge Reis	74d8fb103b	Merge pull request #358 from sharelatex/pr-latex-linter-onboarding ... Code-checker onboarding	2016-11-02 13:58:06 +00:00
Henry Oswald	fde9ab60cc	remove left-menu-upgraed-rotation ab test	2016-11-02 10:24:03 +00:00
Henry Oswald	11a097c9a6	remove some old sixpack tests	2016-11-02 10:09:12 +00:00
Shane Kilkelly	a63f7685b8	Move the planCode logic for Collaborator into a helper function.	2016-11-02 09:56:33 +00:00
Paulo Reis	c18114bfeb	Different strategy for highlighting the code-check setting.	2016-11-01 17:30:27 +00:00
Paulo Reis	840d52ef1a	Remove default value from user model, but add it upon creation (i.e. affecting new users).	2016-11-01 16:36:26 +00:00
Paulo Reis	8c182c2ccd	Show code-check option for non-beta users.	2016-11-01 15:26:26 +00:00
Brian Gough	585f8681ea	enable syntax validation for all users ... (by defining aceWorker)	2016-11-01 15:02:32 +00:00
Shane Kilkelly	9cb3d8c4b8	Enable hook from module into passport init.	2016-11-01 14:06:54 +00:00
Paulo Reis	06629e05d4	Include teaser media and do some style adjustments.	2016-11-01 11:36:21 +00:00
Paulo Reis	aa58b70d43	Improve visibility logic.	2016-10-31 20:18:08 +00:00
James Allen	8368577867	Merge branch 'master' into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade public/coffee/ide.coffee public/coffee/ide/editor/directives/aceEditor.coffee	2016-10-31 16:42:55 +00:00
Paulo Reis	97b92928dc	Merge branch 'master' into pr-latex-linter-onboarding	2016-10-28 16:36:10 +01:00
Paulo Reis	4721fd450c	Improve condition to avoid linking sixpack directives when project loads.	2016-10-28 14:40:04 +01:00
Paulo Reis	8157f68393	Avoid linking sixpack directives when project loads.	2016-10-28 14:23:16 +01:00
Shane Kilkelly	5c8cdd22cc	Merge branch 'sk-account-delete-pass'	2016-10-28 11:02:41 +01:00
Shane Kilkelly	6e6211bde6	Merge branch 'sk-plain-text-emails-all'	2016-10-28 11:02:33 +01:00
Shane Kilkelly	4c092e7ff1	Remove deprecated "projectSharedWithYou" email.	2016-10-28 10:37:10 +01:00
Shane Kilkelly	164c8a091f	Move the scripts block after jQuery has been loaded and CDN logic. ... Fixes issue on the update-billing-info page.	2016-10-28 10:18:20 +01:00
Shane Kilkelly	751a116921	add plainTextTemplate to all emails	2016-10-27 14:41:13 +01:00
Paulo Reis	1c4183e7b1	Merge branch 'master' into pr-ab-test-history-teaser	2016-10-27 12:35:11 +01:00
Paulo Reis	5dddbec5b2	Add AB test conversion.	2016-10-27 12:06:36 +01:00
Paulo Reis	991626692b	Track subscriptions in metabase with AB test variant.	2016-10-27 12:05:32 +01:00
Paulo Reis	5a82cebcff	Make the history teaser message look like a modal.	2016-10-27 11:12:22 +01:00
Paulo Reis	04f8b3adfa	Adapt mark-up to history teaser, add some styles.	2016-10-27 10:30:10 +01:00
Shane Kilkelly	1538f140f3	update test timestamp	2016-10-27 09:41:51 +01:00
Paulo Reis	b5494c1730	Basic test mark-up structure.	2016-10-26 15:48:03 +01:00
Shane Kilkelly	dfd13e0815	Update AB test timestamp	2016-10-26 14:24:00 +01:00
Shane Kilkelly	d912c3b487	Merge branch 'master' into sk-plans-tidy	2016-10-26 13:47:26 +01:00
Shane Kilkelly	dc62b1a86e	Remove deprecated endpoint for old delete-user	2016-10-26 11:18:36 +01:00
Paulo Reis	70c7880639	Style adjustments.	2016-10-26 11:12:34 +01:00
Shane Kilkelly	7cc26f2207	Disable autocomplete on user-delete form	2016-10-26 10:57:54 +01:00
Shane Kilkelly	fc7bd4c2d3	fix logging	2016-10-26 10:57:34 +01:00
Shane Kilkelly	1c8721ceab	Functioning account deletion with password	2016-10-25 16:23:50 +01:00
Brian Gough	baf09e4f3a	avoid exception in LoggerSerializers	2016-10-25 15:50:05 +01:00
Brian Gough	bb06b97b3c	avoid exception in logging null user	2016-10-25 15:01:59 +01:00
Paulo Reis	f4849201aa	Merge branch 'master' into pr-latex-linter-onboarding	2016-10-25 15:00:26 +01:00
Shane Kilkelly	efe6df145c	WIP: ask for password when deleting account	2016-10-25 14:33:47 +01:00
Brian Gough	3519fbe337	add worker-latex.js to fingerprints	2016-10-25 14:18:37 +01:00
Brian Gough	a02d245b78	added missing dependency on ace/ace for modelist	2016-10-25 14:16:52 +01:00
Brian Gough	d6333d2955	Merge pull request #346 from sharelatex/bg-use-ace-mode-detection ... use ace mode detection	2016-10-25 13:54:05 +01:00
Shane Kilkelly	6069d4dba3	Merge branch 'master' into sk-plans-tidy	2016-10-25 13:14:44 +01:00
Shane Kilkelly	e268275e77	Fix participate/convert flow for plan tests	2016-10-25 10:47:14 +01:00
Paulo Reis	27dfa91683	Add dismiss button.	2016-10-24 12:20:15 +01:00
Shane Kilkelly	667c7ce520	Show correct number of collaborators for plans	2016-10-24 11:47:01 +01:00
Shane Kilkelly	c051b56abf	Cloak plans until they have loaded	2016-10-24 11:24:28 +01:00
Henry Oswald	450946212a	log out health check failures	2016-10-21 18:59:28 +01:00
Shane Kilkelly	8c1d110688	Remove debug logs	2016-10-21 16:21:21 +01:00
Shane Kilkelly	d5a7514923	Add AB test for plans (+15 squashed commits) ... Squashed commits: [45c2237] Add a `subscription-form-switch-to-student` event [1ad9b8f] change experiment name, and re-enable switch-to-student workflow [f7cdb78] Remove debug [4b9778a] Incorporate collaborator alternative plans [701e80b] Add collaborator plans for heron and ibis [287aa0f] AB test plans from editor page [c74052e] Fix change-plan view for default plans [1a947d6] Use correct plan codes [1eecda7] Adjust prices [69c4c7b] Introduce two plans [8b8d5f8] Rename sixpack experiment [c332002] Fix up the change-plan page [c7af52d] Overhaul change-plan page, show only plans from current generation [33d86bf] update plan [5bbd946] Add a basic plans AB test	2016-10-21 16:17:37 +01:00
Paulo Reis	4d33b11ce5	Restrict the appearance of the onboarding view.	2016-10-21 15:00:52 +01:00
Paulo Reis	777b28b443	Add animation and other styling items. Small refactor with Less vars.	2016-10-21 12:02:53 +01:00
Paulo Reis	ac07ba035b	Navigation in onboarding UI.	2016-10-20 16:39:43 +01:00
Brian Gough	7258e947a8	use ace modelist extension to auto-detect mode	2016-10-20 16:03:19 +01:00
James Allen	8f9a4882c8	Don't let widgets in review panel overlap	2016-10-20 15:04:10 +01:00
Paulo Reis	e60f67dacb	Bootstrapping.	2016-10-20 12:24:07 +01:00
James Allen	2b94c69795	Don't use the trackChanges engine in the history editor panel	2016-10-20 12:19:57 +01:00
James Allen	e717caab7f	Merge branch 'master' into ja-review-panel	2016-10-18 16:52:41 +01:00
Henry Oswald	1beca53b3d	project name should be clickable href in invite email	2016-10-18 15:53:56 +01:00
Brian Gough	cf09a9ed83	Merge pull request #344 from sharelatex/bg-upgrade-pdfjs ... upgrade pdfjs	2016-10-14 17:03:13 +01:00
Henry Oswald	a02da61cb0	fixed email sender tests looking for wrong settings	2016-10-14 16:43:59 +01:00
Brian Gough	991486ab60	make html valid (div not allowed in p tag)	2016-10-13 16:10:02 +01:00
Brian Gough	0bd36a9e3b	fix comment	2016-10-13 16:10:02 +01:00
Brian Gough	27a8dc1dfd	upgrade pdfjs to 1.6.210p1	2016-10-13 16:10:01 +01:00
James Allen	4999ed30f8	Merge branch 'master' into ja-review-panel	2016-10-13 14:22:43 +01:00
James Allen	7a4bebd785	Allow review panel to be toggled	2016-10-13 14:22:23 +01:00
Henry Oswald	bfeb7e082f	added textEncoding option for email	2016-10-13 14:22:08 +01:00
James Allen	fc782581ea	Change review panel to feel like part of ace	2016-10-12 17:27:20 +01:00
Shane Kilkelly	3ec0e65ae1	Merge branch 'master' into sk-end-subform-test	2016-10-12 14:34:55 +01:00
James Allen	c689937297	Merge pull request #338 from sharelatex/ja-track-changes ... Ja track changes	2016-10-12 09:21:46 +01:00
Shane Kilkelly	e706057677	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-10-11 14:44:09 +01:00
Shane Kilkelly	8fcc58495e	Use a new key for the delete-account warning	2016-10-11 14:34:30 +01:00
Brian Gough	380487abf0	use separate jade template block for requirejs ... removes the need to suppressDefaultJs	2016-10-11 14:31:04 +01:00
James Allen	4ac55c7671	Merge branch 'ja-track-changes' into ja-review-panel	2016-10-11 14:24:51 +01:00
James Allen	e9c8fc7c20	Add in review panel layout	2016-10-11 14:24:01 +01:00
Shane Kilkelly	e2cf40ff33	Remove old default subscription form, replace with 'simple' form	2016-10-11 14:07:31 +01:00
Brian Gough	0f2959eb3b	use suppressDefaultJs instead of suppressFooter	2016-10-11 13:04:10 +01:00
Brian Gough	b9ecfcf41f	provide minimal requirejs config	2016-10-11 13:02:30 +01:00
James Allen	9682af3981	Merge branch 'master' into ja-track-changes ... Conflicts: public/coffee/ide/history/HistoryManager.coffee	2016-10-10 17:10:10 +01:00
James Allen	1c9abd35f8	Rename track-changes -> history on the client ... Conflicts: app/views/project/editor/history.jade	2016-10-10 16:59:25 +01:00
Henry Oswald	65e48652ee	don't add second slash into uni redirect	2016-10-10 15:36:12 +01:00
Henry Oswald	adc6b429e6	record when a subscription is canceled	2016-10-10 15:29:54 +01:00
Henry Oswald	92e3101d81	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-10-10 15:29:06 +01:00
Shane Kilkelly	c4fd9f3bce	Merge branch 'master' into sk-session-button	2016-10-10 14:49:55 +01:00
Shane Kilkelly	9d3baf488f	Use the query operator for existence check	2016-10-10 13:28:03 +01:00
Shane Kilkelly	a722646040	Remove un-used module	2016-10-10 11:05:14 +01:00
Henry Oswald	101896a754	redirect to /i/ university	2016-10-07 17:10:58 +01:00
Shane Kilkelly	25dd998107	clear-sessions page (+4 squashed commits) ... Squashed commits: [3a56af0] Remove cruft [c5a1f6c] Finalise alignment [82f741a] Working sessions page [d40f069] WIP: display sessions	2016-10-07 16:47:00 +01:00
Brian Gough	d2db6663e5	Merge pull request #335 from sharelatex/bg-ace-syntax-validator ... add ace syntax validator with latex parsing	2016-10-07 15:05:34 +01:00
Brian Gough	2d1a0b34d5	Merge pull request #333 from sharelatex/support-package-versions ... Support package versions	2016-10-07 15:04:59 +01:00
Shane Kilkelly	894c549ec6	WIP: display sessions on a page	2016-10-06 15:49:47 +01:00
Brian Gough	8c7d712738	update live version of ace to 1.2.5	2016-10-06 14:20:23 +01:00
Brian Gough	9177544ed9	add left menu for syntax validator	2016-10-06 11:51:24 +01:00
Brian Gough	0946729ae6	clean up config object	2016-10-05 14:54:42 +01:00
Brian Gough	837151a395	include moment in package versions	2016-10-05 14:54:42 +01:00
Brian Gough	8b6425317f	introduce PackageVersions module ... put all package versions in one central place	2016-10-05 14:54:42 +01:00
Shane Kilkelly	95a66bbf00	Merge pull request #328 from sharelatex/sk-plain-text-email ... Sk plain text email	2016-10-05 10:04:08 +01:00
Henry Oswald	3141f91b59	Merge pull request #322 from sharelatex/ho-password-limits ... Ho password limits	2016-10-05 10:03:54 +01:00
Paulo Reis	ef1aab1c27	Track header AB conversions only on click events.	2016-10-04 14:42:01 +01:00
Shane Kilkelly	e699fcb1fa	Add plain-text component to the project-invite email	2016-10-03 15:25:38 +01:00
Shane Kilkelly	b42a3b9188	Fix logging typo	2016-10-03 15:25:18 +01:00
James Allen	901e32a050	Merge pull request #326 from sharelatex/ho-fingerprintmultiple ... Ho fingerprintmultiple	2016-09-28 09:58:03 +01:00
Paulo Jorge Reis	cef367fde2	Merge pull request #325 from sharelatex/pr-ab-test-labels ... AB test labels	2016-09-28 09:02:15 +01:00
Henry Oswald	4f3b57ceeb	cleaned up comments	2016-09-27 16:23:40 +01:00
Henry Oswald	a00cb707cc	fingerprints are grouped into lists with this change ... fingerprints are shared when require.js pulls in other resources. this change means changes to either ace.js or mode-latex.js will result in different fingerprints for those files.	2016-09-27 16:21:04 +01:00
Paulo Reis	b6d237e189	More granular tracking, in metabase.	2016-09-27 16:01:56 +01:00
Paulo Reis	38d04e27c9	Restrict AB test to newly registered users.	2016-09-27 11:50:34 +01:00
Henry Oswald	6141eb4a44	null check user_id	2016-09-26 17:25:11 +01:00
Paulo Reis	6ccf7288e6	Register conversions.	2016-09-26 16:18:37 +01:00
Paulo Reis	d97313d22c	Horizontal layout.	2016-09-26 16:09:27 +01:00
Paulo Reis	9208fe7c30	Basic mark-up for AB testing labels.	2016-09-26 15:02:54 +01:00
Henry Oswald	8558ce1f75	improve error handling in update merger	2016-09-26 13:57:57 +01:00
Shane Kilkelly	fb6f6c13c9	Merge branch 'master' into sk-passport	2016-09-26 09:43:19 +01:00
Brian Gough	bba6008e4d	Merge pull request #321 from sharelatex/ace-syntax-validator-minimal-change ... Ace syntax validator minimal change	2016-09-26 09:25:50 +01:00
Shane Kilkelly	ab4916067e	Merge branch 'master' into sk-passport	2016-09-26 09:18:24 +01:00
Shane Kilkelly	dd14e51713	Handle null, undefined and false in isUserLoggedIn	2016-09-23 16:53:07 +01:00
Henry Oswald	8a2b7d0461	server side protect passwords which are too long	2016-09-23 16:51:46 +01:00
Henry Oswald	0d0f0e8604	wip	2016-09-23 16:38:46 +01:00
Shane Kilkelly	f9030a0a38	get user_id directly	2016-09-23 16:25:23 +01:00
Shane Kilkelly	7384a08cb4	Pass req to function.	2016-09-23 16:21:07 +01:00
Henry Oswald	67f8ec756c	Revert "wip" ... This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.	2016-09-23 16:19:11 +01:00
Henry Oswald	7c0e338352	fix bug where users are always shown downgrade option when not required	2016-09-23 16:18:22 +01:00
Henry Oswald	5c2fbaafd3	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-09-23 15:45:42 +01:00
Henry Oswald	0802ab6ddc	wip	2016-09-23 15:44:47 +01:00
Brian Gough	4f9826c87b	show beta program link for everyone on /settings	2016-09-23 15:28:15 +01:00
Brian Gough	0eaa359f6c	use syntax validator for beta programme users only	2016-09-23 15:19:40 +01:00
Brian Gough	0a350c8e3f	infrastructure for using ace syntax checking	2016-09-23 15:19:40 +01:00
Shane Kilkelly	02587377a2	Remove ReferalMiddleware, dead code.	2016-09-23 14:42:57 +01:00
Shane Kilkelly	72ca1d6316	Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee	2016-09-23 10:01:11 +01:00
James Allen	2b317cab6c	Merge pull request #320 from sharelatex/ja-validate-filenames ... Don't allow files to be created with / or * characters	2016-09-23 09:42:48 +01:00
James Allen	e15976be21	Use token in URL to force its precense when invite and allow easy dynamic notifications	2016-09-22 17:24:06 +01:00
Shane Kilkelly	dbac4bd008	update session when user settings change	2016-09-22 16:58:25 +01:00
Shane Kilkelly	636b1fe9e2	Copy to session.user, for compatibility	2016-09-22 15:49:09 +01:00
Shane Kilkelly	a0f156e1a9	wipe out more session access	2016-09-22 15:33:50 +01:00
Shane Kilkelly	ff1c72ee14	Fix up more session access	2016-09-22 14:30:34 +01:00
Shane Kilkelly	c959e0c65d	Set req.user	2016-09-22 13:54:13 +01:00
Shane Kilkelly	6df569253a	Fix session touch	2016-09-22 13:48:09 +01:00
Shane Kilkelly	3b73d97931	Use getLoggedInUserId	2016-09-22 11:33:38 +01:00
Shane Kilkelly	64c9a3ae18	Fix logic, was wrong way around	2016-09-22 11:16:50 +01:00
James Allen	4386ab1225	Don't allow files to be created with / or * characters ... Requires the following translations: "files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters", "invalid_file_name": "Invalid File Name"	2016-09-21 16:31:55 +01:00
Shane Kilkelly	c12450f533	Merge branch 'master' into sk-passport	2016-09-21 13:17:54 +01:00
Shane Kilkelly	dde5b7b830	Regenerate session on login, protect against session-fixation attack.	2016-09-21 13:03:37 +01:00
James Allen	d904e50041	Make project invite notification dynamic and accept via ajax request ... Needs translations: "joining": "Joining", "notification_project_invite_message": "<b>{{ userName }}</b> would like you to join <b>{{ projectName }}</b>", "notification_project_invite_accepted_message": "You've joined <b>{{ projectName }}</b>", "open_project": "Open Project"	2016-09-21 11:59:35 +01:00
James Allen	a93c939dbc	Send invite email and notification in the background	2016-09-21 10:11:35 +01:00
Shane Kilkelly	bb71433727	Remove getLoggedInUser	2016-09-21 09:27:51 +01:00
Shane Kilkelly	eca1dfa482	Remove dead code	2016-09-21 09:27:35 +01:00
James Allen	c2e14ded13	Add null checks for fileRefs and docs, which are not present when calling mkdirp	2016-09-20 16:55:12 +01:00
Henry Oswald	1a67e4982e	change blog regex to look for src's which start with a slash	2016-09-20 15:43:36 +01:00
Henry Oswald	21ca9697ca	log user_id not user	2016-09-20 15:11:14 +01:00
Henry Oswald	777cbf1c80	move comment for user is false next to if statment	2016-09-20 14:51:51 +01:00
Henry Oswald	d4863ae148	don't use cdn for blog posts which have a http on them	2016-09-20 14:48:35 +01:00
Shane Kilkelly	4eada48638	Merge branch 'master' into sk-passport	2016-09-19 15:40:25 +01:00
James Allen	0917fe10ca	Return type when finding element by path so that we don't need a heuristic	2016-09-19 14:35:25 +01:00
Brian Gough	ebe3ba4fb8	Merge pull request #316 from sharelatex/pdfjs-font-patch ... Pdfjs font patch	2016-09-19 11:24:50 +01:00
Brian Gough	64dc1784d3	switch to patched version of pdfjs	2016-09-19 11:15:27 +01:00
Shane Kilkelly	97a6ac0f00	Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Authorization/AuthorizationMiddlewear.coffee	2016-09-15 14:48:51 +01:00
Shane Kilkelly	2119dcbb58	Finalise login workflow, works with login form again.	2016-09-15 14:36:11 +01:00
James Allen	06d67835e4	Don't redirect Google to nocdn=true, and remove canonical URL until we sort out translated domains	2016-09-15 10:21:12 +01:00
James Allen	c9a17982cf	Add canonical url tag and don't include query string	2016-09-14 17:08:26 +01:00
James Allen	9019b20d50	Preserve line formatting in word count error message	2016-09-14 11:21:00 +01:00
James Allen	53b3e3831d	Update cancellation survey link	2016-09-14 10:51:19 +01:00
James Allen	a45aa7b80e	Show word count error messages	2016-09-13 15:54:25 +01:00
James Allen	cc9791d3f4	Redirect to login with a redirect back to the page we want if not logged in	2016-09-13 11:23:47 +01:00
James Allen	1714b014bf	Force true or false for userHasNoSubscription, not blank	2016-09-13 10:29:14 +01:00
Shane Kilkelly	438ac45854	fix unit tests	2016-09-07 16:40:49 +01:00
Shane Kilkelly	8e0103a1bc	wip: fix unit tests for AuthenticationController	2016-09-07 14:05:51 +01:00
Shane Kilkelly	cc5ddc92bb	use getSessionUser rather than getLoggedInUser	2016-09-07 10:30:58 +01:00
Shane Kilkelly	9758dd77b3	kill whitespace	2016-09-07 08:58:57 +01:00
Shane Kilkelly	3a5b3a8e8d	wip: acceptance tests working	2016-09-06 15:55:34 +01:00
Shane Kilkelly	b0a10c948c	wip refactor	2016-09-06 15:22:13 +01:00
Paulo Reis	afdded702b	Use an object instead of a string, to avoid writing to another scope.	2016-09-06 14:59:18 +01:00
Shane Kilkelly	749658a916	WIP: fixing acceptance tests	2016-09-06 13:21:22 +01:00
Shane Kilkelly	6aef092dce	fix typo	2016-09-06 09:29:58 +01:00
Shane Kilkelly	eca4c46f7f	WIP: refactor	2016-09-05 16:23:37 +01:00
Shane Kilkelly	ab2c1e82fb	WIP: refactor	2016-09-05 15:58:31 +01:00
Shane Kilkelly	e6c7aa25ec	barely functional login and logout	2016-09-05 10:28:47 +01:00
Shane Kilkelly	51e987b3b6	Merge branch 'master' into sk-passport	2016-09-02 16:29:07 +01:00
Brian Gough	ab2fe1de97	fix unclosed brace in template	2016-09-02 16:20:16 +01:00
Shane Kilkelly	e4f4325150	Basic passport integration	2016-09-02 16:17:37 +01:00
Henry Oswald	8002930270	don't use mathjax for cdn	2016-09-01 13:51:50 +01:00
Brian Gough	1592ca7623	Merge pull request #309 from sharelatex/fix-compile-check ... clean up compile check	2016-08-31 16:27:36 +01:00
Brian Gough	e82411ac79	clear serverid on every compile check	2016-08-31 16:10:24 +01:00
Henry Oswald	bbb319f235	Merge pull request #307 from sharelatex/pr-empty-proj-list-dropdown ... Empty project list dropdown	2016-08-31 15:47:30 +01:00
Brian Gough	b95a2c6d04	clean up compile check ... use a valid user id, report all failures as errors, clear timeout on success	2016-08-31 15:21:23 +01:00
Paulo Jorge Reis	70adae7a5b	Merge pull request #308 from sharelatex/pr-hide-sign-up-plans-page ... Hide "sign up" button in plans page, if user is logged in	2016-08-31 14:12:39 +01:00
Shane Kilkelly	1d83524853	Add a <code> block to autocomplete_references. ... Use unescaped interpolation.	2016-08-31 13:54:51 +01:00
Shane Kilkelly	f849bf6d4c	Add Autocomplete descriptions to hotkeys	2016-08-31 13:31:04 +01:00
Paulo Reis	bba39cc902	Also hide button, when viewing student plans.	2016-08-31 11:40:27 +01:00
Shane Kilkelly	47b1a5099a	Better logging when plan is null.	2016-08-31 10:40:30 +01:00
Shane Kilkelly	f59d5d836d	Check plan, return error if not valid. ... This prevents a crash later when we refer to properties of the plan object, which can end up being `null` when the `planCode` is either missing, or not a valid code.	2016-08-31 10:18:53 +01:00
Shane Kilkelly	1b29e0e8ec	Merge branch 'master' of github.com:sharelatex/web-sharelatex ... # Conflicts: # app/coffee/Features/Notifications/NotificationsBuilder.coffee	2016-08-31 09:48:19 +01:00
Henry Oswald	960ed520b6	fix notifications builder @key bug	2016-08-31 09:42:43 +01:00
Shane Kilkelly	1399ee4689	Fix reference to @key in log expression.	2016-08-31 09:34:20 +01:00
Paulo Reis	09c188030c	Hide sign up button via visibility, to keep the layout fixed.	2016-08-30 17:42:23 +01:00
Brian Gough	c44f33ce99	allow negative values for synctex positions	2016-08-30 16:45:21 +01:00
Paulo Reis	8c7b9edd21	Remove AB-related logic from template and controller.	2016-08-30 16:10:04 +01:00
Paulo Reis	e3fe4a2eeb	Rename empty projects list file, do some clean-up.	2016-08-30 16:07:31 +01:00
Paulo Reis	2885164748	Isolate create project dropdown styles, to avoid influencing other dropdowns.	2016-08-30 15:32:23 +01:00
Shane Kilkelly	4a76fcd13b	Change first param of getMemberSubscriptions to user_or_id, to match semantics of usage. ... This function works whether a user object, or an ObjectId is passed, but the `user_id` param name is confusing.	2016-08-30 14:26:57 +01:00
Henry Oswald	cbb4ee88cc	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-08-30 13:08:09 +01:00
Henry Oswald	ddc0023c64	make forceCreate the default for creating notifications	2016-08-30 13:07:37 +01:00
Henry Oswald	8c18153d5c	Merge pull request #304 from sharelatex/ho-jade-speedup ... Ho jade speedup	2016-08-30 12:47:08 +01:00
Brian Gough	16e4577ffa	Merge pull request #306 from sharelatex/compile-check ... Compile check	2016-08-30 11:58:04 +01:00
Brian Gough	3c59de31df	finalise display of syntax check error message	2016-08-26 15:14:57 +01:00
Brian Gough	696a7206c1	clean up display of error message	2016-08-25 16:55:29 +01:00
Brian Gough	9a1934465a	clean up syntax check options on menu	2016-08-25 15:51:56 +01:00
Henry Oswald	26a4076c22	add redirect to /i/university for ab test	2016-08-25 10:48:29 +01:00
Brian Gough	74bc157e7c	added force recompile option	2016-08-24 16:48:37 +01:00
Paulo Reis	c82ab65077	Bind to an object to avoid writing in different .	2016-08-24 11:02:53 +01:00
Paulo Jorge Reis	f4aab93dfa	Merge pull request #303 from sharelatex/pr-ab-subscription-form ... PR AB Subscription form	2016-08-24 09:45:36 +01:00
Henry Oswald	3f4e888af5	Merge pull request #305 from sharelatex/cdnfallback ... don't use cdn if it can not be accessed	2016-08-24 09:45:14 +01:00
Henry Oswald	934e908697	just use plain req.ip for logging	2016-08-23 17:00:13 +01:00
Henry Oswald	fcc7585444	put jquery as first script in head tag	2016-08-23 16:58:39 +01:00
Henry Oswald	f8799334ec	Merge branch 'master' into ho-jade-speedup	2016-08-23 15:35:04 +01:00
Henry Oswald	114dbf9f3f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-08-23 15:34:55 +01:00
Henry Oswald	d3ebdb64b2	precompile the jade partial views	2016-08-23 15:31:09 +01:00
Paulo Reis	ba71ed2a3d	Merge branch 'master' into pr-ab-subscription-form	2016-08-23 14:10:19 +01:00
Paulo Reis	8abf839d55	Add country to the paypal form.	2016-08-23 13:36:54 +01:00
Paulo Reis	bc16999a4e	Validate on blur; reset validation on focus.	2016-08-23 11:55:23 +01:00
Paulo Reis	f79bee7893	Loading indicator when submitting.	2016-08-23 11:27:09 +01:00
James Allen	bcc8bfbe6c	Redirect to working update billing details end point that shows a nice message	2016-08-22 17:36:33 +01:00
Paulo Reis	23ed1e2aa3	Add form validation.	2016-08-22 17:03:29 +01:00
Paulo Reis	2f93a102fd	Fix layout to support scrollable messages.	2016-08-22 16:12:29 +01:00
Paulo Reis	a9095ccde8	Disable filter which wraps long words, still buggy.	2016-08-22 14:54:07 +01:00
Shane Kilkelly	11ec486c13	Merge pull request #300 from sharelatex/pr-subscription-improvements ... Pr subscription improvements	2016-08-22 11:08:18 +01:00
Shane Kilkelly	03aa9b87f1	Add debug query string origin to invocations of the updateSubscription endpoint.	2016-08-22 10:09:54 +01:00
Henry Oswald	130fece0f6	track when users accept invites	2016-08-19 18:33:03 +01:00
Paulo Reis	92bc411df5	Merge branch 'pr-ab-subscription-form' of github.com:sharelatex/web-sharelatex into pr-ab-subscription-form	2016-08-19 16:48:33 +01:00
Paulo Reis	f4b8cc7fc8	Use first and last name instead of full name as input.	2016-08-19 16:46:44 +01:00
Paulo Reis	53c6e48da9	Remove left-hand panel experiment.	2016-08-19 16:03:15 +01:00
Henry Oswald	110820face	use url.resolve to build url for freegeoip lookups	2016-08-19 15:40:54 +01:00
Henry Oswald	50b3403983	use url.resolve to build url for freegeoip lookups	2016-08-19 15:39:58 +01:00
Paulo Reis	6a1f0de912	Add i18n keys.	2016-08-19 15:12:05 +01:00
Paulo Reis	452abe94be	Add coupon code, VAT and pricing breakdown. Styling adjustments.	2016-08-19 14:51:07 +01:00
Henry Oswald	d8e7bacec4	added logging in	2016-08-19 11:53:40 +01:00
Shane Kilkelly	c02854c9d8	Improve log messages	2016-08-19 11:52:50 +01:00
Shane Kilkelly	07cd75cd64	Add an expect404 option to apiRequest. ... Suppress error generation when 404 response is encountered.	2016-08-19 11:52:04 +01:00
Henry Oswald	3d36dc7d6c	mvp for not using cdn when blocked	2016-08-19 11:05:35 +01:00
James Allen	c653f59705	Add error handling to mkdir_p	2016-08-18 17:48:33 +01:00
Paulo Reis	26e21732f8	Added validations + minor fixes.	2016-08-18 17:41:55 +01:00
Paulo Reis	43b832965f	Layout and styling for simple subscription form.	2016-08-18 16:56:23 +01:00
Shane Kilkelly	4a6df04c21	Merge branch 'master' into pr-subscription-improvements	2016-08-18 12:53:56 +01:00
Paulo Reis	4814fc2606	Simple layout for subscription form.	2016-08-17 17:34:17 +01:00
Shane Kilkelly	ece0491e3d	Refactor. Handle republishing of notifications on resend.	2016-08-17 16:27:15 +01:00
Paulo Reis	672d4f8767	Setup AB test (alternative is still empty).	2016-08-17 12:11:17 +01:00
Shane Kilkelly	85f49d6c9c	Make whole 'red button' in email a link	2016-08-17 10:37:44 +01:00
Shane Kilkelly	c98e473bc3	Fix layout of notifications	2016-08-17 10:31:05 +01:00
Shane Kilkelly	4805c96584	Merge branch 'master' into pr-email-tokens	2016-08-17 08:52:24 +01:00
Shane Kilkelly	fc068b62a2	defend against undefined plan_code	2016-08-17 08:51:35 +01:00
Shane Kilkelly	81d0edf716	Improve error handling	2016-08-16 15:19:36 +01:00
Shane Kilkelly	ce78b855a3	Add counts to log message	2016-08-16 11:33:14 +01:00
Shane Kilkelly	da40f54d55	Improve logging, add acceptance tests for joinProject json	2016-08-16 11:17:45 +01:00
Shane Kilkelly	b68af254ff	Correct logic for bailing out with no privileges	2016-08-16 09:59:42 +01:00
Brian Gough	7fcae775ee	Merge pull request #297 from sharelatex/roll-out-chktex ... Roll out chktex	2016-08-16 09:48:01 +01:00
Shane Kilkelly	d2183738c5	Improve logging for debugging	2016-08-16 09:04:11 +01:00
Brian Gough	8d6cdb03e8	restrict compile check options ... allowed options are validate/error/silent validate = only run chktex, exit status 0 error = run compilation, exit(1) if chktex fails silent = run chktex, but always do full compilation	2016-08-15 16:46:53 +01:00
Shane Kilkelly	36d969e6e6	Set invites to be an empty array if missing	2016-08-15 15:22:23 +01:00
Shane Kilkelly	158afbb157	Merge branch 'master' into pr-email-tokens ... Conflicts: app/coffee/Features/Notifications/NotificationsBuilder.coffee public/coffee/ide/share/controllers/ShareController.coffee	2016-08-15 10:29:21 +01:00
Shane Kilkelly	f92767f7b5	Address feedback, add ? checks where appropriate	2016-08-12 15:26:20 +01:00
Shane Kilkelly	e53394919f	Rework how invite expiry functions.	2016-08-12 14:40:59 +01:00
Shane Kilkelly	d547bff4e5	Blur the resend button after response	2016-08-12 11:25:03 +01:00
Shane Kilkelly	a7bc8bffe0	Update markAsReadByKeyOnly url.	2016-08-12 09:59:25 +01:00
Shane Kilkelly	a9042ff324	Enable enter key on share dialog button	2016-08-11 15:24:35 +01:00
Shane Kilkelly	ce039f8cd3	Remove the email when user id is added to project	2016-08-11 14:17:01 +01:00
Paulo Reis	9bf9df9a4a	Track login events.	2016-08-11 14:09:45 +01:00
Shane Kilkelly	826295167f	Mark Notification as read by key alone	2016-08-11 14:04:11 +01:00
Brian Gough	9a399d3dd3	move "run syntax check" compile option out of beta	2016-08-11 13:55:47 +01:00
Brian Gough	a862592138	added syntax check to beta page, removed mendeley	2016-08-11 13:43:33 +01:00
Paulo Reis	6a210978fe	Track registration events.	2016-08-11 12:29:58 +01:00
James Allen	0270d34d0f	Use JSONB not JSON column type	2016-08-11 10:19:07 +01:00
Paulo Reis	b405b4dce6	Remove Countly integration.	2016-08-10 17:34:32 +01:00
James Allen	4886e8ba0e	Rename metadata -> segmentation in Events table to play well with metabase	2016-08-10 17:22:35 +01:00
James Allen	056bb6b0f4	Use a JSON column for metadata	2016-08-10 17:17:59 +01:00
James Allen	93cd511211	Send events to custom DB backend	2016-08-10 16:42:56 +01:00
Brian Gough	abcfb2dd16	Merge pull request #290 from sharelatex/enable-chktex ... Enable chktex	2016-08-10 11:49:31 +01:00
Shane Kilkelly	0e0ccb41ff	cancel notification when accepting invite	2016-08-08 13:57:33 +01:00
Shane Kilkelly	110082390e	Test the _trySendInviteNotfification helper	2016-08-08 10:34:54 +01:00
Shane Kilkelly	e0444cfc62	Make notification column layout explicit.	2016-08-05 16:41:11 +01:00
Shane Kilkelly	9b46c1b1f7	WIP: notification when user is sent an invite	2016-08-05 16:11:03 +01:00
Shane Kilkelly	eafd61a90e	Refresh members and invites in client when status changes	2016-08-05 14:01:08 +01:00
Shane Kilkelly	8f7603c324	Add an endpoint to access project members	2016-08-04 16:47:48 +01:00
Shane Kilkelly	092c036406	Rate-limit calls to invite api	2016-08-04 09:50:47 +01:00
Paulo Jorge Reis	60f8e577a8	Merge pull request #293 from sharelatex/pr-wrap-long-words-chat ... Wrap long words chat	2016-08-03 16:32:36 +01:00
Shane Kilkelly	721ea88bd0	If email is already invited, resend the invite	2016-08-03 16:30:34 +01:00
Brian Gough	42388f8b76	fix missing space in pdf jade template	2016-08-03 16:30:33 +01:00
Brian Gough	7ce406dd38	switch the compile dropdown menu to left, to avoid overflow into editor	2016-08-03 16:30:18 +01:00
Brian Gough	4d3629e5db	add beta feature badge to syntax check	2016-08-03 16:29:46 +01:00
Paulo Reis	73f115fc57	Add i18n keys.	2016-08-03 16:09:45 +01:00
Paulo Reis	cf5c8e27e1	UI fix - do not allow multiple clicks to restore a deleted file.	2016-08-03 16:05:19 +01:00
Shane Kilkelly	a5ddcc3df7	Allow resending of invites	2016-08-03 15:42:19 +01:00
Shane Kilkelly	e7251aab53	Small wording changes	2016-08-03 14:06:08 +01:00
Paulo Reis	e6898d64c9	Track hovering of header features.	2016-08-03 12:17:19 +01:00
Shane Kilkelly	8cb93511df	Update UI of share modal	2016-08-03 11:55:24 +01:00
Shane Kilkelly	6ea690225f	Refactor view-invite to not use model calls.	2016-08-03 10:23:34 +01:00
Henry Oswald	892511820e	fix logging on groupPlan invite notification	2016-08-02 17:09:42 +01:00
Shane Kilkelly	3a3688d3d0	Include invites count in canAddXCollaborators	2016-08-02 15:42:50 +01:00
Shane Kilkelly	2494026b85	Move Helpers/EmailHelpers to Helpers/EmailHelper	2016-08-02 15:42:26 +01:00
Henry Oswald	418d1c56da	nullcheck qqfile on upload files	2016-08-02 15:36:59 +01:00
Henry Oswald	928777b61c	add null check to redis return value for getValueFromTokenAndExpire	2016-08-02 15:34:44 +01:00
Henry Oswald	2ad0bab976	use underscore.each so it doesn’t blow up on non array.	2016-08-02 15:33:41 +01:00
Brian Gough	38f76b305b	change message to "Run syntax check"	2016-08-02 14:43:09 +01:00
Shane Kilkelly	13fe000176	Move email parsing code to Helpers/EmailHelpers	2016-08-02 14:30:42 +01:00
Shane Kilkelly	abbd059eae	Refactor to existing addUserIdToProject function	2016-08-02 13:51:00 +01:00
Shane Kilkelly	63f8fe453a	Use UserGetter rather than User model	2016-08-02 09:48:09 +01:00
Shane Kilkelly	dca1c9be5d	Load invites on project load, rather than asynchronously.	2016-08-01 17:05:37 +01:00
Paulo Reis	ff62e50530	Integrate word wrapping filter in the chat component.	2016-08-01 16:42:54 +01:00
Shane Kilkelly	291a26595c	Remove referal id from invite email link	2016-08-01 15:56:07 +01:00
Brian Gough	e508f7b8a9	don't try to display a log hint link if there isn't one	2016-07-29 15:11:34 +01:00
Brian Gough	0742db7732	enable validation option only for beta programme users	2016-07-29 15:11:34 +01:00
Brian Gough	5da1b90418	use validate as keyword for syntax checks	2016-07-29 14:59:48 +01:00
Brian Gough	ef85f1014c	add menu option for checking with chktex	2016-07-29 14:59:48 +01:00
Brian Gough	e0d5075fdb	include check option when compiling	2016-07-29 14:59:48 +01:00
Shane Kilkelly	f3a1f32bb1	Test the invalid-invite page	2016-07-29 11:54:08 +01:00
Shane Kilkelly	563247044b	Start testing the invite page	2016-07-29 09:52:55 +01:00
Shane Kilkelly	9c6195fbec	Factor out link builder	2016-07-28 15:59:59 +01:00
Shane Kilkelly	7b18f88145	Merge branch 'master' into pr-email-tokens	2016-07-28 14:53:36 +01:00
Shane Kilkelly	ed65e16e54	If user is member of project, redirect to project. ... Leave invite in place to expire naturally.	2016-07-28 11:15:11 +01:00
Shane Kilkelly	1cb9c3582d	Don't return early if user is already member.	2016-07-28 09:47:07 +01:00
Shane Kilkelly	e70f121461	Correct name of expireAfterSeconds index	2016-07-27 15:55:31 +01:00
Shane Kilkelly	62d544ccfc	Redirect to project if user is already member. ... If invite is missing, and current user is already a member of the project, then just redirect to the project page	2016-07-27 15:28:22 +01:00
Paulo Reis	f4d78a856c	Disable page view and session tracking.	2016-07-27 14:20:39 +01:00
Shane Kilkelly	46ec17f2c4	Add redir query string to login link	2016-07-27 13:51:52 +01:00
Shane Kilkelly	e1af171534	Add a dot to end of sentence.	2016-07-27 11:07:26 +01:00
Shane Kilkelly	6f39813a56	Add translations	2016-07-27 10:56:22 +01:00
Shane Kilkelly	78948251a1	Change the Close button color	2016-07-27 10:28:01 +01:00
Shane Kilkelly	827629a74a	Invalid-invite page, and re-jigg the share modal	2016-07-27 10:10:44 +01:00
Paulo Reis	6d0779b8f8	Add forgotten name attribute.	2016-07-26 14:47:48 +01:00
Paulo Reis	ab305ea07e	Merge branch 'master' into pr-log-hints-negative-feedback	2016-07-26 14:27:15 +01:00
Shane Kilkelly	6162c5ec60	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-26 14:23:08 +01:00
Shane Kilkelly	e46901a21b	Send an empty keys array when there is no data	2016-07-26 14:23:00 +01:00
Shane Kilkelly	855cc28483	Finish adding project and owner details to the accept-invite page	2016-07-26 14:14:14 +01:00
Paulo Reis	a3ee3134b1	Support for i18n.	2016-07-26 11:56:15 +01:00
Shane Kilkelly	2dede5f793	WIP: Working "accept invite" page	2016-07-26 11:46:41 +01:00
Paulo Reis	bfe3e160c9	Integrate with UI.	2016-07-26 11:37:51 +01:00
Henry Oswald	81744e4301	use cdn for blog	2016-07-26 11:11:28 +01:00
Shane Kilkelly	41755212f0	Update the register page with new message	2016-07-26 09:06:21 +01:00
Shane Kilkelly	b898c62e91	Add appropriate query strings to the end of invite link	2016-07-25 16:14:41 +01:00
Paulo Reis	32b57f228c	Integrate feedback UI with wufoo service.	2016-07-25 16:12:56 +01:00
Shane Kilkelly	16dcbe2cd4	WIP: wire up share-modal frontend to invite system	2016-07-25 15:07:14 +01:00
Shane Kilkelly	b3add65de1	Start integrating invites into share frontend	2016-07-25 14:27:02 +01:00
Shane Kilkelly	73fed8b0bf	Add a getAllInvites api endpoint	2016-07-25 11:17:47 +01:00
Shane Kilkelly	5438f39f9e	Start testing acceptInvite	2016-07-25 09:58:08 +01:00
Shane Kilkelly	78a410c39d	Remove expiresAt logic from acceptInvite	2016-07-25 09:07:47 +01:00
Paulo Reis	37eb6252d2	Rewording + animation when shown the feedback panel.	2016-07-22 16:33:19 +01:00
Shane Kilkelly	78570817d5	Render a separate template if the invite is not found.	2016-07-22 16:28:00 +01:00
Shane Kilkelly	9e0c44573a	Remove expiresAt, use mongo TTL instead.	2016-07-22 16:08:56 +01:00
Shane Kilkelly	b201f1a37a	Test getInviteByToken.	2016-07-22 14:21:34 +01:00
Paulo Reis	b6cd6c2d7d	UI logic to show or hide the negative feedback panel.	2016-07-22 14:14:58 +01:00
Henry Oswald	8492ea7d28	Merge pull request #285 from sharelatex/file-path-checks ... add file path check on element names	2016-07-22 13:54:05 +01:00
Henry Oswald	f7a0860f0b	Merge pull request #286 from sharelatex/ha-editor-close ... fix close editor button	2016-07-22 13:49:26 +01:00
Paulo Reis	54eadf3256	Add textarea for 'other' feedback + styles.	2016-07-22 12:20:26 +01:00
Paulo Reis	95db6ba934	Basic mark-up for the extra log hint feedback.	2016-07-22 11:56:45 +01:00
Shane Kilkelly	9fba98cd45	Accept invite, and start testing the invite handler.	2016-07-22 11:38:00 +01:00
Shane Kilkelly	1139444790	add token to body of acceptInvite action.	2016-07-22 09:27:00 +01:00
Henry Oswald	ef6eefe1b1	add comment not to fingerprint worker	2016-07-22 09:05:39 +01:00
Henry Oswald	c7a3de45bb	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-07-22 09:05:14 +01:00
Henry Oswald	3029fb6335	add dark host option and don’t load pdfjs worker via cdn	2016-07-21 19:06:53 +01:00
Paulo Jorge Reis	50ad3a107f	Merge pull request #287 from sharelatex/pr-highlight-biblio-search ... A|B test for bib search pop-up	2016-07-21 17:06:59 +01:00
Paulo Reis	6a46b46cf4	Expose sign-up date as an user attribute in the editor.	2016-07-21 16:42:22 +01:00
Shane Kilkelly	546517db90	revokeInvite and getInviteByToken functions.	2016-07-21 16:19:15 +01:00
Shane Kilkelly	d9c6df0e47	start adding the ProjectInvite workflow.	2016-07-21 15:56:41 +01:00
Henry Oswald	6aca798a45	don’t use cdn on dark	2016-07-21 15:34:23 +01:00
Shane Kilkelly	e0562a2301	Update ProjectInvite model	2016-07-21 14:20:09 +01:00
Shane Kilkelly	3311b43644	more tests for invite controller	2016-07-21 13:31:54 +01:00
Shane Kilkelly	23a9aadba5	start tests for invite controller	2016-07-21 10:08:22 +01:00
Shane Kilkelly	c3e51dd773	Revert "copy helper functions from CollaboratorsHandler" ... This reverts commit 0d5acd7bade584e4ff119dc22e5d5d3b3175dae2.	2016-07-21 09:50:52 +01:00
Shane Kilkelly	049cced4fd	copy helper functions from CollaboratorsHandler	2016-07-21 09:42:37 +01:00
Henry Oswald	ad60268707	clean up vars for buildjs path and change default to cdn.sharelatex.dev:3000	2016-07-21 09:38:24 +01:00
Shane Kilkelly	0f2600b198	finish out skeleton of invite controller	2016-07-21 09:32:14 +01:00
Shane Kilkelly	f7c2fa37ab	Fill out getInviteByToken	2016-07-20 16:44:22 +01:00
Henry Oswald	e27d5ce969	use Url for lib name	2016-07-20 16:10:33 +01:00
Henry Oswald	97b42478d1	don’t fingerprint sentry	2016-07-20 16:03:01 +01:00
Shane Kilkelly	0dc4e2c0c1	Merge branch 'master' into pr-email-tokens	2016-07-20 15:23:37 +01:00
Shane Kilkelly	5b22be8a0b	Further scaffolding	2016-07-20 15:22:48 +01:00
Henry Oswald	e8aad2abb1	don’t fingerprint main.js and ide.js	2016-07-20 15:17:01 +01:00
Henry Oswald	596fc2525b	simplified buildJSPath	2016-07-20 14:48:58 +01:00
Henry Oswald	a3e40adbaf	Merge pull request #283 from sharelatex/ho-cdn ... Ho cdn	2016-07-20 14:19:37 +01:00
Shane Kilkelly	a4c7db5f20	skeleton of inviteToProject function	2016-07-20 14:14:56 +01:00
Shane Kilkelly	e383e49161	Add CollaboratorsInviteController and routes	2016-07-20 14:04:14 +01:00
Henry Oswald	6c78ab4ace	got requirejs working nicely with cdn	2016-07-20 12:58:32 +01:00
Henry Oswald	b589ab388f	fix close editor button ... - only evaulate close on web router, not api/static assets - allow /admin pages to still be available	2016-07-19 17:15:20 +01:00
Henry Oswald	f8c38f30a8	got build js path working with mathjax	2016-07-19 15:41:33 +01:00
Brian Gough	13d6448ab8	Merge pull request #284 from sharelatex/fix-synctex-subdir-path ... work around for synctex paths containing /./	2016-07-19 12:24:31 +01:00
Brian Gough	a93efde1ae	add file path check on element names	2016-07-19 11:58:10 +01:00
Henry Oswald	0cbd9d0ff9	use url.resolve to adding https:// part	2016-07-19 11:41:36 +01:00
Shane Kilkelly	4e1df9f476	Fix wording of userHasSubscription to userHasNoSubscription	2016-07-19 11:37:58 +01:00
Shane Kilkelly	3aea3a68d1	Check the truth of subscription.customAccount, rather than definition.	2016-07-19 10:28:43 +01:00
Shane Kilkelly	effc3727be	Don’t show upgrade prompts for users with custom subscription accounts. ... Set `hasValidSubscription` to true if user subscription is custom.	2016-07-19 10:15:45 +01:00
Henry Oswald	a2a8b7123b	created buildCssPath img and js path funcs	2016-07-18 17:18:51 +01:00
Brian Gough	1d74e6750c	work around for synctex paths containing /./	2016-07-18 17:00:34 +01:00
James Allen	62a444082d	Add in /dev/csrf endpoint for easy automated testing	2016-07-18 16:47:54 +01:00
Henry Oswald	715ffcfbf2	changed ordering on static assets path, just tidying.	2016-07-18 16:24:48 +01:00
Brian Gough	a3c97533ae	Merge pull request #281 from sharelatex/stop-compile ... add support for stopping compile	2016-07-18 15:01:26 +01:00
Brian Gough	ded9bcaa11	remove unwanted styling on 'stop compile' button	2016-07-18 15:00:16 +01:00
Henry Oswald	c21549220c	mvp for cdn	2016-07-18 14:05:07 +01:00
Brian Gough	92d41dd74e	added comment for per-user route to top-level directory	2016-07-18 11:16:09 +01:00
Brian Gough	5a02e8c656	add support for stopping compile	2016-07-15 16:28:52 +01:00
Henry Oswald	0576380811	allow placeholder for sharing project to be changed	2016-07-14 11:40:32 +01:00
Paulo Reis	c23091da94	Always set feature flags, if available.	2016-07-14 11:07:10 +01:00
Paulo Reis	ab995671fc	Namespace feature flags.	2016-07-14 10:10:14 +01:00
Paulo Reis	5d5bc57535	Add user name.	2016-07-14 09:55:11 +01:00
Paulo Reis	fee22db567	Refactor user blocks into a single script tag.	2016-07-14 09:47:25 +01:00
Paulo Reis	a261de9eb1	Set feature flags.	2016-07-14 09:37:04 +01:00
Paulo Reis	68906cb0c5	Avoid unneeded change_id event; id can be set as a Countly property, before initializing.	2016-07-13 16:29:53 +01:00
Henry Oswald	713f2110c1	use translations for title and meta description (google)	2016-07-12 14:25:25 +01:00
Paulo Reis	1e62ce679b	Make 'knowledge base' a link to the KB index page.	2016-07-12 11:44:48 +01:00
Paulo Reis	785bf1b5a2	New key for the message label.	2016-07-11 16:24:06 +01:00
Paulo Reis	af93ac4413	Track suggestions usage.	2016-07-11 14:27:07 +01:00
Paulo Reis	9ef78b4bc2	Merge branch 'master' into pr-contact-form-suggestions	2016-07-11 13:54:06 +01:00
Paulo Reis	7eafa5ca3f	Make Countly server configurable via settings.	2016-07-11 11:02:52 +01:00
Henry Oswald	94d760e32d	import bootstrap font awseome via less not html	2016-07-10 11:10:43 +01:00
Paulo Reis	444120f8b1	Merge branch 'master' into pr-contact-form-suggestions	2016-07-08 13:55:08 +01:00
Shane Kilkelly	0e9beb5653	remove daft redundancy.	2016-07-07 09:42:01 +01:00
Shane Kilkelly	896cbb5f4c	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-07 09:35:53 +01:00
Shane Kilkelly	9e35bdcaea	Refactor: add ? suffix to truth tests.	2016-07-07 09:35:44 +01:00
Paulo Jorge Reis	efacd9e7f2	Merge pull request #267 from sharelatex/pr-log-dropdown ... "Other logs & files" dropdown / dropup	2016-07-06 16:06:10 +01:00
Shane Kilkelly	21eb104928	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-06 15:39:12 +01:00
Shane Kilkelly	dda0841af3	Return early if there are no keys to delete	2016-07-06 15:39:03 +01:00
Paulo Reis	b867c37d49	Merge branch 'master' into pr-log-dropdown	2016-07-06 15:35:28 +01:00
Paulo Jorge Reis	59065395ef	Merge pull request #273 from sharelatex/pr-countly-integration ... Countly integration	2016-07-06 15:00:47 +01:00
Paulo Reis	7a3d3d3ffd	Make Countly track by internal ids.	2016-07-06 14:44:28 +01:00
Paulo Reis	8e2475afdc	Track hints feedback in both GA and Countly; clean-up.	2016-07-06 14:24:50 +01:00
Shane Kilkelly	fc6cf75ad5	Merge branch 'master' into sk-session-revocation	2016-07-06 13:19:15 +01:00
Paulo Reis	5c121a5f05	Track user log in and sign up.	2016-07-06 12:12:54 +01:00
Paulo Reis	7e1c1f7414	Remove heap integration.	2016-07-06 12:12:22 +01:00
Paulo Reis	c9b1faa1a1	Add user info to correlate with events.	2016-07-06 11:59:33 +01:00
Paulo Reis	909f7c15b5	Track log-related actions.	2016-07-05 16:27:14 +01:00
Paulo Reis	d5efe81a46	Track recompiles.	2016-07-05 16:02:46 +01:00
Shane Kilkelly	3f1a47eccb	map the 'retain' values to session ids	2016-07-05 14:54:26 +01:00
Shane Kilkelly	5b9903551a	add an array of session ids to retain.	2016-07-05 14:20:47 +01:00
Shane Kilkelly	6e282ab308	clear sessions on password reset	2016-07-05 14:19:59 +01:00
Paulo Reis	fac3698c40	Better namespacing of sprite CSS classes.	2016-07-05 11:08:58 +01:00
Paulo Reis	7dd1906eaf	Initial Countly integration.	2016-07-04 16:51:31 +01:00
Shane Kilkelly	df0a7bc547	test the _checkSessions function.	2016-07-04 14:04:10 +01:00
Shane Kilkelly	2ae2e6ed4f	Test trackSession	2016-07-04 10:37:01 +01:00
Shane Kilkelly	a869c99c60	Begin testing UserSessionsManager.	2016-07-04 10:05:34 +01:00
Shane Kilkelly	5a1af9a5f3	check sessions on login and logout.	2016-07-04 09:27:38 +01:00
Paulo Reis	11f198d970	Merge branch 'master' into sprites	2016-07-01 16:27:09 +01:00
Paulo Reis	4f49a25639	Use a figure element instead of an img, as there is no src attribute.	2016-07-01 16:02:01 +01:00
Shane Kilkelly	6f20f565fe	Add early-return guards	2016-07-01 15:55:50 +01:00
Shane Kilkelly	0ac9b05d02	Add ip_address and session_created to the session user object.	2016-07-01 15:49:07 +01:00
Shane Kilkelly	f1653d01b7	Refactor method names in UserSessionsManager	2016-07-01 15:33:59 +01:00
Henry Oswald	6f4a7f4779	mvp for using sprites for flags, needs border removing	2016-07-01 15:04:39 +01:00
Shane Kilkelly	6938f1d055	No need to build extra string	2016-07-01 15:04:13 +01:00
Shane Kilkelly	8855d0fa0f	Clear out sessions	2016-07-01 13:38:13 +01:00
Shane Kilkelly	5ae0aeaf94	Fix logging.	2016-07-01 13:37:56 +01:00
Shane Kilkelly	d8ffa5b4b1	set expiry on the user sessions set.	2016-07-01 11:24:46 +01:00
Shane Kilkelly	88bef5c5ea	Add revokeAllSessions handler, when password is reset	2016-07-01 09:51:22 +01:00
Brian Gough	ea942fe255	Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers ... remove scaffolding for per-user compiles so that it is always by default	2016-06-30 15:16:28 +01:00
Brian Gough	c04e00026b	remove scaffolding for per-user compiles so that it is always by default	2016-06-30 14:43:03 +01:00
James Allen	882e28a811	Don't choke on null projects	2016-06-30 14:30:04 +01:00
James Allen	b76cc7e314	Remove a user from being a collaborator when their account is deleted	2016-06-30 14:21:44 +01:00
James Allen	a0fcc7e3ed	Skip null user objects when getting collaborators	2016-06-30 13:56:21 +01:00
Paulo Reis	c5f53ef431	Track log hints feedback.	2016-06-30 11:30:30 +01:00
Henry Oswald	000c862ae1	return 404 if blog returns 403, caused by file not existing	2016-06-29 15:36:33 +01:00
Shane Kilkelly	03fedafaf5	save the session key string, rather than just the id	2016-06-29 15:12:12 +01:00
Paulo Reis	72d498c6c8	Merge branch 'master' into pr-contact-form-suggestions	2016-06-29 11:58:07 +01:00
Shane Kilkelly	db213c0621	Begin keeping record of user sessions in reds.	2016-06-29 11:35:25 +01:00
Henry Oswald	8f14526354	added custom footer in email option	2016-06-28 17:07:27 +01:00
Henry Oswald	88fb955884	hook notifications handler up to make request which doesn't make request if url not set	2016-06-28 16:52:27 +01:00
Paulo Reis	a6d184358f	Avoid inline-styles.	2016-06-28 15:51:50 +01:00
Paulo Reis	88564ea126	Dynamically determine if the files dropdown should drop up or drop down.	2016-06-28 15:48:11 +01:00
Shane Kilkelly	9e16f250f9	Merge branch 'sk-subscription-address'	2016-06-28 14:16:34 +01:00
Shane Kilkelly	6581bc4ecf	set postal_code as zip	2016-06-28 14:15:47 +01:00
Shane Kilkelly	465d09dcfe	Test the createSubscription action (+4 squashed commits) ... Squashed commits: [fc9c8f9] Add tests for createBillingInfo [db9f90e] Test the createSubscription stage [c17151d] Check that userExists gets set [1367c96] Act on buddy-check feedback	2016-06-28 13:59:52 +01:00
Paulo Reis	616fd5daf6	Merge branch 'master' into pr-ui-feedback-error-nav	2016-06-28 10:50:23 +01:00
Paulo Reis	d6067b86ac	Merge branch 'master' into pr-ui-feedback-error-nav	2016-06-28 10:49:55 +01:00
Brian Gough	2b23e13619	Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds ... use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-28 10:49:33 +01:00
Henry Oswald	b8b833b753	moved wiki into module	2016-06-28 10:16:02 +01:00
Shane Kilkelly	709f8f2bea	start testing the paypal workflow.	2016-06-27 16:34:00 +01:00
Paulo Reis	3580d8377f	Merge branch 'master' into pr-contact-form-suggestions	2016-06-27 15:39:00 +01:00
Paulo Reis	d7f67e7931	Integrate translations.	2016-06-27 15:38:13 +01:00
Shane Kilkelly	401565ba23	Fix references to the RecurlyWrapper object.	2016-06-27 12:14:43 +01:00
Paulo Reis	81b93ab5a9	Disable links to the docs when the wiki is not available.	2016-06-27 11:34:24 +01:00
Shane Kilkelly	9938787e4a	fix a few silly issues. Appears to work now	2016-06-27 10:38:10 +01:00
Shane Kilkelly	72c73809f6	Generate address xml from object.	2016-06-27 09:44:40 +01:00
Paulo Reis	c82f4481e4	Show search results.	2016-06-24 17:10:18 +01:00
Paulo Reis	f427ce88d9	Better Jade syntax.	2016-06-24 16:37:35 +01:00
Paulo Reis	dfc375adf8	Add more feedback on :hover.	2016-06-24 15:55:19 +01:00
Henry Oswald	9888d6631a	don't error if references is not enabled	2016-06-24 15:46:37 +01:00
Henry Oswald	6e59a10fb3	added more null checks for potential undefined notifications	2016-06-24 15:23:57 +01:00
Paulo Reis	c376c807d7	Forgotten href attribute.	2016-06-24 15:22:34 +01:00
Henry Oswald	51df3825e5	add null check on notifications handler	2016-06-24 15:11:22 +01:00
Henry Oswald	8d79b37651	return from _doIndexOperation if referneces is not setup eailer	2016-06-24 15:07:28 +01:00
Shane Kilkelly	026e9f46c8	WIP: process appears to work, setting address correctly	2016-06-24 15:03:46 +01:00
Shane Kilkelly	56bc840b88	WIP: fix up error handling and account for possibility of account already existing.	2016-06-24 14:11:28 +01:00
Paulo Reis	a33aeca9c3	Merge branch 'pr-latex-hints-improvements'	2016-06-24 14:07:57 +01:00
Henry Oswald	3887db8898	don't call notifications if notifications has no url	2016-06-24 14:06:04 +01:00
Paulo Reis	b4de353828	Merge branch 'master' into pr-latex-hints-improvements	2016-06-24 14:02:55 +01:00
Henry Oswald	9a3e621c9c	stripe off errors and kb from page titles	2016-06-24 13:15:22 +01:00
Paulo Reis	5f7ffb5a8c	Make hint card area non-clickable.	2016-06-24 12:12:45 +01:00
Paulo Reis	e4a1443d1d	Better handling of whitespace.	2016-06-24 12:07:02 +01:00
Shane Kilkelly	249381b6a8	WIP: initial work on sending address to recurly for paypal subscriptions	2016-06-24 11:42:58 +01:00
Paulo Reis	a587d5ddba	Set up model options.	2016-06-24 11:02:29 +01:00
Henry Oswald	d294117286	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-23 16:40:22 +01:00
Henry Oswald	5371669f89	if references has no url don't send post, silently return	2016-06-23 16:39:54 +01:00
Paulo Reis	f62a45444d	Prototype mark-up and styles.	2016-06-23 12:08:13 +01:00
Shane Kilkelly	cbdcc874e3	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-22 11:03:32 +01:00
James Allen	b693ced843	Merge pull request #263 from sharelatex/pr-human-readable-logs ... Human readable logs	2016-06-21 14:28:06 +01:00
Paulo Reis	ed659fd973	Minor UI improvements.	2016-06-21 14:20:23 +01:00
Shane Kilkelly	6f07ea513e	Remove DataJoy link from the project page.	2016-06-21 13:28:08 +01:00
Henry Oswald	5800c88d80	Merge branch 'ha_custom_image_logo'	2016-06-21 12:07:49 +01:00
Paulo Reis	e607de0b91	Safety checks for non-existing values; avoid rendering the hint template when there is no hint.	2016-06-21 12:07:47 +01:00
Paulo Reis	d8e0026bc6	Add class to enable per-hint feedback tracking.	2016-06-20 17:32:57 +01:00
Paulo Reis	fe53083afd	Show thank you note after receiving feedback.	2016-06-20 15:04:47 +01:00
Paulo Reis	baea017adb	Better mark-up for analytics tracking.	2016-06-20 14:59:30 +01:00
Paulo Reis	a8976fd4dc	Use plain links instead of buttons.	2016-06-20 14:42:36 +01:00
Paulo Reis	ada018263a	Merge branch 'master' into pr-human-readable-logs	2016-06-20 11:54:56 +01:00
Paulo Reis	1893ae68a9	Add feedback widget for log hints.	2016-06-20 11:53:10 +01:00
Paulo Reis	605bb07ba3	Hint card styling.	2016-06-20 09:45:14 +01:00
Henry Oswald	fe11a4d835	include sentry below the fold	2016-06-18 12:29:52 +01:00
Henry Oswald	d2e4e22511	health checks should be on api router with no sessions	2016-06-18 11:58:26 +01:00
Henry Oswald	d27d19e02a	added override for navbar background image	2016-06-17 14:18:52 +01:00
Paulo Reis	2bfe0d0ba9	Basic mark-up for hint card.	2016-06-17 14:16:38 +01:00
Brian Gough	98a0c54004	use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-17 12:22:03 +01:00
Paulo Reis	54d48ce0ea	Support extra info URL in human readable hints.	2016-06-17 11:42:32 +01:00
Paulo Reis	40fda6e361	Support HTML in human readable log messages.	2016-06-16 16:29:19 +01:00
Paulo Reis	9b8d695e43	Match logs against ruleset; show human readable message when appropriate.	2016-06-16 15:53:39 +01:00
Brian Gough	fcd5582e6e	Merge pull request #259 from sharelatex/fix-per-user-containers ... Fix per user containers	2016-06-16 14:12:57 +01:00
Brian Gough	8a0fa1321d	add comments to router, downcase route ... express has case-insensitive routes	2016-06-16 13:59:56 +01:00
Brian Gough	6873c1d972	fix download methods in CompileController	2016-06-16 13:59:24 +01:00
Shane Kilkelly	3e3dd199a0	Add id's to buttons on beta program page	2016-06-16 10:56:16 +01:00
Shane Kilkelly	241d3bfc14	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-16 10:17:47 +01:00
Shane Kilkelly	9919f5f44a	Refactor heap analytics	2016-06-16 10:17:36 +01:00
Henry Oswald	101e98ed83	simpliyfied dashboard & fixed error with leave group shown to group owner ... - always show the manage button if you are the group owne - only show the recurly subscription part if you are the subscription owner - always try and loop through groups you can leave	2016-06-16 09:17:43 +01:00
Shane Kilkelly	5ce0100371	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-16 08:50:15 +01:00
Henry Oswald	7dad0427e8	fixed logger in notifications builder	2016-06-15 17:40:54 +01:00
Shane Kilkelly	c8302e090f	Merge branch 'master' into sk-heap-analytics	2016-06-15 15:35:47 +01:00
Shane Kilkelly	522ac8b59b	initial port of heap code from DJ into sharelatex.	2016-06-15 15:35:03 +01:00
Paulo Reis	e891a47a9e	Better support for larger text in keyboard tooltips.	2016-06-15 15:27:30 +01:00
Henry Oswald	a5abc7392d	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-15 14:45:28 +01:00
Henry Oswald	8a9a65a80a	fix the download and compile endpoint used by zip	2016-06-15 14:45:05 +01:00
Paulo Reis	d7e4009504	Small styling enhancements.	2016-06-15 10:48:40 +01:00
Paulo Reis	3310a3ea3f	Change tooltip copy; get it from i18n catalogue.	2016-06-14 17:20:16 +01:00
Paulo Reis	a9e0185098	Added tooltip with keyboard shortcut in the recompile button.	2016-06-14 17:02:22 +01:00
Brian Gough	830d15136d	fix missing variables in pdf sync	2016-06-14 08:49:08 +01:00
Henry Oswald	f9fdec8a15	whitelist /user/activate for non public access	2016-06-13 15:24:41 +01:00
Henry Oswald	84db5ec23a	added logging and default calback	2016-06-13 13:38:30 +01:00
Henry Oswald	f3e48e332b	explicit call to UserCreator.createNewUser	2016-06-13 13:38:17 +01:00
Henry Oswald	3bc3153490	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-13 13:24:04 +01:00
Henry Oswald	c52af1393e	should be able to set first and last name via user details on registration	2016-06-13 13:21:44 +01:00
Brian Gough	49a7c3c27b	Merge branch 'per-user-containers-part-2' ... Conflicts: app/coffee/Features/Compile/ClsiManager.coffee app/coffee/Features/Compile/CompileController.coffee app/coffee/Features/Compile/CompileManager.coffee	2016-06-13 12:24:48 +01:00
Brian Gough	e6dcce21fd	use build_id and user_id instead of build and user	2016-06-10 12:11:47 +01:00
Brian Gough	8bc5f53562	Merge pull request #253 from sharelatex/per-user-containers-part-1 ... Per user containers part 1	2016-06-10 09:40:00 +01:00
Brian Gough	47574d7c7e	Merge pull request #252 from sharelatex/per-user-containers-part-0 ... Per user containers part 0	2016-06-08 15:55:17 +01:00
Shane Kilkelly	ad6e9e039d	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-08 15:31:24 +01:00
Shane Kilkelly	6ca2e2204b	If user is in beta program, show link to opt-out page on the settings page.	2016-06-08 15:31:14 +01:00
Shane Kilkelly	8f1fec8c4f	Add opt-out action to beta page	2016-06-08 15:11:39 +01:00
Brian Gough	6c244eb2f4	Merge pull request #251 from sharelatex/fix-download-urls ... fix filename of downloaded pdf files	2016-06-08 14:33:12 +01:00
Shane Kilkelly	58d7d7bf74	Re-work wording of beta opt-in page.	2016-06-08 11:38:14 +01:00
Shane Kilkelly	90dac348ff	refine beta opt-in workflow.	2016-06-08 11:04:44 +01:00
Shane Kilkelly	20485cbfed	Merge branch 'sk-beta-program'	2016-06-08 10:34:03 +01:00
Shane Kilkelly	009fa79589	remove trailing parens.	2016-06-08 10:33:21 +01:00
Shane Kilkelly	0dfd80d307	Use css to add the beta symbol to the beta-label	2016-06-07 14:04:02 +01:00
Shane Kilkelly	2598661c4c	Use correct title for Beta Opt-in page	2016-06-07 13:42:06 +01:00
Shane Kilkelly	618d3ee269	fix missing require	2016-06-07 13:41:50 +01:00
Shane Kilkelly	d8f1e8ec93	Add basic BetaProgram feature.	2016-06-07 11:15:56 +01:00
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	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	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	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
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	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	36ba88297b	Don't hang request in the event of a spelling backend error	2016-05-24 15:11:14 +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
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
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	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	5df5ba868c	Fix logic for showing error or loading message.	2016-05-19 10:02:07 +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	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	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
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
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	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
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	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
Henry Oswald	424e09ec05	getGroupSubscriptionMemberOf gets plan code	2016-04-05 16:03:46 +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
Henry Oswald	1a651b38f4	added sendgrid as email option	2016-03-29 14:15:33 +01: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	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	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	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	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
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	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	d566ce3fd2	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-03-22 14:38:56 +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
Shane Kilkelly	b8c3b427ee	Merge branch 'sk-pdf-error-display'	2016-03-22 14:00:12 +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	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
Henry Oswald	882297c353	working framework. not happy with groove. Can't set mailbox	2016-03-18 12:55:35 +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
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
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	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	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
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
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
Henry Oswald	bf8f9f6d41	change key to maxEntitiesPerProject	2016-03-09 15:53:03 +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
Henry Oswald	57f00d76bd	get project name on entity move	2016-03-08 14:46:53 +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
James Allen	b64c8e3d78	Delete dead code in User model	2016-03-08 12:07:50 +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
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	8a4a320f4b	done -> close on modal for sharing	2016-03-01 20:17:15 +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
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	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
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	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
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
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
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
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
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
Henry Oswald	735f7bd51e	change res.send to res.sendStatus for new express	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
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
James Allen	e4960e782f	Merge branch 'ja-multi-select'	2016-02-12 11:56:10 +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
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	a6793be3cf	Improve presentation of hotkeys and add bold+italics	2016-02-04 15:52:38 +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
Henry Oswald	9d61a58710	slighly change layout of notifications & insert html via angular	2016-02-04 12:11:45 +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
Henry Oswald	7994528c92	make site licence regex more specific	2016-02-03 16:08:29 +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
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	1f6b43e1b1	added universties site angular controler	2016-02-01 14:33:50 +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	50a451970b	Merge branch 'master' into sk-references-2	2016-01-28 10:06:41 +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
Shane Kilkelly	d1e53f0cb8	Test ReferencesSearchHandler.index	2016-01-26 16:14:17 +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	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	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	41aaefc1f6	Enable pre-indexing of references	2016-01-18 11:41:30 +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	1e904e6ab7	Merge branch 'master' into sk-references-ac	2016-01-13 11:31:58 +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	d9ca9fc06d	Fix comically long lines.	2015-12-31 09:22:35 +00:00
Shane Kilkelly	86d69f3275	Start testing ReferencesSearch.	2015-12-30 15:08:12 +00:00
Henry Oswald	134e733b01	change succesful subscription message	2015-12-21 10:31:22 +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
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	763f16f43c	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-12-12 11:39:54 +00:00
James Allen	e8f21986dd	Refactor registration so it can be called from modules	2015-12-11 17:11:20 +00:00
James Allen	c0dfdb3bd8	Use translations for activation page	2015-12-11 14:25:17 +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	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
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
Henry Oswald	25411189a7	redirect to login if session expired in file upload	2015-12-02 15:40:14 +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	91a84cb232	increase compile throttle limit	2015-11-25 11:07:53 +00:00
Henry Oswald	8ca962b734	added missing convert handler	2015-11-24 14:17:40 +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
Henry Oswald	003cdc01fc	consolidated 2 options in payment left menu	2015-11-18 15:21:48 +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	b1c0dfb0e4	show discount rate on pricing page	2015-11-17 12:23:27 +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	471b285ad7	changed plan choice using ab sixpack not ga	2015-11-16 16:40:14 +00:00
Henry Oswald	f7854649e2	added 20% off option	2015-11-16 15:58:04 +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	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	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
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	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
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	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
Henry Oswald	cf48c94725	rate limit pdf downloads	2015-10-30 11:56:01 +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	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	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	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
Henry Oswald	2f48568f76	fix free trial button on timeout view	2015-10-15 11:38:01 +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	f5162d424f	if a user is inactive for 12 hours disconect them.	2015-10-14 14:28:24 +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
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	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	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	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	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	aab7a8713e	Catch the case where filename is shorter than the extension length.	2015-08-20 15:56:30 +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
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
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	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
James Allen	ec5e03bd01	Fix subscription currency dropdowns	2015-08-04 15:58:31 +01:00
Henry Oswald	53dc0b63c8	v1 of enago	2015-08-04 10:45:19 +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	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
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
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	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	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	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	cad8d8a23b	v1 basic invite works, not pretty or tested	2015-05-22 13:57:15 +01:00
Henry Oswald	f5c39efcac	patched xss hole with messages not setting the content type correctly	2015-05-19 11:04:52 +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	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	f385a7a4b5	open chat links in new window	2015-04-28 16:20:24 +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
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
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
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
Brian Gough	0684fa36fd	upgrade pdfjs to version 1.0.1040	2015-03-31 14:53:27 +01: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	9b8cf7bcfa	Remove public registration and require that a user be registered by an admin	2015-03-19 14:22:48 +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
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
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	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	edc83b905c	remove circular references when reporting to sentry	2015-03-03 16:41:21 +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	0315954b47	Merge branch 'master' into support-cached-pdfs	2015-03-02 09:20:00 +00:00
Brian Gough	5b9f2e8fc1	pass build id through to clsi when requesting pdf	2015-02-26 16:21:44 +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	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	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	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	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	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	8e13ded360	Regenerate the session id after logging in or registering	2015-02-13 11:18:17 +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	b44e9b1dcb	Move template front end code to module	2015-02-10 13:02: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
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	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	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
James Allen	2aa229d145	Add in profiling end point	2015-02-03 11:05:23 +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	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	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	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
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	58750140f4	enable new pdf viewer by default for newly created users	2015-01-21 15:26:01 +00:00
Henry Oswald	90bb12db40	added state to payment form	2015-01-19 20:27:01 +00:00
Henry Oswald	208dfea5c8	pull right the total prices on the payment page	2015-01-19 15:35:05 +00:00
Henry Oswald	00810eaf21	Merge branch 'recurlyv3'	2015-01-19 13:51:02 +00:00
Henry Oswald	17fe30ca0f	sanitise the ref for universities site. and remove unneeded sanitise	2015-01-19 10:49:40 +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	923fbfc574	Correctly handle quote characters in template name when downloading	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	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
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	419d84564c	add support for client-side error logging using sentry	2014-12-12 13:58:07 +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	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	265ad4439c	Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng	2014-12-05 14:43:01 +00:00
Brian Gough	b388c587e5	remove debugging log for pdf featureswitch	2014-12-04 16:42:28 +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	138170be60	pass headers through when proxying request to allow for byte-range/etag handling	2014-12-02 14:53:46 +00:00
Brian Gough	ce8b5dd11c	generate fingerprints for the new pdf.js files	2014-12-01 16:48:40 +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	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
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
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	793763f206	Merge pull request #120 from watercrossing/POSTFix ... Declare forms to use method="POST" explicitly	2014-11-28 11:11:18 +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
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
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
Henry Oswald	bd841b4795	coppied the lock manager over from doc updater	2014-11-25 16:52:27 +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	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	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
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
Henry Oswald	6c746d9aec	added redis health check in	2014-11-19 23:18:20 +00:00
Henry Oswald	cd8c233c05	Revert robust redis connection code	2014-11-19 15:06:05 +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	d6532c63f8	Use new robust subscription model	2014-11-19 11:09:42 +00:00
Ingolf Becker	9d71073a5c	Added more POST declarations	2014-11-17 15:19:11 +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	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	e9232eb197	try catch converting id to object id	2014-11-09 23:08:23 +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	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	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	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	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	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +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
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	8097e6ad71	made 7 day free trial the default	2014-10-21 13:48:46 +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	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
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
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	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
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	accd8207b2	Show password reset expired message rather than server error if that's what has happened	2014-10-08 17:18:24 +01:00
Henry Oswald	c2c29bb282	university site renders via prozy ok	2014-10-08 16:07:44 +01:00
James Allen	8f7dff1518	Don't show empty sync menu list for collaborators	2014-10-08 15:57:56 +01:00
James Allen	3a9d8c2b31	Make Dropbox unlinking consistent with github	2014-10-08 14:02:37 +01:00
James Allen	82dc3cf654	Don't reload module views each request by default	2014-10-08 12:39:36 +01:00
James Allen	128c672edd	Merge branch 'github-sync' ... Conflicts: package.json	2014-10-08 12:13:37 +01:00
James Allen	e406034ad6	Add in Dropbox description	2014-10-07 14:42:03 +01:00
James Allen	dbd85a05f1	Send user features and features switches to views where needed	2014-10-07 13:31:13 +01:00
Henry Oswald	8789a4bde1	server rejects rename of entitys over 150 chars	2014-10-07 11:16:26 +01:00
Henry Oswald	b01b05e49b	server rejects project names over 150 chars	2014-10-07 11:14:02 +01:00
James Allen	6c7c09075c	Treat paths properly in project content update methods	2014-10-03 11:33:18 +01:00
James Allen	10732d112d	Hook module system into project list page	2014-10-03 11:32:59 +01:00
Henry Oswald	b05c6bb001	fixed hiding lang popup in firefox	2014-10-02 17:27:02 +01:00
James Allen	13a96c925b	Add in endpoints to allow updating project files when the project id is know	2014-10-02 14:15:30 +01:00
Henry Oswald	3442786930	fixed template error	2014-09-30 21:52:00 +01:00
Henry Oswald	de6135c777	added missing translations	2014-09-30 11:41:47 +01:00
Henry Oswald	9faf4771e7	added ab test controller so it is always loaded	2014-09-29 17:33:54 +01:00
Henry Oswald	9a97245c01	Merge branch 'redis-sentinal'	2014-09-26 17:40:53 +01:00
Henry Oswald	81307324fc	v2, seems to work...	2014-09-26 17:04:33 +01:00
Henry Oswald	a0174c649b	added a couple of missing translations	2014-09-26 16:35:57 +01:00
Henry Oswald	ca4dc9bf00	added missing translation	2014-09-26 15:04:25 +01:00
Henry Oswald	f73629f8d9	v1 of sentinal support	2014-09-26 14:52:00 +01:00
Henry Oswald	21f46da08a	changed ab test from 30 -> 14 to 14 -> 7	2014-09-26 10:56:45 +01:00
Henry Oswald	d5f816598d	fixed incorrect message showed in pubic modal	2014-09-20 09:20:36 +01:00
Henry Oswald	2376d0a188	added generic error logging	2014-09-18 14:37:23 +01:00
Henry Oswald	9c98e95ca4	send cancelation email after 1 hour	2014-09-16 14:25:12 +01:00
Henry Oswald	6efda9cf1c	push currency default to seperate var	2014-09-11 11:45:00 +01:00
Henry Oswald	20f0c648e5	default to USD	2014-09-11 11:35:39 +01:00
Henry Oswald	583b333a73	change nexted level of templates ng-controller	2014-09-10 15:33:59 +01:00
Henry Oswald	1b02dc72a3	destroy session on dropbox webhook	2014-09-10 14:19:44 +01:00
Henry Oswald	c08a568664	removed session logging	2014-09-10 10:09:25 +01:00
Henry Oswald	d961b48857	imporved logging for session debug	2014-09-10 08:20:36 +01:00
Henry Oswald	bed78665f5	hide the currency dropdown for the moment	2014-09-10 08:17:22 +01:00
Henry Oswald	ca402a3061	added some logging in for sessions	2014-09-08 17:45:37 +01:00
James Allen	e973a66482	Allow client side module code injection	2014-09-08 17:33:30 +01:00
James Allen	db9632f8f2	Allow modules to inject parts of views	2014-09-08 15:40:46 +01:00
James Allen	374c0f3d65	Add existence check for modules dir	2014-09-08 14:23:47 +01:00
James Allen	becb294c5c	Create basic module loading system	2014-09-08 14:19:24 +01:00
Henry Oswald	93b4c5f4f8	thank you page displays the correct currency	2014-09-08 10:59:12 +01:00
Henry Oswald	aee0dda243	added currency to signiture	2014-09-08 10:36:30 +01:00
Henry Oswald	f1372fc449	moved button, not that pretty	2014-09-05 16:11:19 +01:00
Henry Oswald	ff0365c157	change plan has multi currency view	2014-09-05 15:47:08 +01:00
Henry Oswald	08e61efeb6	added some whitespace betten translations	2014-09-05 13:12:23 +01:00
Henry Oswald	08cebe369d	close dropdown on click	2014-09-05 12:16:02 +01:00
Henry Oswald	eeb27062a0	added currency query string param to subscribe button	2014-09-05 11:40:14 +01:00
Henry Oswald	13a667f47a	v1 of multi currency	2014-09-04 19:03:04 +01:00
Henry Oswald	8762297158	touch the session rather than setting the expires, same result	2014-09-04 18:07:31 +01:00
James Allen	971afb7342	Treat large text files as binary	2014-09-04 13:00:51 +01:00
Henry Oswald	c4a379075d	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-09-02 10:49:43 +01:00
Henry Oswald	6a4ddd937b	Merge pull request #104 from watercrossing/fixSpace ... Add missing white space	2014-09-02 10:34:08 +01:00
watercrossing	81b543bbaa	Add space at end of line	2014-09-01 20:14:49 +01:00
Henry Oswald	54b9cdc3e4	new ab framework up and running	2014-09-01 17:48:09 +01:00
Henry Oswald	62f207c368	added basic new a/b test funnely framework	2014-09-01 15:14:08 +01:00
Henry Oswald	f3c04feda7	added a missing templates button back into templates index page	2014-09-01 15:13:37 +01:00
Henry Oswald	03137d4271	made more room for bottom left part of footer as it wraps some time in spanish	2014-08-29 15:29:51 +01:00
Henry Oswald	e740e4913d	if user is already annual tell them so on the annual upgrade page	2014-08-29 14:13:05 +01:00
Henry Oswald	cffcdbae18	fixed formatting $ and %	2014-08-29 13:49:37 +01:00
Henry Oswald	ce3db55624	improved annual plans view	2014-08-29 13:40:35 +01:00
Henry Oswald	e67d3889f9	got better logic and copy for upgrade annual plans, needs i18n next	2014-08-29 12:36:36 +01:00
Henry Oswald	50890af0cf	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-29 12:35:37 +01:00
James Allen	d7e2b19852	Remove your card will charged message since it doesn't apply to free trials	2014-08-29 10:23:11 +01:00
Henry Oswald	350b95a0a5	annual upgrade page works, needs a bit of copy love now	2014-08-28 18:14:31 +01:00
Henry Oswald	f5618e9d9c	added confirm you want to change plan modal ... added page and corisponding endpoint to migrate to annual plan	2014-08-27 17:51:10 +01:00
Henry Oswald	d0d08824da	modal asking users to confirm a change of plan	2014-08-27 13:21:39 +01:00
Henry Oswald	b99e933266	fixed jade formating prob causing console error	2014-08-27 11:09:22 +01:00
Henry Oswald	67fdd73472	fixed template problem with next billing details	2014-08-26 20:18:56 +01:00
Henry Oswald	3b41a6eef4	change spacing on footer due to i18n problems	2014-08-26 16:59:42 +01:00
Henry Oswald	54f083820a	translate footer text	2014-08-26 12:29:27 +01:00
Henry Oswald	97b118c2ac	added in couple of missing translations	2014-08-24 17:12:22 +01:00
Henry Oswald	27b9cad8ca	make ga experiements per page	2014-08-24 17:07:40 +01:00
Henry Oswald	705c282b0a	changed ga injection	2014-08-23 19:02:41 +01:00
James Allen	894024ba29	Don't allow folders to be moved into their child folders	2014-08-22 14:38:52 +01:00
Henry Oswald	c91e95d593	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-22 14:22:12 +01:00
Henry Oswald	6c131b1084	- removed free trial on annual accounts ... - added setting val for google analytics experiments to be added in head - added 14 day free trial variation to plans page	2014-08-22 14:20:39 +01:00
James Allen	0152f42416	Put template settings on client side	2014-08-22 13:10:32 +01:00
James Allen	c8ab1bd394	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-22 12:52:31 +01:00
James Allen	dc5e1f71bd	Remove console.log debug line	2014-08-22 12:52:27 +01:00
James Allen	456d194dbb	Merge branch 'james_tmp'	2014-08-22 12:51:35 +01:00
Henry Oswald	fd8221b869	make it possible to hide a lng	2014-08-21 17:58:25 +01:00
Henry Oswald	4a19d6731a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-21 13:03:54 +01:00
Henry Oswald	9bcf979e8a	changed title for restricted to use translations key	2014-08-21 13:03:51 +01:00
Henry Oswald	b9372e6dcd	added key for your projects	2014-08-21 13:02:28 +01:00
James Allen	e234d7831a	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-21 13:01:34 +01:00
James Allen	f093c99b96	Remove deprecated background dropbox polling logic	2014-08-21 13:01:27 +01:00
Henry Oswald	e144f9c19a	changed key for profile complete	2014-08-21 12:48:55 +01:00
Henry Oswald	dd8ca9ca0e	changed key Actions -> actions	2014-08-21 12:45:19 +01:00
Henry Oswald	daec56359f	rename != delete tooltip	2014-08-21 04:41:06 +01:00
Henry Oswald	04e50f8ba6	changed cookie name from hard coded to be config option, defaults to sharelatex.sid	2014-08-20 18:01:21 +01:00
James Allen	c4b91de8e8	Layout templates in rows of four	2014-08-20 14:58:01 +01:00
James Allen	d0eee7a1e5	Refactor template settings	2014-08-20 14:47:27 +01:00
Henry Oswald	c51c0c1cf2	fixed misconfig translate string	2014-08-20 14:40:27 +01:00
Henry Oswald	3cd43ddd86	found sneaky missing translations	2014-08-20 14:31:44 +01:00
Henry Oswald	8d51fcc457	hide translations notification on editor page	2014-08-20 14:08:59 +01:00
Henry Oswald	21f288fbe5	missed off few tooltips in translation	2014-08-20 13:47:45 +01:00
Henry Oswald	8e4974d559	fix more escaping html	2014-08-20 12:45:29 +01:00
Henry Oswald	c1c46a36b9	render html of bonus page para	2014-08-20 08:14:36 +01:00
James Allen	156c6ec4b6	Add PDF viewer label in	2014-08-19 14:40:10 +01:00
Henry Oswald	ca5b1e7422	cleaned up smoke tests	2014-08-19 14:35:20 +01:00
Henry Oswald	83d8c48dc6	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-19 11:20:06 +01:00
Henry Oswald	523694c4ff	changed smoke tests to work with curl ... this was needed as there is a bug with request/tough cookie with multi subdomain cookies ie .sharelatex.com https://github.com/goinstant/tough-cookie/issues/16 moving it to request in the future is probably a good idea, if we do move to request then with the current issues we would we need to set jar._jar.rejectPublicSuffixes = false	2014-08-19 11:17:51 +01:00
Henrique Dias	e0e9949da5	dynamic template menu by config settings	2014-08-18 14:26:47 -03:00
James Allen	02ec2bc264	Align flags on left of menu to match flag in footer	2014-08-14 16:41:48 +01:00
James Allen	ac4b3663cb	CSS tweaks to i18n stuff	2014-08-14 16:33:01 +01:00
Henry Oswald	aa4f748608	Merge branch 'master' into i18n	2014-08-14 15:42:54 +01:00
Henry Oswald	f75838b353	don't show the lng select if there is only 1 lang to show	2014-08-14 15:42:31 +01:00
James Allen	9be7228247	Delay Dropbox polling by 5 seconds and dispatch only a single request	2014-08-14 13:48:23 +01:00
Henry Oswald	7c2beb5d2d	added correct flags	2014-08-14 13:00:04 +01:00
James Allen	7816810249	Add in poll dropbox endpoint back into admin	2014-08-14 10:12:01 +01:00
Henry Oswald	02cdfb4d09	lng dropdown at bottom in footer works nicely, needs few style tweeks	2014-08-13 23:06:15 +01:00
James Allen	604505131b	Convert integer dropbox id to string when searching mongo	2014-08-13 17:34:45 +01:00
James Allen	670e8e5cb9	Use Dropbox Real-time polling	2014-08-13 17:26:18 +01:00
Henry Oswald	7389943089	added ugly list of available subdomains	2014-08-13 16:04:49 +01:00
James Allen	2a6041752d	Remove unescaped strings on bonus page	2014-08-13 15:44:30 +01:00
Henry Oswald	041e85b92b	added local cooked option to hide notification	2014-08-13 14:14:31 +01:00
Henry Oswald	2222b32321	added message at top of page offering redirect to local lng	2014-08-13 12:31:14 +01:00
James Allen	6bfefea5cb	Show PDF button in toolbar if file tree is closed in PDF flat view	2014-08-12 13:18:22 +01:00
James Allen	93f2969be5	Change style on file rename input to avoid weird Chrome behaviour	2014-08-12 12:46:05 +01:00
James Allen	5b3bf5c956	Spaces after error titles	2014-08-12 12:30:07 +01:00
James Allen	3348249dcd	Download template PDF and zip file with good file names	2014-08-12 12:02:09 +01:00
James Allen	2aa421233c	Add meta description for templates home page	2014-08-11 16:20:27 +01:00
James Allen	b7ed3bab8f	Merge branch 'redis-queue'	2014-08-11 12:10:25 +01:00
Henry Oswald	f452f0ee19	don't escpae html on delete modal	2014-08-11 08:01:39 +01:00
Henry Oswald	cc71834e4e	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-08 14:43:14 +01:00
Henry Oswald	4c073ff285	render template name in CanonicalPage	2014-08-08 14:43:07 +01:00
James Allen	8320970a29	ngcloak template button while loading	2014-08-08 14:05:40 +01:00
James Allen	b20934e579	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-08 11:42:02 +01:00
James Allen	10021986c5	Don't error on password reset if no email found, and translate error messages	2014-08-08 11:41:54 +01:00
Henry Oswald	b8c7163800	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-08 10:27:43 +01:00
Henry Oswald	66ba6e612d	Revert "send 401 when login fails" ... This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.	2014-08-08 10:21:17 +01:00
James Allen	2730a2e73c	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-07 16:53:07 +01:00
James Allen	af1f0994af	Remove priority title stuff again	2014-08-07 16:53:01 +01:00
Henry Oswald	7976f2f0fe	send 401 when login fails	2014-08-07 16:28:00 +01:00
James Allen	31e3c4ac06	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-07 16:12:11 +01:00
Henry Oswald	da307318d9	fixed unescaped content	2014-08-07 16:11:43 +01:00
James Allen	240dae0cff	Provide template description as meta tag ... Conflicts: app/views/layout.jade	2014-08-07 16:11:32 +01:00
James Allen	b367c4a968	Show group subscription status on subscription dashboard page ... Conflicts: app/views/subscriptions/dashboard.jade	2014-08-07 15:51:43 +01:00
Henry Oswald	06c83dfcfa	fixed missing title val	2014-08-07 15:15:07 +01:00
Henry Oswald	9c6f0faff6	Merge branch 'i18n' ... Conflicts: app/coffee/Features/User/UserPagesController.coffee app/views/layout.jade app/views/project/editor/dropbox.jade app/views/project/editor/file-tree.jade app/views/project/editor/pdf.jade app/views/project/list/project-list.jade app/views/user/settings.jade	2014-08-07 14:46:17 +01:00
Henry Oswald	a337b8e848	fixed jade error in track changes	2014-08-07 14:31:03 +01:00
Henry Oswald	ecd5d5274c	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-07 13:56:17 +01:00
Henry Oswald	c961cea514	fixed some bits	2014-08-07 13:56:04 +01:00
James Allen	0a44aa9e71	Push into doc updater queue rather than pub/sub for updates	2014-08-07 13:19:10 +01:00
Henry Oswald	01b7f61e6b	added check if other langs are enabled for put the header rel link in	2014-08-06 15:35:57 +01:00
Henry Oswald	673def4f90	added different lang links to head for google	2014-08-06 15:05:13 +01:00
James Allen	07a2955341	Add in timeout documentation link to error message	2014-08-05 17:16:34 +01:00
James Allen	0111d699a3	Move sort click action to just the header text, not select all input	2014-08-05 17:10:24 +01:00
James Allen	a7cf8d6b0a	Sort out title of wiki	2014-08-05 17:08:38 +01:00
Henry Oswald	9baea1edc1	removed lang dropdown	2014-08-05 11:35:23 +01:00
Henry Oswald	90395af6b8	nav bar text is now translated but uses key as the string if it can't be translated	2014-08-05 11:24:18 +01:00
Henry Oswald	377acfaa56	added default lang of en-US and translations package does the set lang based on subdomain	2014-08-05 11:15:17 +01:00
Henry Oswald	2be22d7ca7	cookies work accross different subdomains, added translations middlewear into stack to render based on domain	2014-08-04 16:47:14 +01:00
Henry Oswald	1e0652888a	removed console.log	2014-08-04 12:21:38 +01:00
Henry Oswald	03db0bc797	added ugly dropdown for testing	2014-08-01 14:43:06 +01:00
Henry Oswald	d047d44079	Changed the error messages which are sent down to the client to be translated first ... fixed up tests from titles we check when rendering, deleted them as they never catch anything important, more hastle than they are worth imo.	2014-08-01 14:03:38 +01:00
Henry Oswald	1b8c8b8c48	sorted out titles	2014-08-01 13:47:14 +01:00
Henry Oswald	fdc5a5154a	added a load more pages	2014-08-01 12:34:53 +01:00
James Allen	2ea7dee682	Add card around wiki content to make it stand out	2014-08-01 08:51:01 +01:00
Henry Oswald	cb685f5ea6	done loads of more pages	2014-07-31 17:07:43 +01:00
James Allen	55ad2ce78d	Include contents page down side of wiki	2014-07-31 16:26:02 +01:00
James Allen	be725c50ba	Make right click on menus behave like native right click	2014-07-31 14:20:56 +01:00
Henry Oswald	ab10d84f6a	did some of the forms	2014-07-31 14:01:37 +01:00
Henry Oswald	43750e9cb6	converted plans page	2014-07-31 13:38:24 +01:00
James Allen	13c6fcb8d9	Handle encoded parameters in request URL to wiki	2014-07-31 13:12:24 +01:00
James Allen	bc2147993a	Show project path in Dropbox folder	2014-07-31 13:04:55 +01:00
James Allen	e1c14b0cf8	Mask iframe so resizer can go over native PDF	2014-07-31 13:04:55 +01:00
Henry Oswald	5f8bb9ea1f	converted settings page	2014-07-31 11:54:19 +01:00
Henry Oswald	42c63dd5a2	equals checks work, uses id now as well. Taken from: ... http://blog.brunoscopelliti.com/angularjs-directive-to-check-that-passwords-match the old one from SO does not seem to work any more	2014-07-31 11:16:13 +01:00
Henry Oswald	270c92c2a2	converted project list page ... added missing js files	2014-07-30 17:18:45 +01:00
Henry Oswald	49c7d52208	i18n is cleaned and working with requirejs	2014-07-30 16:13:02 +01:00
Henry Oswald	9631d4da98	much simpler version of interpolation	2014-07-30 16:06:53 +01:00
Henry Oswald	7344f745e4	example of interpolation working	2014-07-30 16:04:26 +01:00
James Allen	94bcfc0eac	Only store host, not path in wiki URL setting	2014-07-30 15:56:27 +01:00
James Allen	49258fe3dd	Proxy to wiki	2014-07-30 15:44:03 +01:00
Henry Oswald	1a8c3d17b2	working example of directive for i18n new project button	2014-07-30 15:05:13 +01:00
Henry Oswald	bdf1fed462	jquery translations work	2014-07-30 14:22:36 +01:00
Henry Oswald	48f019236e	added first translations	2014-07-29 15:33:31 +01:00
Henry Oswald	39173fe583	Merge branch 'i18n' ... Conflicts: app/coffee/infrastructure/Server.coffee app/views/project/list.jade package.json	2014-07-29 13:44:10 +01:00
James Allen	1f44cc4375	Fix alignment of 'view all templates'	2014-07-29 11:35:56 +01:00
Henry Oswald	f821c38a9f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-07-29 10:55:29 +01:00
Henry Oswald	dff74cf5cb	hide dropbox in left menu if you are not the admin	2014-07-29 10:55:22 +01:00
James Allen	df85254d3c	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-07-29 10:39:07 +01:00
James Allen	25205e3dda	Update to official mathjax cdn	2014-07-29 10:37:43 +01:00
Henry Oswald	f906d63067	added some logging around dropbox update	2014-07-29 10:32:11 +01:00
Henry Oswald	a62a8db0e0	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-07-29 10:29:46 +01:00
Henry Oswald	344d32d4e8	fixed email logo link	2014-07-29 10:29:40 +01:00
James Allen	fc7753d49d	Add in download PDF button	2014-07-28 17:24:43 +01:00
Henry Oswald	2267a484f4	added /home so in dev can easily see home page when logged in	2014-07-28 17:04:17 +01:00
Henry Oswald	9354d61aa3	fixed delete account validation ... not using angular equals which does not seem to work	2014-07-28 16:52:25 +01:00
James Allen	a5267184ab	Don't use dark theme yet	2014-07-28 15:57:06 +01:00
James Allen	db920f7aaf	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-07-28 15:06:39 +01:00
James Allen	4ff9fe33b6	Use a dark editor surround if the theme is dark	2014-07-28 15:06:26 +01:00
Henry Oswald	d4be1ba7aa	changed template image paths to use correct ones	2014-07-28 12:50:56 +01:00
James Allen	ce47f75058	Show timedout errors properly	2014-07-28 10:22:27 +01:00
Henry Oswald	1603957571	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-25 14:21:48 +01:00
Henry Oswald	b7c6af1341	/home goes to home page, so can look at it when logged in	2014-07-25 14:17:40 +01:00
James Allen	e8c5679954	Update styles for homepage	2014-07-25 14:14:27 +01:00
Henry Oswald	c0f5894edb	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-25 13:14:22 +01:00
Henry Oswald	40dbeb1fe7	fixed missing fingerprint	2014-07-25 12:52:17 +01:00
James Allen	9aa8682082	Add group plan enquiry form	2014-07-25 12:32:26 +01:00
Henry Oswald	5a336ed7ef	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-25 12:20:11 +01:00
Henry Oswald	d7814e354b	replace underscore with space in template names	2014-07-25 12:20:08 +01:00
James Allen	cb5206a49e	Convert plans page to use free trials	2014-07-25 12:10:56 +01:00
Henry Oswald	726719ce3f	changed html autofocus to an angular directive ... autofocus is html5y and worked on chrome but not firefox for me.	2014-07-24 14:57:56 +01:00
Henry Oswald	b15adefed7	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-24 14:06:33 +01:00
Henry Oswald	787a3adad3	killed changelog	2014-07-24 14:05:20 +01:00
James Allen	0938186868	Don't show system messages in editor	2014-07-24 14:04:26 +01:00
James Allen	5c18f4fe02	Sexy project list resizing	2014-07-24 14:02:14 +01:00
Henry Oswald	2ffe093952	removed unused bonus jade files	2014-07-24 13:58:02 +01:00
Henry Oswald	7255231abc	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign ... updated upstream into a topic branch.	2014-07-24 13:57:49 +01:00
James Allen	06ca7c904e	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-24 13:24:20 +01:00
James Allen	1128b45b17	Add in system messages	2014-07-24 13:24:08 +01:00
Henry Oswald	67cba0dfd2	killed info controller and setup features.less for dropbox and feature pages ... also moved dropbox to external pages	2014-07-24 12:15:54 +01:00
Henry Oswald	a8deac697c	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-24 11:29:11 +01:00
Henry Oswald	a7b678a2c0	removed dropbox template that is not needed	2014-07-24 11:29:05 +01:00
Henry Oswald	49f356b38f	removed advisor and themes page	2014-07-24 11:23:53 +01:00
James Allen	fbd36d8b07	Sort of style of admin panel and trim functionality	2014-07-24 11:22:22 +01:00
James Allen	596619633d	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-23 15:56:22 +01:00
James Allen	a459a178b3	Retina favicon	2014-07-23 15:56:15 +01:00
Henry Oswald	e60c67d7e4	moved the left hand pdf link to the top	2014-07-23 14:44:44 +01:00
Henry Oswald	e46bc51c67	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-23 12:17:14 +01:00
Henry Oswald	17962426ea	blog returns 404's if the page does not exist in blog	2014-07-23 12:16:52 +01:00
Henry Oswald	83b94f987c	cleaned up few small things with templates	2014-07-23 12:16:31 +01:00
James Allen	077f87f1d3	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-23 12:05:31 +01:00
Henry Oswald	395b1ebf47	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-23 11:29:43 +01:00
Henry Oswald	e39e6c86a1	moved where we write the window.sharelatex.x to the header as some ... times it is possible for the scripts to evaulate before those props have been read in	2014-07-23 11:29:04 +01:00
James Allen	2218acdc3b	Add close buttons to modals	2014-07-23 11:26:45 +01:00
Henry Oswald	a9d8be8dec	brought up the sections of templates to be closer to the search box	2014-07-23 11:26:17 +01:00
James Allen	bbaf024f14	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-23 11:22:12 +01:00
James Allen	cca50cf64c	Auto focus login, register and password fields	2014-07-23 11:18:42 +01:00
James Allen	96e99a5cc0	Minor project list tweaks	2014-07-23 11:12:12 +01:00
James Allen	532ec5e756	Make project list look better on a smaller screen	2014-07-23 11:08:55 +01:00
Henry Oswald	c6ab4c4f7b	roughly styled template search results ... clear button in template search also clears results	2014-07-22 17:43:17 +01:00
Henry Oswald	25ea01115a	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-22 17:24:51 +01:00
Henry Oswald	a4b02558dc	'carded' the templates page, top search area still needs doing	2014-07-22 17:24:32 +01:00
James Allen	20a5d3742a	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-22 17:09:52 +01:00
James Allen	dfb82015f7	Style blog and lighten text	2014-07-22 17:09:44 +01:00
Henry Oswald	a20b46c786	template page looks ok, not quite like adam did. ... Need to battle left padding still	2014-07-22 15:56:36 +01:00
Henry Oswald	234bc5e0e9	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-22 14:56:41 +01:00
Henry Oswald	806ebc977c	templates index page looks roughly correct	2014-07-22 14:56:33 +01:00
James Allen	a4209000dc	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-22 14:38:51 +01:00
James Allen	c099b8e9de	Add hotkeys modal	2014-07-22 14:38:32 +01:00
Henry Oswald	c95730dd63	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-22 13:42:37 +01:00
James Allen	688842de3c	Allow full screen PDF	2014-07-22 13:33:01 +01:00
Henry Oswald	2c7d19d79b	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-22 12:31:34 +01:00
Henry Oswald	2246e9c934	blog looks basically like adams	2014-07-22 12:31:19 +01:00
James Allen	cb57c2f28d	Tweak css and style on homepage	2014-07-22 11:50:15 +01:00
James Allen	3a13dac7ab	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-21 17:56:28 +01:00
Henry Oswald	aa3cd06d72	add trailing space for better spacing on register message	2014-07-21 17:32:16 +01:00
Henry Oswald	535a3c67cd	added template for bonus page with html linking to us	2014-07-21 16:41:22 +01:00
James Allen	b5cfe06645	Don't show options that don't make sense for anonymous users	2014-07-21 16:10:21 +01:00
Henry Oswald	46027128a4	change notifications email top header to the grey we use on the site	2014-07-21 15:52:55 +01:00
James Allen	1d6314a2c1	add Ctrl-Enter hotkey	2014-07-21 15:39:15 +01:00
James Allen	27795c451f	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-21 15:12:00 +01:00
James Allen	3468460ed6	Show progress before any js loads	2014-07-21 15:11:54 +01:00
James Allen	2b85ebf8ec	Allow root doc to be set	2014-07-21 15:09:19 +01:00
Henry Oswald	1322f3e183	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-21 14:18:43 +01:00
Henry Oswald	375669cd3b	changed emails to adams design. Does not render brilliantly in gmail, but overall not bad.	2014-07-21 14:18:11 +01:00
James Allen	a3a5aa1c0d	Remove server-side santization of project name, it's all escaped client side now	2014-07-21 13:34:25 +01:00
Henry Oswald	792147fb46	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-21 13:25:43 +01:00
James Allen	1c68ea7328	Don't care if user key has expired when we receive a cursor update	2014-07-21 13:16:07 +01:00
Henry Oswald	82914b6fe5	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-21 13:14:08 +01:00
James Allen	98d601fb66	Only show synctex controls when pdf layout is open	2014-07-21 12:30:34 +01:00
James Allen	1cf508356c	Show 'no messages' state in chat	2014-07-21 12:19:13 +01:00
James Allen	4151f5d85f	Disable chat for anonymous users	2014-07-21 11:56:49 +01:00
James Allen	6212b1c375	Append header tooltips to body	2014-07-21 11:38:19 +01:00
Henry Oswald	57ad5e4182	- migrated event tracking to new pages/angular ... - hooked up the search field on projects to search on keypress	2014-07-21 11:35:05 +01:00
Henry Oswald	0868ce9cc7	send user details on modal dismiss. Role uses same autocomplete lib as institution	2014-07-18 14:08:53 +01:00
Henry Oswald	533b51146e	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-18 13:20:40 +01:00
Henry Oswald	175882dc67	changed role to datalist because im fed up of not being able to fix it. Datalist are not styled but its not that bad	2014-07-18 13:20:35 +01:00
James Allen	b532461232	Style project sorting with a cleaner look	2014-07-18 12:20:12 +01:00
James Allen	b785ab4d15	Fix broken project list page	2014-07-18 12:18:05 +01:00
James Allen	462403bb4f	Finger print Ace files	2014-07-18 12:08:56 +01:00
Henry Oswald	57b461e0ff	added little icons to the table for when you want to sort	2014-07-18 10:43:32 +01:00
Henry Oswald	ca6e8a7d40	basic sorting added to project list page	2014-07-17 17:34:09 +01:00
Henry Oswald	c683eab9e2	change the scribtex modal to be bootstrap3/angular, same content and same logic if it should be shown or not	2014-07-17 17:05:39 +01:00
Henry Oswald	554fd7c7d0	change client connection timeout to 15 mins expire in redis	2014-07-17 16:03:53 +01:00
James Allen	2cf8f8c56f	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-17 15:35:06 +01:00
James Allen	9ed93b3a81	Make colors consistent everywhere	2014-07-17 15:33:38 +01:00
Henry Oswald	fc02f99659	made restricted page like 404, also got dropbox progress bar going the other way	2014-07-17 15:26:31 +01:00
James Allen	37a12e88c1	Show who is online	2014-07-17 15:25:22 +01:00
Henry Oswald	c429bd1f44	improved the dropbox progress bar	2014-07-17 15:08:12 +01:00
Henry Oswald	b54c351956	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-17 14:23:55 +01:00
Henry Oswald	5fa83fb2b9	added dropbox in left menu	2014-07-17 14:23:47 +01:00
James Allen	3995de3cfc	Add in project cloning to editor	2014-07-17 14:04:21 +01:00
James Allen	a3faaf0c18	Add in mathjax directive	2014-07-17 13:23:43 +01:00
James Allen	d531e3b393	Fix overlapping issues when name is empty in track changes list	2014-07-17 13:03:29 +01:00
James Allen	ee7013c1ee	TRack free trial clicks and redirect to subscription page	2014-07-17 12:57:17 +01:00
James Allen	05b078ec92	New File => Folder in folder modal	2014-07-17 12:03:26 +01:00
James Allen	e0f1ed3c10	Use internal url for chat	2014-07-17 11:43:12 +01:00
James Allen	8d946e68d2	Return better blank gravatar image	2014-07-17 11:07:34 +01:00
James Allen	c6f51cf5ac	Show new chat message notification	2014-07-17 11:05:08 +01:00
James Allen	9064a9d9df	Append project list tooltips to body	2014-07-16 17:04:17 +01:00
James Allen	9ce746c6c5	Tweak menu style	2014-07-16 17:01:41 +01:00
James Allen	8e1593bb96	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-16 16:58:25 +01:00
James Allen	c24fe212a9	Fix PDF position tracking	2014-07-16 16:58:12 +01:00
Henry Oswald	f4b0dec1b8	changed api-key to read-only-api-key for angolia	2014-07-16 16:37:58 +01:00
Henry Oswald	55eb15baba	changed the icon for templates in the left menu	2014-07-16 16:20:31 +01:00
Henry Oswald	4f91e40875	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-16 15:53:12 +01:00
Henry Oswald	f3f53a99d0	Templates state resets on modal close so if the api comes back it will work	2014-07-16 15:50:27 +01:00
James Allen	14a9d0838e	Get line wrapping of long tag names sorted	2014-07-16 15:24:30 +01:00
James Allen	1d79f3bec3	Don't close folder menu on modal pop up	2014-07-16 15:04:37 +01:00
James Allen	a924f2a928	Rephrase shared projects	2014-07-16 15:01:06 +01:00
James Allen	f34811fbf6	Add new folder link in side bar	2014-07-16 14:59:52 +01:00
Henry Oswald	735bc9e53d	show message when can not talk to templates api	2014-07-16 13:36:02 +01:00
Henry Oswald	abc4306e06	merge	2014-07-16 13:35:15 +01:00
James Allen	4b3610746e	Use native select box style in left menu	2014-07-16 12:09:19 +01:00
Henry Oswald	eb58bb7c5a	all template buttons in editor are disabled on publish/unpublish	2014-07-16 12:04:33 +01:00
James Allen	60174ffb09	Style closed page	2014-07-16 11:59:54 +01:00
James Allen	2dc43b504c	Style 404 page	2014-07-16 11:59:25 +01:00
Henry Oswald	6982ec63ae	changed get template details to findOne	2014-07-16 11:56:22 +01:00
James Allen	9e0d5ff890	Use permissions.admin, not hasPermission(...)	2014-07-16 11:50:03 +01:00
Henry Oswald	cd60817592	made getting templates details parallel	2014-07-16 11:37:17 +01:00
James Allen	4a139949f2	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-16 11:29:02 +01:00
James Allen	8f08823d34	Sort out fingerprints and pdf.js worker path	2014-07-16 11:28:52 +01:00
Henry Oswald	91ca726e66	get template details now includes the markdown description of the project	2014-07-16 11:27:47 +01:00
Henry Oswald	c8c0030b7c	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-16 11:02:53 +01:00
Henry Oswald	46377aea3d	the template link in the left menu is only shown to owners/admins	2014-07-16 11:02:45 +01:00
James Allen	1d7a595c6c	Small chat scroll tweaks	2014-07-16 10:52:06 +01:00
James Allen	e0266e309f	Put project link in header	2014-07-15 20:44:13 +01:00
James Allen	7318f4c2d3	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-15 18:25:29 +01:00
James Allen	b9f2b02594	Sort out scroll in chat	2014-07-15 18:25:12 +01:00
Henry Oswald	c93c8b3f7d	got basic client side templates	2014-07-15 17:56:09 +01:00
Henry Oswald	ef4b7f7036	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-15 12:15:15 +01:00
James Allen	cf0ff6e97a	Hide chat in editor	2014-07-15 10:56:01 +01:00
Henry Oswald	9f82e63a8f	changed :project_id to :Project_id	2014-07-14 22:11:41 +01:00
Henry Oswald	0aa6a206e7	added name and email to connected user data and example get request for chat	2014-07-14 16:23:31 +01:00
Henry Oswald	4a71b38721	added route for getting connected users	2014-07-14 16:16:01 +01:00
Henry Oswald	e6dfef6225	added getting connected users controller	2014-07-14 16:01:58 +01:00
Henry Oswald	b0cf0666fa	changed the redis stuf to multi	2014-07-14 15:38:55 +01:00
Henry Oswald	d13676dab2	cursor data is stored in redis	2014-07-14 15:30:55 +01:00
Henry Oswald	61b7bea203	added ttl to the users set to keep redis clean from inactive projects	2014-07-14 13:20:29 +01:00
Henry Oswald	2b2b995340	refactored updateClientPosition to use async	2014-07-14 12:58:55 +01:00
Henry Oswald	5093820a5f	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-14 12:42:03 +01:00
Henry Oswald	13aaf042d9	connected user manager logic works correctly	2014-07-14 12:41:06 +01:00
James Allen	e4d9d03f55	Improve feedback on login/register forms	2014-07-11 17:08:19 +01:00
James Allen	1c5778e2c4	List number of changes in diff	2014-07-11 16:34:12 +01:00
James Allen	76415ae02b	Show labels for tracked changes above and below	2014-07-11 16:17:59 +01:00
James Allen	0a2d93011f	Add in restore button for diffs	2014-07-11 13:55:14 +01:00
Henry Oswald	d737197e95	marksUserAsDisconnected -> markUserAsDisconnected	2014-07-10 17:01:42 +01:00
Henry Oswald	01ad313133	hooked up editor controller to connected users manager	2014-07-10 17:01:19 +01:00
Henry Oswald	e1dd58aca8	fixed algolia settings and removed some console.logs	2014-07-10 16:05:18 +01:00
Henry Oswald	4ccc56723f	added disconnect funtion in connected users manager	2014-07-10 16:05:05 +01:00
Henry Oswald	c0a6f0b7ad	Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee public/coffee/ide/online-users/OnlineUsersManager.coffee public/coffee/ide/track-changes/directives/infiniteScroll.coffee	2014-07-10 15:15:18 +01:00
Henry Oswald	025d3147ec	blog intergration works	2014-07-10 14:53:53 +01:00
James Allen	1ce5062800	Add in link to go back to projects	2014-07-10 14:08:32 +01:00
Henry Oswald	5cf756969e	blog wip	2014-07-09 19:49:39 +01:00
James Allen	16e382bef2	Update Ace and fix autocomplete	2014-07-09 17:59:04 +01:00
James Allen	c93902345a	Remove all console.log debug statements	2014-07-09 16:18:09 +01:00
James Allen	b0f43eab19	Use events for updating cursor = big performance gain	2014-07-09 15:38:38 +01:00
James Allen	07debb2450	Fix some more project list style issues	2014-07-09 14:56:25 +01:00
James Allen	f2066e46dd	Use Angular 1.30 and only update emails on blur	2014-07-09 14:53:30 +01:00
James Allen	f6c2feff2d	Improve styling of project list with long titles and labels	2014-07-09 11:51:21 +01:00
James Allen	488f33d3d0	Replace slashes globally	2014-07-09 11:17:16 +01:00
James Allen	6d10c186ad	Sort out escaping issues	2014-07-09 11:05:00 +01:00
James Allen	4423471b1a	Auto resize project list to always fit in screen	2014-07-08 17:47:20 +01:00
James Allen	d9d1499dae	Ignore external pages	2014-07-08 13:36:08 +01:00
James Allen	8c56a46594	Merge branch 'master' into master-redesign	2014-07-08 13:24:48 +01:00
James Allen	2553f51e44	Remove unused subscription downgrade logic	2014-07-08 12:55:29 +01:00
James Allen	2f92856db4	Provide more config options for nav and footer entries	2014-07-08 12:51:11 +01:00
Henry Oswald	0080809489	merge/moving js stuff around half done	2014-07-08 12:32:50 +01:00
James Allen	b9909bbd84	Sort out front end coffee/js files and minification	2014-07-08 12:01:32 +01:00
Henry Oswald	32b5e39681	chat scoll works fairly well using scroll glue	2014-07-08 11:56:44 +01:00
Henry Oswald	6dc9d32104	Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/app/main.coffee	2014-07-08 11:14:56 +01:00
Henry Oswald	581d9ec925	- hooked up chat throughout the stack ... - removed lots of console.logs - working on the auto scrol, doesn't quite work yet	2014-07-08 10:08:38 +01:00
James Allen	8525bf4a72	Get group admin page working with angular and new style	2014-07-07 18:06:12 +01:00
James Allen	c542116b41	Fix role autocomplete	2014-07-07 16:25:18 +01:00
James Allen	5d62775ab6	Fix auto complete in user profile	2014-07-07 16:22:38 +01:00
James Allen	068d88ec0b	Style bonus page	2014-07-07 15:54:40 +01:00
James Allen	41ef675999	Improve UX of user profile	2014-07-07 14:58:12 +01:00
James Allen	452098ca68	Redirect to register if not registered on plans page	2014-07-07 14:05:07 +01:00
James Allen	5f48105b04	Style subscription management pages	2014-07-07 13:43:36 +01:00
James Allen	7947eb28ad	Remove ab test from plans page	2014-07-07 12:30:19 +01:00
James Allen	b3bfa2dc26	Add plans page	2014-07-07 12:27:58 +01:00
Henry Oswald	34ac6b03cd	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-07 10:54:50 +01:00
Henry Oswald	d1f907cee5	first simple version of tracking who is active in the editor	2014-07-04 16:18:46 +01:00
James Allen	773b457d24	Group messages from the same person together	2014-07-04 15:46:21 +01:00
Henry Oswald	de010cf971	added error logging	2014-07-04 13:29:59 +01:00
Henry Oswald	0d02241b46	linked chat into the editor real time contorller	2014-07-04 13:20:30 +01:00
Henry Oswald	86a9d08e5c	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-04 13:06:47 +01:00
Henry Oswald	9c35cfd693	very start of chat controllers done	2014-07-04 13:05:55 +01:00
James Allen	ac0f05a9e4	Create binary file preview	2014-07-03 17:05:50 +01:00
James Allen	af870c8269	Style project name and allow renaming	2014-07-03 16:18:49 +01:00
James Allen	a8d371d2f6	Sort out permissions and displaying anonymous users	2014-07-03 15:05:35 +01:00
James Allen	58e4e92d84	Add in upgrade pop up to history	2014-07-03 11:18:15 +01:00
James Allen	a13ee00e91	Allow dragging into the root folder	2014-07-03 11:01:41 +01:00
James Allen	a4afc70f9b	Show saving notifications	2014-07-02 17:41:07 +01:00
Henry Oswald	77246b2a07	added query string support onto get requests for limit and before	2014-07-02 17:37:30 +01:00
Henry Oswald	8670b543b9	added basic chat handler	2014-07-02 17:28:05 +01:00
James Allen	b61da1a9f0	Handle out of sync errors with a pop-up	2014-07-02 17:04:29 +01:00
Henry Oswald	b81fac1cf4	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-02 15:58:30 +01:00
Henry Oswald	ba4d585854	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-02 15:56:22 +01:00
James Allen	f256c96195	Add in chat view with stubbed data	2014-07-02 15:56:09 +01:00
James Allen	926b31b337	Fix a few ui bugs	2014-07-02 13:29:56 +01:00
James Allen	ab09a865b8	Add in chat pane and sort out layout resizing	2014-07-02 13:23:04 +01:00
James Allen	83666be910	Disabled pdf download if not available	2014-07-02 11:06:20 +01:00
James Allen	f86c9cf853	Move all editor manager binding logic into the managers	2014-07-02 10:59:18 +01:00
Henry Oswald	55d20e8abd	change format of algolia settings	2014-07-01 16:45:20 +01:00
James Allen	beae4f2424	Style settings side panel	2014-07-01 16:03:14 +01:00
Henry Oswald	8f6dac77d0	added asset proxying from templates in, used for old images etc which people linked to	2014-07-01 16:00:42 +01:00
James Allen	7cfbaaca36	Style settings side panel	2014-07-01 15:57:55 +01:00
Henry Oswald	978e3262b5	added redirects from config file in, used for old template paths	2014-07-01 15:44:12 +01:00
Henry Oswald	000be22f16	Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: app/views/project/editor.jade	2014-07-01 15:23:05 +01:00
James Allen	e1bce85933	Update style when project is public too	2014-07-01 15:17:42 +01:00
James Allen	0b0f7eab0b	Stop public status looking like a table header	2014-07-01 15:15:54 +01:00
James Allen	9839f3fc62	Get public sharing modal working	2014-07-01 15:05:32 +01:00
Henry Oswald	17537b0d7a	client side js for templates loads and works	2014-07-01 14:27:20 +01:00
James Allen	08f702a7c5	Get free trial button working in share modal	2014-07-01 14:16:41 +01:00
James Allen	be48ab2a30	Add in basic share modal	2014-07-01 14:12:28 +01:00
James Allen	9097fdd930	Allow switching between pdfjs and native viewer	2014-07-01 11:00:47 +01:00
James Allen	11d951f021	Get synctex working	2014-06-30 18:35:01 +01:00
Henry Oswald	53fa15d3db	added basic error handling around templates rendering	2014-06-30 17:27:13 +01:00
Henry Oswald	27a97b7fa8	build titles for tempaltes page in web	2014-06-30 17:19:25 +01:00
Henry Oswald	b80f751cb2	templates works basically, needs error handling and few little improvments	2014-06-30 17:08:54 +01:00
James Allen	797dcf5c84	Jump to error when clicking on log entry	2014-06-30 13:41:32 +01:00
James Allen	8b6f962275	Allow clearing of aux files	2014-06-30 12:36:17 +01:00
James Allen	aee7b5477b	View raw log and download aux files	2014-06-30 12:05:43 +01:00
James Allen	32d1642b9e	Get basic compile/errors/autocompile working	2014-06-30 11:35:32 +01:00
James Allen	0a0719cf7b	Sort of out styling of log entries	2014-06-29 14:22:08 +01:00
James Allen	25a4be408a	Get PDF controls working	2014-06-28 15:43:44 +01:00
James Allen	9c9de35918	Set up basic PDF viewer	2014-06-28 13:25:06 +01:00
James Allen	845c4a7297	Get layout and resize logic working for PDF view	2014-06-28 12:07:18 +01:00
James Allen	3b57d62de2	Refactor project list select all to use linked directives	2014-06-27 21:19:14 +01:00
James Allen	75f1fb54b6	Allow restoring of deleted files	2014-06-27 17:11:26 +01:00
James Allen	562f28f412	Fix resizing and dragging issues	2014-06-27 15:55:08 +01:00
James Allen	b07def6901	Get infinite scroll auto-loading of track changes workikng	2014-06-27 15:45:14 +01:00
James Allen	7af839215f	Don't show cursor in track-changes diff	2014-06-27 14:46:39 +01:00
James Allen	5cbf600f05	Improve labelling of track changes diffs	2014-06-27 14:35:46 +01:00
James Allen	b7adaf9f87	Display diffs	2014-06-27 12:45:37 +01:00
James Allen	28f8c9e055	Get hover state working	2014-06-26 17:22:06 +01:00
James Allen	60e5542f35	Get basic track changes list working	2014-06-26 16:39:52 +01:00
James Allen	afb953a489	Display cursor name labels	2014-06-26 11:19:05 +01:00
James Allen	70f64ee20c	Update securty page	2014-06-26 08:52:42 +01:00
James Allen	c14774bedd	Get basic cursor updating going on	2014-06-25 18:17:17 +01:00
James Allen	703a4faa0e	Code tidy up of ace editor directive	2014-06-25 16:46:28 +01:00
James Allen	5922ed45ee	Get spell check working in new editor	2014-06-25 16:06:04 +01:00
James Allen	9dfbb36a83	Update project settings over http	2014-06-25 13:51:02 +01:00
James Allen	adcea19dca	update security page	2014-06-25 12:15:45 +01:00
James Allen	d214b5dc5e	Merge branch 'master' into master-redesign	2014-06-25 12:14:26 +01:00
James Allen	341570d85d	Be more verbose with ip debug output	2014-06-25 11:06:04 +01:00
James Allen	5aa7daa951	Fix password reset rate limit to work on ip, not email which changes every request	2014-06-25 10:46:58 +01:00
James Allen	cb682ac584	Add in more robust support for being behind a proxy	2014-06-25 10:34:23 +01:00
James Allen	d2ac9a1e9f	Add in auto complete	2014-06-24 21:09:20 +01:00
James Allen	f154f17704	Wire up fontSize and mode settings	2014-06-24 20:46:00 +01:00
James Allen	5cef41fdbd	Allow selecting of theme	2014-06-24 20:28:53 +01:00
James Allen	71ca8f63ed	Improve reconnection and loading display and logic	2014-06-24 17:44:46 +01:00
James Allen	2520651ef2	Automatically open previously open doc	2014-06-24 17:15:27 +01:00
James Allen	35c7f27788	Record last updated date for reconnecting	2014-06-24 16:56:31 +01:00
James Allen	f727bb775d	Show and preform auto-reconnect	2014-06-24 16:33:36 +01:00
James Allen	a1b715d1e9	Add in undo manager	2014-06-24 15:31:44 +01:00
James Allen	cc0d45c678	Add right click to file tree	2014-06-23 17:25:45 +01:00
James Allen	a83f0fe054	Add in dropdowns to file tree	2014-06-23 12:37:05 +01:00
James Allen	2d6816b013	Highlight name when renaming or creating new file	2014-06-23 11:25:36 +01:00
James Allen	a2663c0f32	Get drag and drop moving working	2014-06-23 10:57:31 +01:00
James Allen	84ac77795f	Delete files	2014-06-22 20:49:58 +01:00
James Allen	7556af6421	Listen for rename changes from server	2014-06-22 20:21:31 +01:00
James Allen	242a866bce	Rename files	2014-06-22 20:08:56 +01:00
James Allen	f1eee96c85	Allow uploading	2014-06-22 17:32:15 +01:00
James Allen	f931df6084	Allow creation of folders	2014-06-22 14:39:38 +01:00
James Allen	f41534ee4d	Add in creating of files to editor	2014-06-22 12:10:42 +01:00
James Allen	6d0053e709	Start rebuilding editor	2014-06-21 22:20:37 +01:00
James Allen	0d70777f7f	Fix JS errors in loading editor	2014-06-21 11:56:58 +01:00
James Allen	e5ca033538	Add in configurable headings/footers	2014-06-20 21:35:42 +01:00
James Allen	a64b9eb82e	Create and style external pages	2014-06-20 17:17:24 +01:00
James Allen	1980ffec09	Wire up delete and unsubscribe in account settings	2014-06-20 15:48:00 +01:00
James Allen	a2bb89b579	Merge branch 'master' into master-redesign	2014-06-20 11:18:43 +01:00
James Allen	81845dec32	Wire up account settings forms	2014-06-20 11:15:25 +01:00
James Allen	0ef7e54ad3	Allow partial updates to user settings	2014-06-20 09:42:43 +01:00
James Allen	63f958af07	Improve styling	2014-06-19 13:30:45 +01:00
James Allen	1bcc0a4554	Send 204 rather than redirect when leaving a project	2014-06-19 13:11:01 +01:00
James Allen	e07aa9165f	Queue up http requests so we can fire them in parallel without a problem	2014-06-19 13:03:34 +01:00
Henry Oswald	85befe0d57	listen on stdout when unzipping, unsticks some zips for some reason...	2014-06-18 18:18:49 +01:00
James Allen	70673d2881	Cloak project page while loading	2014-06-18 16:49:29 +01:00
James Allen	ad74cf2464	Add tooltips	2014-06-18 16:46:56 +01:00
James Allen	5513a0b436	Hook up front end download	2014-06-18 16:43:37 +01:00
James Allen	2b349039c3	Add in backend multiple project downloading	2014-06-18 16:37:18 +01:00
James Allen	b837a4e9f3	Merge branch 'master' into master-redesign	2014-06-18 15:26:09 +01:00
James Allen	618b6a7849	Apply form validations	2014-06-18 15:23:00 +01:00
Henry Oswald	2a6ff8cc5d	changed team@sharelatex.com to support@sharelatex.com	2014-06-18 14:47:29 +01:00
James Allen	04d3e5cfe1	Allow project search to be cleared	2014-06-18 11:53:18 +01:00
James Allen	9a03411d42	Don't show tags which are empty when loaded	2014-06-18 11:30:56 +01:00
James Allen	70c51cb947	Merge branch 'master' into master-redesign	2014-06-18 10:56:30 +01:00
Henry Oswald	e0be5ef01b	added timeouts to email and newsletter as after a few days there are a few open connections still	2014-06-17 18:18:45 +01:00
James Allen	750b524771	Don't get user id from possibly deleted session	2014-06-17 17:45:07 +01:00
James Allen	5ce319f8d9	Use ng-cloak rather than a loading spinner	2014-06-17 16:43:33 +01:00
James Allen	525581bada	Add in test loading spinner	2014-06-17 16:36:08 +01:00
Henry Oswald	426b699865	links in emails use site url	2014-06-17 16:28:52 +01:00
James Allen	aa8969c652	Merge and fix external forms	2014-06-17 16:19:40 +01:00
Henry Oswald	e1c8dc943e	added defaults of empty string into user profile, also changed account -> profile in message	2014-06-17 14:36:17 +01:00
James Allen	012371333f	Wrap project list code in require.js	2014-06-17 12:43:42 +01:00
Henry Oswald	2d55f080d6	get algolia to pull app id and api key from settings file	2014-06-17 12:25:49 +01:00
Henry Oswald	cc1b9472b2	don't show the user details area on project list if algolia instituions has not be setup	2014-06-17 11:59:57 +01:00
James Allen	c56648ab80	Merge branch 'master' into master-redesign ... Conflicts: app/views/project/list.jade public/coffee/list.coffee public/stylesheets/less/list.less public/stylesheets/less/style.less	2014-06-17 11:54:29 +01:00
Henry Oswald	3350b99ccf	removed a couple of annoying console.log logs	2014-06-17 10:26:56 +01:00
Henry Oswald	f18172258e	focus on first element in form when showing	2014-06-16 16:22:45 +01:00
James Allen	608e9476b6	Show confirmation for deleting projects forever	2014-06-16 16:17:28 +01:00
Henry Oswald	7355a912b6	recomend roles and still show form when complete	2014-06-16 16:14:58 +01:00
James Allen	0a334939ce	Confirm deletes and leaves	2014-06-16 16:13:09 +01:00
James Allen	3a969876e0	Allow cloning of projects	2014-06-16 15:32:20 +01:00
James Allen	8bb181a465	Don't allow renaming of shared proejcts	2014-06-16 15:12:10 +01:00
James Allen	81ee0f4342	show and restore archived projects	2014-06-16 15:06:58 +01:00
Henry Oswald	a1055b226c	uses angular autocomplete modules	2014-06-16 14:49:35 +01:00
James Allen	802aae6148	Show partial folder selection state	2014-06-16 14:45:47 +01:00
James Allen	65a1f03768	Send project owner details to client	2014-06-16 13:34:38 +01:00
James Allen	9c5f63817e	Send accessLevel info to client	2014-06-16 12:47:39 +01:00
James Allen	63525a8bef	Use angular boostrap instead of vanilla bootstrap	2014-06-16 12:26:35 +01:00
James Allen	95ee8c772a	Fix modal styling	2014-06-16 11:30:54 +01:00
Henry Oswald	09f5a67f9b	got autocomplete presented correctly	2014-06-13 17:17:58 +01:00
James Allen	b9944ca2dc	Hook up file uploads	2014-06-13 17:11:36 +01:00
James Allen	8b57224267	Allow creation of projects	2014-06-13 16:05:44 +01:00
James Allen	ab5d6f82c0	Allow deleting of projects	2014-06-13 15:24:20 +01:00
James Allen	751572c977	Only show actions buttons when projects are selected	2014-06-13 14:28:16 +01:00
James Allen	db74e89f99	Add folder labels next to the project name	2014-06-13 14:14:56 +01:00
James Allen	290089407d	Allow creation of new tags	2014-06-13 13:55:55 +01:00
James Allen	5fbbf6c452	Allow filtering by folder	2014-06-12 16:21:12 +01:00
Henry Oswald	68cc7d85bf	working with requirejs	2014-06-12 15:50:00 +01:00
James Allen	6305ac16f4	Work in progress of doing project list with Angular	2014-06-12 15:22:49 +01:00
Henry Oswald	f4cecb6591	moved alert to lower level so its hidden when not needed	2014-06-12 13:42:36 +01:00
Henry Oswald	6836aabac3	fiddled with the css	2014-06-12 11:22:18 +01:00
Henry Oswald	c075716b0f	cleaned it up a touch, showed how to handle http errors	2014-06-12 10:23:42 +01:00
Henry Oswald	6dc1e54dc7	basic example using angular done	2014-06-11 17:45:09 +01:00
James Allen	067d343928	Display list of tags	2014-06-11 16:32:56 +01:00
Henry Oswald	e099a4a100	added default of empty string to user details, fixed route as well	2014-06-11 15:14:07 +01:00
James Allen	1eaba59df0	Use Ember to load project list	2014-06-11 14:52:23 +01:00
Henry Oswald	473da4fa4c	endpoint for user details is written	2014-06-11 12:46:28 +01:00
James Allen	99705ebb4f	Merge branch 'master' into master-redesign	2014-06-11 12:38:59 +01:00
Henry Oswald	3aff131428	added controller endpoint for updating user personal info	2014-06-10 22:26:43 +01:00
Henry Oswald	560288348a	moved delete project inside the editor to the http endpoint	2014-06-10 18:28:45 +01:00
Henry Oswald	dabed896be	lowercase password reset email	2014-06-10 17:54:29 +01:00
James Allen	2c73ca509b	Style account settings page (doesn't actually work yet)	2014-06-09 10:56:26 +01:00
James Allen	05b8bc36ec	Style password resets	2014-06-09 10:25:38 +01:00
James Allen	d3221f1cf1	Style login and register forms	2014-06-09 10:19:02 +01:00
James Allen	ead812eacc	Style folder list	2014-06-09 09:11:42 +01:00
James Allen	68aff781af	Sort out style of project list	2014-06-09 08:51:12 +01:00
James Allen	3cbf5fa4f4	More style tweaks to the project page	2014-06-06 19:37:04 +01:00
James Allen	ad9121f10d	More style improvements	2014-06-06 19:19:53 +01:00
James Allen	4f05926113	Get project page mostly styled	2014-06-06 17:47:52 +01:00
James Allen	0a1f1b8f38	Sort out responsive navbar	2014-06-06 16:37:59 +01:00
James Allen	b6217c401e	Merge branch 'master' into master-redesign ... Conflicts: public/stylesheets/less/trackchanges.less	2014-06-06 15:10:57 +01:00
James Allen	521befddd3	Merge pull request #76 from dfelder/patch-1 ... Ignore commented lines when setting root doc #52	2014-06-06 14:53:03 +01:00
James Allen	4fbebfbdc6	Tidy up styles	2014-06-06 14:43:45 +01:00
James Allen	5c27ff4430	Don't show diffs of deleted docs (much simpler)	2014-06-06 14:43:45 +01:00
James Allen	02f48be825	Allow docs to be restored	2014-06-06 14:43:45 +01:00
James Allen	cabaf1ae1a	Show deleted documents when viewing history	2014-06-06 14:43:45 +01:00
Daniel Felder	1d12b88b09	Ignore commented lines when setting root doc #52 ... Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.	2014-06-05 18:00:07 +02:00
Henry Oswald	22c467c231	Merge pull request #75 from dfelder/master ... compile current file if top level document #42	2014-06-05 16:42:10 +01:00
James Allen	72939e7dd8	Import new navbar design	2014-06-04 17:46:22 +01:00
James Allen	024e21e0ae	Upgrade Jade	2014-06-04 16:28:20 +01:00
James Allen	43684fda3a	Move to bootstrap 3 (site barely functional)	2014-06-04 16:14:35 +01:00
James Allen	2fb8620ba0	Allow deleting of projects forever	2014-06-04 12:45:04 +01:00
James Allen	4b8f57de80	Add in archived projects link	2014-06-04 11:58:53 +01:00
James Allen	b95c9e1d0a	Find file path and act on it one after the other to avoid race condition	2014-06-04 11:46:01 +01:00
James Allen	015fd6873f	Allow projects to be restore after being deleted	2014-06-03 17:35:44 +01:00
Daniel Felder	4320b790bd	adjusting unit tests	2014-06-01 19:26:33 +02:00
Daniel Felder	5ad0ca08f9	adjusting unit tests	2014-06-01 18:16:05 +02:00
Daniel Felder	f03b2df461	compile current file if top level document #42	2014-06-01 16:43:52 +02:00
James Allen	80c58bb718	Remove deprecated versioning code	2014-05-27 12:56:23 +01:00
James Allen	c1afbc66d9	Don't error if user is not logged in when compiling	2014-05-27 12:33:56 +01:00
James Allen	8f41c6dcb2	Don't automatically clear the cache	2014-05-21 15:20:25 +01:00
Henry Oswald	fd53cf0124	tell tpds sender to use pub url for docstore	2014-05-21 09:15:50 +01:00
James Allen	063f6c7680	Only auto clear CLSI cache on hard error, otherwise prompt user	2014-05-21 08:04:52 +01:00
Henry Oswald	57eb0e2006	Revert "Revert "changed docstore url to /raw for tpds updates"" ... This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.	2014-05-20 13:19:02 +01:00
Henry Oswald	ed9e25450a	Revert "Revert "change send doc lines using tpds to work with stream and doc store"" ... This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.	2014-05-20 13:18:59 +01:00
James Allen	93d418b716	Revert "change send doc lines using tpds to work with stream and doc store" ... This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.	2014-05-20 11:14:06 +01:00
James Allen	22c577f9b5	Revert "changed docstore url to /raw for tpds updates" ... This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.	2014-05-20 11:13:57 +01:00
Henry Oswald	2398b34f28	changed docstore url to /raw for tpds updates	2014-05-20 08:32:39 +01:00
Henry Oswald	d32fe588b7	change send doc lines using tpds to work with stream and doc store	2014-05-19 20:32:48 +01:00
James Allen	a45200dfe3	Automatically clear CLSI cache when compile fails	2014-05-19 16:10:52 +01:00
James Allen	7fed2155be	Differentiate between timeouts, server errors, and LaTeX failures in client	2014-05-19 16:10:52 +01:00
James Allen	6c5a2c2740	Reconfigure internal CLSI call to understand more than just success/failure	2014-05-19 16:10:52 +01:00
Henry Oswald	a53d767eca	changed 412 status code to 400	2014-05-19 14:02:54 +01:00
Henry Oswald	de38cbf595	destroy session when getting project details	2014-05-19 12:01:05 +01:00
Henry Oswald	af2de3cdeb	finished off change email	2014-05-19 11:50:32 +01:00
Henry Oswald	7437115967	added controler t change user email	2014-05-16 17:45:48 +01:00
Henry Oswald	c4a420bd7f	writen function to set the user email safely	2014-05-16 17:29:54 +01:00
James Allen	a62bff5052	USe parallel limit on zip file streaming	2014-05-16 11:50:15 +01:00
Henry Oswald	221c2214dd	changed class from email to password on form	2014-05-16 11:30:44 +01:00
Henry Oswald	50df82697a	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-05-16 11:27:09 +01:00
James Allen	2104c69cb9	Stream files into zip in series	2014-05-16 11:26:58 +01:00
Henry Oswald	9419d3a0e5	hooked up the frount end ui to show the email can not be found, ... added client side valdidation on password, removed server side min length check. Just check that it is not 0 len	2014-05-16 11:26:29 +01:00
James Allen	240dc2e319	Use crypto.randomBytes	2014-05-16 10:52:31 +01:00
Henry Oswald	9c3c57f2a8	renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name	2014-05-16 10:43:55 +01:00
Henry Oswald	bf1bb22afd	added rate limiting to password reset endpoint	2014-05-16 10:31:33 +01:00
Henry Oswald	133c4759f8	fix tests, whoops	2014-05-15 18:26:00 +01:00
Henry Oswald	e1b3f3542c	added some logging	2014-05-15 18:14:05 +01:00
Henry Oswald	24c50189b6	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-05-15 18:01:49 +01:00
Henry Oswald	f7245f32d0	cleaned up old password reset cruft	2014-05-15 18:01:43 +01:00
Henry Oswald	96d98329f1	token based reset works	2014-05-15 17:58:25 +01:00
Henry Oswald	1ffd19099b	writen getUserIdFromToken	2014-05-15 17:20:42 +01:00
Henry Oswald	9f901fb1ba	added the token generator and its getNewToken function	2014-05-15 17:16:20 +01:00
Henry Oswald	64688e661d	written password reset controller	2014-05-15 16:50:38 +01:00
James Allen	e72dd50089	Use configurable uploads folder location	2014-05-15 16:32:17 +01:00
Henry Oswald	551e1d465a	written password reset handler	2014-05-15 16:20:23 +01:00
James Allen	93883c7a03	Fix calling of updateDoc	2014-05-15 15:43:04 +01:00
James Allen	f6e85c4140	Don't proxy version number to/from docstore	2014-05-15 12:44:08 +01:00
James Allen	4a27342b01	Merge branch 'docstore_integration'	2014-05-12 14:23:41 +01:00
James Allen	0bddc5552e	Use docstore for updating documents	2014-05-08 15:47:50 +01:00
James Allen	8315de58c7	Proxy get doc requests to the docstore	2014-05-08 13:42:30 +01:00
Henry Oswald	9a81f85b41	added gauge metrics for number of open socket.io http and https ... connections	2014-05-08 11:33:46 +01:00
Henry Oswald	a8571653db	added timeouts to filestore handler	2014-05-08 10:55:44 +01:00
James Allen	b29e94b4d5	Use new metrics package	2014-05-07 15:29:04 +01:00
James Allen	c73b7fae69	Use docstore when creating a new doc	2014-05-07 14:31:46 +01:00
James Allen	628fb65bc3	Work with ObjectId's passed to ProjectGetter	2014-05-06 13:34:37 +01:00
James Allen	2fb8b0e807	Get project without doc lines in getAllFolders	2014-05-06 13:15:18 +01:00
James Allen	6a2370b5be	Use docstore for CLSI request building	2014-05-06 12:54:26 +01:00
James Allen	ca6be52fa0	Revert "Revert "Get doclines from docstore when cloning project"" ... This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.	2014-05-06 12:36:00 +01:00
James Allen	8af372aff3	Revert "Revert "Get doc lines from docstore when performing batch operations"" ... This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.	2014-05-06 12:35:27 +01:00
James Allen	9be4feaae1	Revert "Get doc lines from docstore when performing batch operations" ... This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.	2014-05-01 17:19:21 +01:00
James Allen	fee632cfc9	Revert "Get doclines from docstore when cloning project" ... This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.	2014-05-01 17:19:09 +01:00
James Allen	82b56d0b4f	Get doclines from docstore when cloning project	2014-04-30 16:45:53 +01:00
James Allen	465b5ca9db	Get doc lines from docstore when performing batch operations	2014-04-30 15:49:07 +01:00
Henry Oswald	3b1cc6e500	removed metrics from http logging but added key in ... having the key in there means its easy to analyise the logs based on the route	2014-04-30 13:14:41 +01:00
James Allen	355a5a020e	Keep reference to deleted docs and delete via docstore	2014-04-30 11:15:29 +01:00
James Allen	0c0548ea85	Don't crash when route path is a regex	2014-04-30 09:42:20 +01:00
James Allen	f8dec76464	Add DocstoreManager	2014-04-29 17:22:37 +01:00
Henry Oswald	0b93a719f0	added statsd metrics timing for each request	2014-04-29 15:20:31 +01:00
Henry Oswald	2cdadf1a4b	check for error when doing a password reset	2014-04-29 11:59:23 +01:00
Henry Oswald	8cc055422c	removed word project from the label on project actions button	2014-04-29 11:37:02 +01:00
Henry Oswald	7896a8b85c	changed order of project list button menu	2014-04-29 11:11:20 +01:00
Henry Oswald	bf2c60f84d	added rename project to list page	2014-04-28 17:47:47 +01:00
Henry Oswald	3655e83ff9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-28 16:27:19 +01:00
Henry Oswald	a0fb170878	updated archive module to latest version	2014-04-28 16:27:15 +01:00
James Allen	64ab1a4f59	Remove restore warning message	2014-04-28 12:54:16 +01:00
James Allen	d528ac21a3	Mark projects as archived, but don't actually delete them	2014-04-28 12:53:43 +01:00
Yimin	295b438498	fix typo	2014-04-22 04:21:42 -05:00
Henry Oswald	0a093b779e	fixed #100, if tags is not running you should be able to delete a project still	2014-04-16 17:44:57 +01:00
Henry Oswald	8795a8a921	if retore url is not in mongo don't blow up	2014-04-15 14:19:20 +01:00
Henry Oswald	4b11790a54	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-15 13:59:04 +01:00
Henry Oswald	aca2e5639e	added referal allocator to user controller	2014-04-15 13:59:00 +01:00
James Allen	c249ea91f9	Restore button doesn't work	2014-04-14 06:28:36 +01:00
James Allen	ea651ee9bd	Add in restore page	2014-04-14 06:17:07 +01:00
James Allen	6aee795e67	Add project URL to message	2014-04-14 00:03:42 +01:00
James Allen	c750797ca4	Update message	2014-04-13 23:38:44 +01:00
Henry Oswald	c2cb6e2c1f	updated wording again	2014-04-13 23:18:13 +01:00
Henry Oswald	255b932079	added message explainging potential data reverted	2014-04-13 22:59:41 +01:00
Henry Oswald	c23f9aa056	be able to get build templates from web as well as templates	2014-04-11 15:15:32 +01:00
Henry Oswald	dbe2dd3078	fix case problem with require of newsletter manager	2014-04-10 22:21:20 +01:00
Henry Oswald	51e69392a7	cleaned up and fixed problem with open user opening pojrect	2014-04-10 17:49:39 +01:00
Henry Oswald	9355632f30	deleted user controller. The end of /controllers	2014-04-10 17:29:46 +01:00
Henry Oswald	f7ea925e67	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-10 17:26:14 +01:00
Henry Oswald	5df01acfe1	moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers	2014-04-10 17:26:09 +01:00
Henry Oswald	5760e51d6e	moved password change to new user controller with tests	2014-04-10 17:15:18 +01:00
Henry Oswald	cc68fe443f	Moved register function into user registration handler and new user ... controller	2014-04-10 16:32:47 +01:00
James Allen	573c877a57	Remove unneeded/broken stream.resume()	2014-04-10 12:57:49 +01:00
James Allen	049dcc2780	Split lines on Windows line endings too	2014-04-10 12:45:42 +01:00
Henry Oswald	2ca7c344a3	reformtted reg handler tests	2014-04-10 12:39:13 +01:00
Henry Oswald	b6b30c3d37	moved logout to new user controller	2014-04-09 16:59:28 +01:00
Henry Oswald	bb7025ad6e	moved user update user settings to user controller	2014-04-09 16:33:54 +01:00
Henry Oswald	bcfc1bee0c	moved unsubscribe endpoint to new user controller	2014-04-09 15:41:19 +01:00
Henry Oswald	026ad8089d	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-09 15:04:51 +01:00
Henry Oswald	12773c26c2	moved user settings page to the user pages controller	2014-04-09 15:04:47 +01:00
Henry Oswald	823f4a5eb9	created new UserController and put delete user in it	2014-04-09 14:50:12 +01:00
Henry Oswald	37fb959b00	renamed UserController to UserInfoController	2014-04-09 14:45:46 +01:00
Henry Oswald	c55c5032b0	moved delete user to the user controller	2014-04-09 14:43:08 +01:00
James Allen	79cb8270e5	Add in floating buttons for syncing between code and PDF	2014-04-09 12:35:33 +01:00
Henry Oswald	5f72f13528	moved password reset to user pages controller	2014-04-09 12:26:59 +01:00
Henry Oswald	434fca8874	moved login page to new user page controller	2014-04-09 12:22:57 +01:00
Henry Oswald	fa36891faf	moved register page to new UserPagesController	2014-04-09 12:17:50 +01:00
Henry Oswald	c163bba1da	populate users on a project in parallelLimit	2014-04-09 11:49:28 +01:00
Henry Oswald	47fb623c4b	dont call enable versioning on join project	2014-04-09 11:45:57 +01:00
Henry Oswald	cba3644777	updated building proj from template, no longer suport other domains and work in different envs	2014-04-09 08:24:23 +01:00
Henry Oswald	0668dec65e	killed project controller	2014-04-08 21:24:33 +01:00
Henry Oswald	5ac1b59a78	added err check to project list page	2014-04-08 21:06:01 +01:00
Henry Oswald	811859a4a1	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-08 20:52:06 +01:00
Henry Oswald	71af89902d	removed the buffering from update merger, shouldn't be needed in node 0.10	2014-04-08 20:52:02 +01:00
Henry Oswald	c0780f5a67	made project page load faaaaaaster	2014-04-08 18:02:16 +01:00
Henry Oswald	88ba45b9dc	moved load project from old proj controller to new one	2014-04-08 17:44:31 +01:00
Henry Oswald	a6bd916fbf	refactored project list, and updated sig for findAllUsersProjects to include err	2014-04-08 16:56:34 +01:00
James Allen	374cf99ef2	Double click on PDF syncs with code	2014-04-08 16:49:21 +01:00
Henry Oswald	0c921d9188	moved project list to new project controller and added tests	2014-04-08 16:40:12 +01:00
Henry Oswald	6b6c447901	clened up new project controller	2014-04-08 15:28:18 +01:00
Henry Oswald	15bddae931	moved new project from old proj controller to new one with test	2014-04-08 15:25:27 +01:00
Henry Oswald	6f84f4214f	moved clone project from old proj controller to new one with test	2014-04-08 14:53:33 +01:00
Henry Oswald	5b757ac7ab	moved delete project from old proj controller to new one with test	2014-04-08 14:34:03 +01:00
Henry Oswald	bc07525d71	broken dropbox endpoints for user into its own controller	2014-04-07 21:49:22 +01:00
Henry Oswald	6891d1bfb5	killed off project handler, also removed unused changeUsersPrivilegeLevel	2014-04-07 20:54:06 +01:00
Henry Oswald	248e81407a	leaving project fades it out from the list fix	2014-04-07 20:47:29 +01:00
Henry Oswald	430cf5cea8	created CollaboratorsHandler	2014-04-07 20:46:58 +01:00
Henry Oswald	ff88849444	added a change privlage level for user to new collab handler, won't work yet but is starting point	2014-04-07 16:54:51 +01:00
Henry Oswald	fa78db5c59	moved setPublicAccessLevel to project details handler	2014-04-07 16:07:44 +01:00
Henry Oswald	d229269a69	moved rename project to project details handler	2014-04-07 15:37:40 +01:00
Henry Oswald	9134fa7b4c	moved deleteProject to the project deleter	2014-04-07 13:47:10 +01:00
Henry Oswald	5378890e57	moved rename entity to proj entity handler	2014-04-07 12:18:24 +01:00
Henry Oswald	f28bd33168	remove confirmFolder from project handler, not used.	2014-04-07 12:01:10 +01:00
Henry Oswald	439d38441f	removed old getRawLogs socket.io endpoint	2014-04-07 11:59:49 +01:00
Henry Oswald	976054377d	removed unused getProject from projectHandler	2014-04-07 11:59:31 +01:00
Henry Oswald	4ff8b48d85	generate random password with uuid	2014-04-07 11:14:50 +01:00
Henry Oswald	1ce1a82617	moved admin controller into different feature	2014-04-07 11:02:12 +01:00
Henry Oswald	73bbd5b495	moved info and home controller into static page feature	2014-04-07 10:55:07 +01:00
Henry Oswald	abbbdf463f	Merge branch 'master' into i18n ... Conflicts: package.json	2014-04-07 09:53:03 +01:00
Henry Oswald	b36ced3058	only poll dropbox users who have the dropbox feature	2014-04-05 12:14:50 +01:00
Henry Oswald	33b6626fd9	killed CollaberationManager R.I.P	2014-04-04 17:08:14 +01:00
Henry Oswald	90eac4d52c	moved setRootDoc from collab manager to editor controller	2014-04-04 16:59:45 +01:00
Henry Oswald	7c10b5cd24	moved setPublicAccessLevel from collab manager to editor controller	2014-04-04 16:53:59 +01:00
Henry Oswald	08d1eeba78	moved renameProject from collab manager to editor controller	2014-04-04 16:49:44 +01:00
Henry Oswald	d684f04d4f	moved moveEntity from collab manager to editor controller	2014-04-04 16:40:53 +01:00
Henry Oswald	88e47bbe12	moved renameEntity from collab manager to editor controller	2014-04-04 16:35:02 +01:00
Henry Oswald	3983e77b73	move deleteProject from collab manager to editor controller	2014-04-04 16:21:30 +01:00
Henry Oswald	68271b04f9	deleted guid manager	2014-04-04 15:58:59 +01:00
Henry Oswald	615e05cb89	moved newsletter manager into its own feature	2014-04-04 15:47:27 +01:00
James Allen	e9309532d3	Make greyed out background the default track changes prompt	2014-04-04 10:39:56 +01:00
James Allen	186e39c202	Remove external ShareLaTeX pages	2014-04-03 11:43:04 +01:00
Henry Oswald	479b37a48c	null check user when getting user id from session	2014-04-02 15:56:54 +01:00
Henry Oswald	bd118a57c2	set compile throttle back to 10	2014-04-02 12:18:24 +01:00
Henry Oswald	250ce20ec0	fix wrong paths for couple of assets img -> brand	2014-04-02 12:08:54 +01:00
Henry Oswald	6c700b1b6b	updated more modules, mongojs and redis are the big ones	2014-04-01 16:23:13 +01:00
Henry Oswald	8ce13a6b1e	changed xss lib to sanitize not validator	2014-03-31 16:46:28 +01:00
Henry Oswald	077266b7c9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-31 10:55:09 +01:00
Henry Oswald	cd683cc719	check user isn't null in project controller	2014-03-31 10:54:49 +01:00
James Allen	2ca70f25f6	Make track changes default with override for old history	2014-03-31 09:47:36 +01:00
James Allen	3b079cde92	Change CLSI proxy errors to warnings	2014-03-28 16:04:44 +00:00
James Allen	6318d9ace1	Return features along with project details	2014-03-28 12:47:15 +00:00
James Allen	31f39dada1	Allow multi select of users in group page	2014-03-28 12:07:30 +00:00
James Allen	cc522f5d07	Add in debug pop up	2014-03-27 17:33:07 +00:00
James Allen	767b220fab	Allow CLSI cache to be cleared from within the editor	2014-03-27 17:00:41 +00:00
James Allen	7515586f3b	Add in direct link to bonus page	2014-03-27 16:04:10 +00:00
James Allen	6c77ee4861	Highlight the changed files in the file list view	2014-03-27 12:45:11 +00:00
Henry Oswald	c718535068	use github translate-sharelatex module	2014-03-26 17:30:25 +00:00
Henry Oswald	ebacf86485	changed i18n to use seperate translate module which holds the translations	2014-03-26 16:35:13 +00:00
Henry Oswald	721eda71f3	show the publish template area to all project owners	2014-03-26 16:01:10 +00:00
Henry Oswald	fe16bea798	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-26 15:52:58 +00:00
James Allen	0255e08e1f	Don't show upgrade prompts for non-owners	2014-03-26 13:20:08 +00:00
James Allen	0e54c4ae49	Set up history with AB testing for different methods of upgrading	2014-03-25 16:44:30 +00:00
James Allen	fe99be48ac	Add upgrade message to history for free users	2014-03-25 16:44:30 +00:00
Henry Oswald	ba1371744b	deal with users who may have been deleted but are still inside a subscription group	2014-03-25 16:19:30 +00:00
Henry Oswald	116458671c	callback is not defined, use next when there is an error in controller	2014-03-25 14:39:51 +00:00
Henry Oswald	76f0acd49d	Merge branch 'master' of github.com:sharelatex/web-sharelatex into i18n	2014-03-25 11:27:39 +00:00
Henry Oswald	f13f036e55	add public into project public access level issue #35	2014-03-25 11:01:16 +00:00
Henry Oswald	ea9ba59371	updated google anltyics experiment code	2014-03-24 22:24:09 +00:00
Henry Oswald	a86e95c711	added bulk of translations in with qqq info about them all	2014-03-24 19:30:47 +00:00
Henry Oswald	063a583ad3	got basic i18n working in express	2014-03-24 17:18:58 +00:00
Henry Oswald	2968fbcfff	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-24 15:24:01 +00:00
Henry Oswald	c68f2661a8	uri encode email and project names used in shared url	2014-03-24 15:23:50 +00:00
James Allen	66eb5e22f6	Always load font-awesome	2014-03-24 13:30:56 +00:00
James Allen	8a4dbf6618	Group changes by day for more concise display	2014-03-24 12:22:54 +00:00
James Allen	dc2dfaa66c	Flush project to track changes when leaving	2014-03-22 09:34:43 +00:00
Henry Oswald	8b706d6934	added some more event tracking in for google analytics	2014-03-21 18:33:53 +00:00
Henry Oswald	af659e7690	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-21 17:49:25 +00:00
Henry Oswald	4988fc4136	setup second plans page with free trial using google analytics experiements	2014-03-21 17:49:20 +00:00
James Allen	2a3e7ba9f3	Move restore button and logic into diff view	2014-03-21 14:31:04 +00:00
James Allen	c0686b6592	Load entire project history into change list view	2014-03-20 16:30:52 +00:00
Henry Oswald	04bdde4d0d	added logging around publishing templates and changed another templates-api -> templates	2014-03-20 12:53:23 +00:00
Henry Oswald	3c9f6e0ce0	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-18 15:09:50 +00:00
Henry Oswald	87167841d0	set holding account to false when registered	2014-03-18 15:09:44 +00:00
Henry Oswald	fc2b42400f	Merge pull request #54 from cwoac/nodemailer-passthrough ... Nodemailer passthrough	2014-03-18 13:09:14 +00:00
James Allen	ea0b0c2ec2	Fine tune logging	2014-03-17 12:50:30 +00:00
James Allen	5efd19ffc4	Update the styling and workflow around publishing a template	2014-03-14 14:42:38 +00:00
James Allen	7b2eef22a9	remove console.log debugging line	2014-03-14 12:25:25 +00:00
James Allen	498e0d4787	Fix unit tests	2014-03-14 11:56:15 +00:00
James Allen	4c76b88a2d	Log out incoming and outgoing real-time updates	2014-03-14 11:51:19 +00:00
James Allen	745d112d2b	Report client side ShareJs error back to server and log them out	2014-03-14 11:14:33 +00:00
James Allen	81fcafb476	Make track changes a feature flag	2014-03-13 13:58:57 +00:00
James Allen	7aab6c4c0b	Add in dropdown and context menu for files	2014-03-13 13:01:04 +00:00
Henry Oswald	4864eeba0a	check if files exist before fingerprinting them issue #75 on sharelatex	2014-03-13 12:38:16 +00:00
Henry Oswald	c237d04456	fingerprint brand/plans.css	2014-03-13 10:06:33 +00:00
Henry Oswald	f7545393f2	fix bad logging on email sender	2014-03-12 23:37:54 +00:00
Henry Oswald	fa6065b298	changed logging which was causing error, reading _id on null	2014-03-12 23:37:10 +00:00
Henry Oswald	b7104a82e9	added null check when filtering elements	2014-03-12 22:44:15 +00:00
Henry Oswald	d20286febd	stop response sending twice if compile takes a long time when testing	2014-03-12 21:56:58 +00:00
Henry Oswald	52cb1a4dcd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-12 21:33:27 +00:00
Henry Oswald	77aadf1845	plans.css trying to fingerprint wrong file	2014-03-12 21:33:15 +00:00
Oliver Matthews	efbb17a3b9	move all parameter handling to nodemailer.	2014-03-12 15:38:40 +00:00
James Allen	be64b510e8	Support the new update format from the track changes api	2014-03-11 18:01:14 +00:00
James Allen	afb8bb6a42	Add in restore button to track changes	2014-03-11 12:14:52 +00:00
Henry Oswald	e364fd9c5f	moved id for cancel selector to correct button	2014-03-11 11:47:24 +00:00
Henry Oswald	260c5210a6	changed ga tracking created -> subscribed, fixed indentation on cancel sub events	2014-03-11 11:22:03 +00:00
James Allen	417d76ab3f	Create (hopefully) more intuitive change selector	2014-03-10 14:59:01 +00:00
Henry Oswald	21ec74e51c	hooked up the recurly config to recurly.js correctly	2014-03-09 10:23:37 +00:00
Henry Oswald	3d0bd34b50	added event tracking to subscription cretion/cancelation	2014-03-09 09:56:58 +00:00
Henry Oswald	e7602321e9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-08 19:01:21 +00:00
Henry Oswald	0e7d241fcf	fixed has subscription check causing bad redirects ... subscription != recurlySubscription	2014-03-08 19:01:00 +00:00
Henry Oswald	f2069c6208	converted all analytics to use new google analytics, removing mixpanel ... and heap. Not tracking subscriptions or cancelations yet.	2014-03-08 19:00:26 +00:00
Henry Oswald	39cecfa5d8	fixed our -> out in about page	2014-03-08 18:09:02 +00:00
James Allen	9c20d1d604	Fix momentjs in project list view	2014-03-07 14:41:01 +00:00
Oliver Matthews	8989284e10	move from node-ses to nodemailer	2014-03-07 14:08:21 +00:00
James Allen	9851321429	Merge branch 'track_changes_integration'	2014-03-07 13:17:30 +00:00
James Allen	548d7d98a4	Allow history view to be closed	2014-03-07 13:05:59 +00:00
James Allen	ebe4e5b1d8	Show consistent colors for different users	2014-03-07 12:00:31 +00:00
James Allen	36faedeeb3	Make the history entries pretty	2014-03-07 11:24:11 +00:00
James Allen	be8035faa8	Include names in view	2014-03-06 18:13:07 +00:00
James Allen	9329213d94	Allow multiple diffs to be selected	2014-03-06 16:32:18 +00:00
Henry Oswald	7efa51fb62	Merge pull request #51 from cwoac/reduce_doclines_logging ... don't log doc contents if file is unchanged.	2014-03-06 12:50:52 +00:00
Henry Oswald	38d3bbb556	changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future	2014-03-06 12:28:07 +00:00
Henry Oswald	92928c35ab	removed old email tempaltes	2014-03-06 11:53:24 +00:00
Oliver Matthews	b73d7f23c3	don't log doc contents if file is unchanged.	2014-03-06 10:53:59 +00:00
Henry Oswald	f5e802a7d1	added null check for email property #ugly	2014-03-06 09:51:19 +00:00
Henry Oswald	9ae85abb74	got my email null check the wrong way around	2014-03-05 22:57:28 +00:00
Henry Oswald	e433eca157	added null checks into email sender for from address	2014-03-05 22:37:55 +00:00
James Allen	bf21305c68	Add in basic list of changes in track changes view	2014-03-05 17:55:47 +00:00
James Allen	8bf12f3286	Wrap editor in wrapper div and remove orchard CSS	2014-03-05 16:55:03 +00:00
James Allen	0468cbc300	Add in proxy to track changes api	2014-03-05 16:31:52 +00:00
Henry Oswald	32f9e33f71	removed heap analytics for the time being	2014-03-05 15:59:48 +00:00
Henry Oswald	64257a7b2c	testing out new google analytics	2014-03-05 15:45:24 +00:00
Henry Oswald	ffe690afa3	hooked up lifetime emails	2014-03-05 14:56:52 +00:00
Henry Oswald	274682a83d	deleted email manager	2014-03-05 12:07:09 +00:00
Henry Oswald	3431cf9070	share project email uses new email sender	2014-03-05 12:06:28 +00:00
Henry Oswald	8ba1a08245	hooked up password reset to use new email sending	2014-03-05 11:57:57 +00:00
Henry Oswald	3c18cc5553	email sending options are configurable from settings	2014-03-05 11:31:40 +00:00
Henry Oswald	5bacb2d784	added settings check on sending lifcycle emails out	2014-03-05 11:22:52 +00:00
Henry Oswald	eb92e5832b	renamed email templator -> email builder	2014-03-05 11:22:34 +00:00
Henry Oswald	360fac9510	setup basic new email feature which is tested, not linked up to real ... events yet	2014-03-04 18:10:06 +00:00
Henry Oswald	67e9d0724d	increased auto compile limits	2014-03-04 15:29:45 +00:00
Henry Oswald	149b51ddc6	put published date on template publishing area	2014-03-03 23:04:30 +00:00
Henry Oswald	413ef7440f	added a republish button to templates	2014-03-03 22:55:12 +00:00
Henry Oswald	a0805f97e0	added bulk removing of users to group admin panel	2014-03-03 17:48:48 +00:00
Henry Oswald	c991625a27	added uni message to plans page back in	2014-03-03 16:41:59 +00:00
Henry Oswald	99dc141693	deleteing user account cancels any subscription	2014-03-03 16:22:55 +00:00
Henry Oswald	dd22f1f7a1	added redis connection settings into rate limiter	2014-03-03 11:46:40 +00:00
Henry Oswald	ff8320bce0	added new rate limit file based on redback. converetd auto compile to ... use it.	2014-02-28 17:59:54 +00:00
Henry Oswald	aa0d26d5ab	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-02-27 17:35:48 +00:00
Henry Oswald	303a0e985b	improved the publish button process so it talks to the templates-api and lets the user know what is going on	2014-02-27 17:35:35 +00:00
Henry Oswald	cfe13af6ff	Merge pull request #45 from chid/crash-fix ... add proper error handlers to the UserController class	2014-02-26 11:21:23 +00:00
Henry Oswald	cad8e0eb1c	Update bonus.jade - remove extra comma	2014-02-26 08:52:57 +00:00
Charley Peng	fa80b0c3d2	fixing incorrectly written variable	2014-02-26 08:58:51 +11:00
James Allen	128c982ba2	Add open source banner to footer	2014-02-22 11:26:36 +00:00
James Allen	ca1ebd0413	Take default features from settings	2014-02-22 10:50:59 +00:00
Henry Oswald	029077fe6e	downloading a file now sets the filename in header correctly	2014-02-20 22:33:12 +00:00
Henry Oswald	a9c48d666d	fixed broken delete effect due to project id quotes being rendered twice for some unknow reason	2014-02-20 21:26:26 +00:00
James Allen	d249158676	Don't try to fingerprint plans.css	2014-02-18 17:37:39 +00:00
Henry Oswald	347671c89b	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-02-14 18:13:33 +00:00
Henry Oswald	65f849aad0	fixed bug where file uploader was calling cb on read stream not write stream, race condition created.	2014-02-14 18:13:22 +00:00
James Allen	fd911c278f	Move copyright images into brand directory	2014-02-14 11:44:09 +00:00
James Allen	4ec7deb7d6	Move plans.css to brand folder	2014-02-14 11:36:06 +00:00
James Allen	5ea231dea6	Sort iconshock icons into directory and add credit	2014-02-13 18:18:05 +00:00
James Allen	6eff979e2a	Move nide images into one folder	2014-02-13 15:35:44 +00:00
James Allen	7fb0dadbfd	Remove unneeded image files	2014-02-13 14:47:29 +00:00
Henry Oswald	b46f320882	linked to my twitter on about page	2014-02-13 14:32:07 +00:00
Henry Oswald	3c98dfec90	add Monendra to security acknowledgements list	2014-02-13 14:31:23 +00:00
James Allen	768fd20850	Allow NewletterManager to be called without a callback	2014-02-13 12:37:23 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00
Charley Peng	3f6e240401	adding callback on error	2007-03-01 16:53:59 +11:00