Shane Kilkelly
8ea690a745
Merge pull request #527 from sharelatex/sk-fix-chat-link-color-in-v2
...
Make links in chat messages white (same as text), with underline
2018-05-01 15:39:19 +01:00
Shane Kilkelly
1c31012135
Merge branch 'master' into sk-fix-chat-link-color-in-v2
2018-05-01 15:23:42 +01:00
Shane Kilkelly
af70ef0dc4
Add templates to the hasFeature function
2018-05-01 14:01:52 +01:00
Shane Kilkelly
387108da48
Make links in chat messages white (same as text), with underline
2018-05-01 10:16:56 +01:00
James Allen
40da785363
Fix test for sampling front users
2018-05-01 09:02:43 +01:00
James Allen
dfc2b8631b
Merge pull request #521 from sharelatex/as-watch-modules-coffee
...
Add modules public/coffee dir to nodemon frontend watch
2018-05-01 08:50:31 +01:00
James Allen
d2e54c5e0c
Merge pull request #504 from sharelatex/afc-show-group-export-csv
...
Show export user CSV even if the group has reached max capacity
2018-05-01 08:50:04 +01:00
James Allen
4c7364fd01
Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits
...
Re-order compile rate limits
2018-05-01 08:48:22 +01:00
James Allen
a294fe795c
Merge pull request #519 from sharelatex/ja-relative-dates-in-v2
...
Display last modified as a relative date in v2
2018-05-01 08:48:14 +01:00
James Allen
b332f0af86
Merge pull request #525 from sharelatex/ja-sample-users-for-feedback
...
Show front widget for paid and sampled free users
2018-05-01 08:48:05 +01:00
James Allen
d454be8053
Bring down proportion to 10%
2018-04-30 17:19:21 +01:00
James Allen
6399621d1f
Show front widget for paid and sampled free users
2018-04-30 17:13:57 +01:00
Alasdair Smith
b2e3997e83
Add modules public/coffee dir to nodemon frontend watch
2018-04-30 10:18:06 +01:00
James Allen
5c87a2aa90
Display last modified as a relative date in v2
2018-04-27 16:50:46 +01:00
hugh-obrien
157efa6d96
make publish modal accessible from query string
2018-04-27 15:50:11 +01:00
Hugh O'Brien
5a580b6ef9
Merge pull request #517 from sharelatex/hob-publish-menu-style
...
Remove ol-variables which cause style problems in SL
2018-04-27 14:54:30 +01:00
hugh-obrien
e76a15e4e0
remove ol core variables
2018-04-27 14:50:52 +01:00
Hugh O'Brien
780b377cf2
Merge pull request #515 from sharelatex/hob-publish-menu-style
...
Basic publish menu styling
2018-04-27 14:25:34 +01:00
hugh-obrien
ea2e585699
basic publish menu styling
2018-04-27 13:37:08 +01:00
Alasdair Smith
4759097e49
Merge pull request #494 from sharelatex/as-main-role
...
Add main role
2018-04-25 09:45:17 +01:00
Henry Oswald
c6f4df4f77
Merge pull request #498 from sharelatex/ho-recurly-v4
...
Payment page improvments
2018-04-24 09:01:34 +01:00
Jessica Lawshe
8bedd99d73
Merge pull request #492 from sharelatex/jel-annual-buy-text
...
Update button text for annual plan
2018-04-23 11:35:09 -05:00
Jessica Lawshe
2d67b1e82f
Merge pull request #501 from sharelatex/jel-v1-folders
...
Remove v1 folder management
2018-04-23 11:34:54 -05:00
Jessica Lawshe
5d5edb7808
Button text for annual plan
...
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.
Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994
Don't include v1 folders in "Add to folders" list
2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309
Don't show dropdown for v1 folders
2018-04-23 11:34:10 -05:00
Jessica Lawshe
820f9c7acc
Merge pull request #506 from sharelatex/as-document-event-emitter
...
Add documentation and tests of EventEmitter implementation
2018-04-23 11:33:40 -05:00
Alasdair Smith
152c816b5c
Add documentation and tests of EventEmitter implementation
2018-04-23 11:01:19 +01:00
Alberto Fernández-Capel
5fb368d1f2
Merge pull request #505 from sharelatex/afc-travisci
...
Fix build in travisci
2018-04-23 10:50:59 +01:00
Alasdair Smith
ad1df3532f
Merge pull request #490 from sharelatex/hof-deleted-project-history
...
Pass project history id with updates
2018-04-23 10:05:07 +01:00
Alasdair Smith
b0349af21d
Merge pull request #493 from sharelatex/as-editor-toolbar
...
Add toggle switch directive to editor toolbar
2018-04-23 10:04:12 +01:00
Alasdair Smith
61648e1f19
Merge pull request #497 from sharelatex/as-naming-consistency
...
Include snake_case named file in frontend tests
2018-04-23 10:03:54 +01:00
Alberto Fernández Capel
4db146dd51
Do not specify node version in .travis.yml
...
That way, travis uses the version specified in .nvmrc
2018-04-19 12:30:31 +01:00
Alberto Fernández Capel
5d266c7f04
Show export user CSV even if the group has reached max capacity
2018-04-17 16:12:33 +01:00
Alasdair Smith
d524249fc8
Include snake_case named tests
2018-04-17 15:03:52 +01:00
James Allen
d9a7b1248a
Re-order compile rate limits to do project/user check before everyone check
2018-04-17 14:43:54 +01:00
Henry Oswald
b5e6181c49
added .capitalised style
2018-04-17 11:26:02 +01:00
James Allen
37f009c3cd
Remove blank test causing race condition
2018-04-17 10:00:06 +01:00
James Allen
7364f607d0
Merge pull request #499 from sharelatex/ja-restore-files-fix
...
Fix doc open looping bug and tests for restoring files
2018-04-17 09:34:11 +01:00
James Allen
87cc08569a
Fix bad if statement sending doc open into infinite loop
2018-04-16 17:03:18 +01:00
James Allen
d6605610f5
Fix HistoryV2Manager front end tests
2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c
Fix RestoreManager unit tests
2018-04-16 16:27:24 +01:00
James Allen
f7a3231b42
Merge pull request #391 from sharelatex/ja-restore-files
...
Restore deletes files from their contents in project-history/OL history
2018-04-16 16:14:50 +01:00
James Allen
9e525702c1
Merge branch 'master' into ja-restore-files
2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27
change country select to proper angular setup so pre population works
...
it may have been broken from an angular upgrade or similar.
2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352
capitalise month and year on payment page
2018-04-16 15:11:31 +01:00
Alasdair Smith
39342b0219
Merge pull request #484 from sharelatex/as-register-hashed-files
...
Add system for registering hashed asset files
2018-04-16 15:05:25 +01:00
Alasdair Smith
3af10733cc
Replace hard coded rich text hashed file path with registration system
2018-04-16 14:14:49 +01:00
Henry Oswald
a45dc69e4d
Merge pull request #495 from sharelatex/ho-recurly-v4
...
change to plans[currencyCode]['symbol'] from price.currency.symbol
2018-04-16 12:31:42 +01:00
Henry Oswald
39e41681a0
change to plans[currencyCode]['symbol'] from price.currency.symbol
...
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
2018-04-16 12:19:55 +01:00
