Commit Graph

6735 Commits

Author SHA1 Message Date
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