Commit graph

6518 commits

Author SHA1 Message Date
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
Hayden Faulds
41654eb281 Merge pull request #552 from sharelatex/hof-atomic-project-creation
accept attributes rather than projectHistoryId to ProjectCreationHandler
2018-05-10 15:01:45 +01:00
Hayden Faulds
9ccdf073c4 accept attributes rather than projectHistoryId to ProjectCreationHandler 2018-05-10 11:39:23 +01:00
James Allen
78aefc2871 Merge pull request #542 from sharelatex/ja-match-front-to-v1
Update font and line spacing in Ace to match OL v1
2018-05-09 12:24:37 +01:00
James Allen
1e0e006eef Merge pull request #534 from sharelatex/ja-recompile-on-w
Recompile one Cmd-S, :w and Ctrl-. for v1 compatibility
2018-05-09 12:24:29 +01:00
Brian Gough
3144922bcd Merge pull request #535 from sharelatex/bg-fix-project-structure-updates-for-folder-delete
fix project structure version when deleting folder
2018-05-08 14:22:43 +01:00
Brian Gough
2bb2d9615f added comment about using a project entity iterator 2018-05-08 13:37:33 +01:00
Brian Gough
f34ce5b12b rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity 2018-05-08 13:37:33 +01:00
Brian Gough
1278e2da45 fix project structure version when deleting folder 2018-05-08 13:37:33 +01:00
Brian Gough
24764f66ff Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager
improve locking in web
2018-05-08 11:11:32 +01:00
Hugh O'Brien
57f07fb5fe Merge pull request #518 from sharelatex/hob-publish-modal-qs
Publish modal accessible from query string
2018-05-08 09:40:41 +01:00
Brian Gough
afd4a10a19 retry lock with exponential backoff 2018-05-04 15:02:36 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
James Allen
b847638ed1 Clean up comments and callbacks 2018-05-04 13:31:26 +01:00
Brian Gough
e414100c41 add support for unique lock values 2018-05-04 13:22:33 +01:00
James Allen
7e250be66d Update font and line spacing in Ace to match OL v1 2018-05-03 17:04:49 +01:00
James Allen
42ac8faaae Add dependency mapping for vim keybindings 2018-05-03 17:01:34 +01:00
James Allen
8ecd073efc Support Ctrl-. to compile for v1 compabitility 2018-05-03 12:28:14 +01:00
James Allen
09486f2eea Recompile on Cmd-S and :w 2018-05-03 12:20:53 +01:00
Hayden Faulds
7c93c92c6a Merge pull request #531 from sharelatex/hof-custom-retry
add V1HistoryNotSyncedError
2018-05-02 14:01:07 +01:00
Hayden Faulds
ba0e06d0fe add V1HistoryNotSyncedError 2018-05-02 13:18:43 +01:00
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
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