Henry Oswald
91e9447fe5
added logging to smoke test
2016-10-21 19:20:21 +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
9dd06df839
More style adjustments.
2016-10-21 15:00:26 +01:00
Paulo Reis
777b28b443
Add animation and other styling items. Small refactor with Less vars.
2016-10-21 12:02:53 +01:00
James Allen
2ac405e58c
Allow track changes to be toggled on and off
2016-10-20 16:59:58 +01:00
Paulo Reis
ac07ba035b
Navigation in onboarding UI.
2016-10-20 16:39:43 +01:00
Brian Gough
e9b5fc056d
fold aceEditor resetSession into session set up
...
it is not used elsewhere, and mode setting is now done during the
initialisation.
2016-10-20 16:03:55 +01:00
Brian Gough
7258e947a8
use ace modelist extension to auto-detect mode
2016-10-20 16:03:19 +01:00
James Allen
60a81beb11
Try out different styling for highlights
2016-10-20 15:18:45 +01:00
James Allen
8f9a4882c8
Don't let widgets in review panel overlap
2016-10-20 15:04:10 +01:00
Brian Gough
84f986058a
enable pdfjs cmaps in pdfRenderer
2016-10-20 12:55:58 +01:00
Brian Gough
4d551ced5e
add pdfjs cmaps
2016-10-20 12:53:34 +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
52f3fe7303
Show different users changes in different colours
2016-10-20 12:15:22 +01:00
Brian Gough
3a07b785db
disable auto insert of brackets and quotes in ace
2016-10-20 11:33:12 +01:00
James Allen
193766b437
Don't switch back to editor view when selecting a file in the history view
2016-10-19 10:43:53 +01:00
James Allen
c88624bf4c
Pass through the data needed to trackChangesManager to determine if a remote was local or remote
2016-10-18 18:01:52 +01:00
James Allen
e717caab7f
Merge branch 'master' into ja-review-panel
2016-10-18 16:52:41 +01:00
James Allen
05cd6e69a7
Add in extra sentry logging for undefined start in aceDelta
2016-10-18 16:37:40 +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
29080bafb2
use PDFJS text layer renderer instead of our own
2016-10-14 12:00:47 +01:00
Brian Gough
e42d256d4f
remove pdfjs-1.0.712 no longer used
2016-10-13 16:10:02 +01:00
Brian Gough
1bbf237943
remove pdfjs-1.0.1040 no longer used
2016-10-13 16:10:02 +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
c98f40b90b
use a single pdfjs worker, rotated to avoid leaks
2016-10-13 16:10:02 +01:00
Brian Gough
85d8c2ed2e
pass in PDFJS as a module, not global
2016-10-13 16:10:01 +01:00
Brian Gough
71275efebe
remove unused pdf dependency
2016-10-13 16:10:01 +01:00
Brian Gough
27a8dc1dfd
upgrade pdfjs to 1.6.210p1
2016-10-13 16:10:01 +01:00
Brian Gough
5748d1e7ec
add pdfjs 1.6.210 (patched with font fix)
2016-10-13 16:10:01 +01:00
Brian Gough
f31e3260ee
remove pdfjs special case disableFontFace for MSIE
2016-10-13 16:10:01 +01:00
Brian Gough
4ca918a3b8
render canvas on-screen to avoid bad fonts in MSIE
2016-10-13 14:40:57 +01:00
James Allen
09195882f4
Add scrollbar todo note
2016-10-13 14:25:46 +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
42ab2e8165
Init review panel with ace editor height
2016-10-13 12:21:49 +01:00
James Allen
77c02042f8
Recalculate change offsets on editor resize
2016-10-13 12:09:18 +01:00
James Allen
8d968f6865
Tidy up ReviewPanelController
2016-10-13 10:09:59 +01:00
Henry Oswald
d0f9a07197
turn subscriptions off by default
2016-10-12 17:35:40 +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
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
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
452f6117cd
remove console.log
2016-10-11 13:56:17 +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
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
MCribbin
fba22dc11f
Update HumanReadableLogsRules.coffee
2016-10-06 12:29:42 +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
MCribbin
1ce8901c2a
Update HumanReadableLogsRules.coffee
2016-10-05 14:12:49 +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
Shane Kilkelly
73bb11e4a0
Ask user to type their email when deleting account, not "DELETE"
2016-10-04 15:57:08 +01:00
Paulo Reis
ef1aab1c27
Track header AB conversions only on click events.
2016-10-04 14:42:01 +01:00
Paulo Jorge Reis
38925feccd
Merge pull request #331 from sharelatex/pr-ab-test-dropbox-teaser
...
AB test dropbox teaser
2016-10-04 14:35:05 +01:00
Paulo Reis
3925ba9364
Add assets for animated dropbox teaser.
2016-10-04 11:58:19 +01:00
Paulo Reis
ea8277ef78
Add assets for focused dropbox teaser.
2016-10-04 11:57:42 +01:00
James Allen
201012a131
Use comprehensive unicode letter regex for spell check matching
2016-10-04 11:24:48 +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
Henry Oswald
ed906f085c
fix spelling mistake in error message and comment out settings.defaults
2016-10-03 11:33:14 +01:00
James Allen
5188a138de
Merge pull request #327 from sharelatex/ja-log-parser-improvements
...
Update log parser to better handle Runaway argument errors
2016-10-03 09:26:52 +01:00
James Allen
1e1c4ec570
Disable font face in PDFs for IE 11 as well
2016-09-30 15:12:27 +01:00
James Allen
901e32a050
Merge pull request #326 from sharelatex/ho-fingerprintmultiple
...
Ho fingerprintmultiple
2016-09-28 09:58:03 +01:00
Paulo Reis
cdd873a1cf
Small style adjustments in the labels AB test.
2016-09-28 09:31:59 +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
270bf81667
Cleanup.
2016-09-27 16:12:45 +01:00
Paulo Reis
b6d237e189
More granular tracking, in metabase.
2016-09-27 16:01:56 +01:00
Shane Kilkelly
b497182557
Add an acceptance test for registration and login
2016-09-27 11:55:51 +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
23671c7b18
Label styling.
2016-09-26 15:03:04 +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
975b70e4fe
add latex syntax highlighting
2016-09-23 15:19:40 +01:00
Brian Gough
d152095920
destroy ace sessions when no longer in use
...
also set mode to "latex" when session is created, to avoid setting mode
to "text" (default) and then to "latex" which causes the text worker to
be unnecessarily created and destroyed.
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
6e8185aeaf
Merge branch 'master' into sk-passport
2016-09-23 10:28:35 +01:00
Shane Kilkelly
6c716ca252
Fix acceptance tests by updating invite-accept url
2016-09-23 10:28:17 +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
Paulo Jorge Reis
f4ff72a2e4
Merge pull request #318 from sharelatex/ja-invite-emails-once
...
Ja invite emails once
2016-09-22 17:36:10 +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
7e449c60ed
fix tests
2016-09-22 16:04:42 +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