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
5cf82e4ef7
Add Metabase events
2016-10-24 11:08:19 +01:00
Shane Kilkelly
8dfd487941
Add plan to event tracking
2016-10-24 11:00:09 +01:00
Shane Kilkelly
c1ebc65a3b
Move convert to top
2016-10-24 10:41:32 +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
Henry Oswald
d0f9a07197
turn subscriptions off by default
2016-10-12 17:35:40 +01:00
Shane Kilkelly
a4e3bf3458
Merge pull request #341 from sharelatex/sk-end-subform-test
...
Remove old default subscription form, replace with 'simple' form
2016-10-12 14:43:27 +01:00
Shane Kilkelly
3ec0e65ae1
Merge branch 'master' into sk-end-subform-test
2016-10-12 14:34:55 +01:00
James Allen
bf0fba2c89
Minify correct version of Ace
2016-10-12 09:52:15 +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
James Allen
436d63fa12
Merge pull request #339 from sharelatex/ja-fix-accent-keys
...
Patch Ace to fix accent key problem in Chrome
2016-10-12 09:21:33 +01:00
Shane Kilkelly
e706057677
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2016-10-11 14:44:09 +01:00
Brian Gough
ed262409de
Merge pull request #342 from sharelatex/bg-provide-default-requirejs-config
...
use separate jade template block for requirejs
2016-10-11 14:42:40 +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
Shane Kilkelly
e2cf40ff33
Remove old default subscription form, replace with 'simple' form
2016-10-11 14:07:31 +01:00
Brian Gough
452f6117cd
remove console.log
2016-10-11 13:56:17 +01:00
Brian Gough
cd01137e7d
Merge pull request #340 from sharelatex/bg-provide-default-requirejs-config
...
provide default requirejs config
2016-10-11 13:29:47 +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
0fbbad33ff
Use built in Ace browser detection
2016-10-11 11:40:26 +01:00
Paulo Reis
e26eda5754
Update regex to grab Chrome version.
2016-10-11 11:34:33 +01:00
James Allen
0b6c71f688
Patch Ace to fix accent key problem in Chrome
2016-10-11 11:17:38 +01:00
James Allen
65bc8a84db
Merge pull request #332 from MCribbin/patch-4
...
Update HumanReadableLogsRules.coffee
2016-10-11 11:11:10 +01:00
James Allen
cd33029678
Merge pull request #337 from MCribbin/patch-5
...
Update HumanReadableLogsRules.coffee
2016-10-11 11:10:44 +01:00
James Allen
32d7bb16e5
Be more explicit with query string to turn on track changes
2016-10-11 09:40:15 +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
0995ba5ee6
Add basic change tracking into editor behind a feature flag
2016-10-10 17:06:46 +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
017c29b804
Merge pull request #336 from sharelatex/sk-session-button
...
Sk session button
2016-10-10 15:20:25 +01:00
Shane Kilkelly
c4fd9f3bce
Merge branch 'master' into sk-session-button
2016-10-10 14:49:55 +01:00
MCribbin
0d5e6e2abf
Update HumanReadableLogsRules.coffee
2016-10-10 13:31:38 +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
Shane Kilkelly
0f65e98566
add acceptance test for clearing sessions
2016-10-10 10:55:45 +01:00
James Allen
220759ee7a
Merge pull request #330 from sharelatex/ja-non-english-spell-check
...
Use comprehensive unicode letter regex for spell check matching
2016-10-10 08:54:56 +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
fe866e54fc
add latex syntax checking
2016-10-06 14:56:24 +01:00
Brian Gough
8c7d712738
update live version of ace to 1.2.5
2016-10-06 14:20:23 +01:00
Brian Gough
8ab0a396a1
added versioned directory for ace 1.2.5
2016-10-06 14:19:10 +01:00
Brian Gough
fc5f7b5df5
don't ignore files under js/ace directory in git
2016-10-06 14:19:10 +01:00
