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
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
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
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
Paulo Reis
b5494c1730
Basic test mark-up structure.
2016-10-26 15:48:03 +01:00
Shane Kilkelly
d912c3b487
Merge branch 'master' into sk-plans-tidy
2016-10-26 13:47:26 +01:00
Shane Kilkelly
7cc26f2207
Disable autocomplete on user-delete form
2016-10-26 10:57:54 +01:00
Shane Kilkelly
1c8721ceab
Functioning account deletion with password
2016-10-25 16:23:50 +01:00
Shane Kilkelly
efe6df145c
WIP: ask for password when deleting account
2016-10-25 14:33:47 +01:00
Brian Gough
a02d245b78
added missing dependency on ace/ace for modelist
2016-10-25 14:16:52 +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
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
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
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
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
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
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
Shane Kilkelly
c4fd9f3bce
Merge branch 'master' into sk-session-button
2016-10-10 14:49:55 +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
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
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
