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
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
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
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
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
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
8c7d712738
update live version of ace to 1.2.5
2016-10-06 14:20:23 +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
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
Paulo Reis
ef1aab1c27
Track header AB conversions only on click events.
2016-10-04 14:42:01 +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
James Allen
901e32a050
Merge pull request #326 from sharelatex/ho-fingerprintmultiple
...
Ho fingerprintmultiple
2016-09-28 09:58:03 +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
b6d237e189
More granular tracking, in metabase.
2016-09-27 16:01:56 +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
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