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
|
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 |
|
Paulo Jorge Reis
|
a274e0e175
|
Merge pull request #353 from sharelatex/pr-ab-test-history-teaser
AB test history teaser
|
2016-10-28 09:08:26 +01:00 |
|
Brian Gough
|
8887ab78c0
|
improve ace mode recognition
|
2016-10-27 15:42:19 +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
|
ad33aa1bb8
|
Move Metabase tracking code.
|
2016-10-27 12:22:58 +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 |
|
Shane Kilkelly
|
2029ec2535
|
Merge branch 'sk-plans-tidy'
|
2016-10-27 10:42:29 +01:00 |
|
Paulo Reis
|
04f8b3adfa
|
Adapt mark-up to history teaser, add some styles.
|
2016-10-27 10:30:10 +01:00 |
|
Paulo Reis
|
702f0aa39b
|
Generalize teaser style.
|
2016-10-27 10:29:38 +01:00 |
|
Paulo Reis
|
9f4299b69a
|
Add history teaser image.
|
2016-10-27 10:29:04 +01:00 |
|
Shane Kilkelly
|
f396f5b09e
|
update prices in front-end
|
2016-10-27 09:57:46 +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 |
|
Brian Gough
|
eab7d46fc5
|
update latex syntax validator (e4b016e)
|
2016-10-26 15:15:18 +01:00 |
|
Brian Gough
|
cb4380fa78
|
fix problem with setting syntax validation option
|
2016-10-26 15:08:29 +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 |
|
James Allen
|
c9925a3590
|
Handle reporting of cyclic objects to Sentry
|
2016-10-26 11:34:05 +01:00 |
|
Shane Kilkelly
|
dc62b1a86e
|
Remove deprecated endpoint for old delete-user
|
2016-10-26 11:18:36 +01:00 |
|
Shane Kilkelly
|
a4167fcccd
|
Unit tests for tryDeleteUser
|
2016-10-26 11:01:35 +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 |
|
James Allen
|
032165c930
|
Merge pull request #349 from sharelatex/ja-real-time-reconnects
Reconnect gracefully when asked to by real-time
|
2016-10-26 10:04:25 +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
|
238e07ddde
|
Save syntax checking as a user setting.
|
2016-10-25 14:59:20 +01:00 |
|
Shane Kilkelly
|
efe6df145c
|
WIP: ask for password when deleting account
|
2016-10-25 14:33:47 +01:00 |
|
Paulo Jorge Reis
|
92c4c3db69
|
Merge pull request #350 from sharelatex/pr-fix-overflow-proj-name
Prevent overflowing project names.
|
2016-10-25 14:31:33 +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 |
|
James Allen
|
43aeb5a21d
|
Clear SERVERID cookie when reconnecting gracefully
|
2016-10-25 14:09:36 +01:00 |
|
Brian Gough
|
7d2b453030
|
update ace latex syntax checking (d18cb91)
|
2016-10-25 13:58:37 +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
|
ae2d030a32
|
Don't call participate if should not test plans
|
2016-10-25 11:46:52 +01:00 |
|
Shane Kilkelly
|
e268275e77
|
Fix participate/convert flow for plan tests
|
2016-10-25 10:47:14 +01:00 |
|
Shane Kilkelly
|
c091399610
|
Remove track-changes-discount experiment
|
2016-10-25 09:47:22 +01:00 |
|
Henry Oswald
|
1c3edcd627
|
added some debug lines
|
2016-10-24 23:36:49 +01:00 |
|
Paulo Reis
|
4e62e5c4c5
|
Prevent overflowing project names.
|
2016-10-24 17:08:46 +01:00 |
|
James Allen
|
52754e038a
|
Reconnect gracefully when asked to by real-time
|
2016-10-24 16:36:40 +01:00 |
|