Hayden Faulds
817840840a
use LockManger.runWithLock
2018-01-09 16:37:34 +00:00
James Allen
4235f80b52
Merge pull request #254 from sharelatex/ja-remove-dead-files
...
Remove some unused files
2018-01-09 14:49:50 +00:00
James Allen
c6b6b95dec
Remove some unused files
2018-01-09 14:19:23 +00:00
Nate Stemen
c43aa54bee
Merge branch 'ns-fix-package-command-meta'
2018-01-08 08:53:42 -05:00
Nate Stemen
7af615ff6c
Merge branch 'ns-no-duplicate-packages'
2018-01-08 08:53:07 -05:00
Nate Stemen
cf4d6c1165
Merge branch 'master' into ns-no-duplicate-packages
2018-01-05 11:46:44 -05:00
Alberto Fernández Capel
6d007bfe74
DRY logic to get subscription from Recurly
...
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736
Fix subscription page for members of a group
...
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.
SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
James Allen
626e0a16ef
Fix acceptance test when overleaf setting not present
2018-01-04 15:49:31 +00:00
James Allen
e58f6cab47
Merge pull request #248 from sharelatex/ja-disable-import-dialog
...
Don't show import dialog for projects, just link to v1 editor
2018-01-04 15:22:48 +00:00
James Allen
e2f27becac
Merge pull request #249 from sharelatex/ja-enable-history-display-on-create
...
Enable project history for new projects if enabled in settings
2018-01-04 15:21:19 +00:00
James Allen
692182c784
Show apology message instead of raw binary files
2018-01-04 10:53:49 +00:00
James Allen
967353d080
Update comment to use button for import dialog for a11y
2018-01-03 17:06:51 +00:00
James Allen
bbfcff30fb
Enable project history for new projects if enabled in settings
2018-01-03 16:55:33 +00:00
James Allen
f0d7658bdd
Don't show import dialog for projects, just link to v1 editor
2018-01-03 16:46:26 +00:00
Paulo Reis
8b9f3268b1
Make plans page consistent with others, fixing header issues.
2018-01-03 13:54:33 +00:00
Paulo Reis
b73a56f70c
Take header height into account in the main page masthead; avoid margin collapsing.
2018-01-03 12:12:45 +00:00
James Allen
0f1b0be231
Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging
...
Change an erroneous `logger.error` to `logger.log`; Fixes #227
2018-01-03 11:30:46 +00:00
James Allen
7918232757
Merge pull request #240 from sharelatex/pr-v2-styling-fixes
...
v2 styling fixes
2018-01-03 11:30:39 +00:00
James Allen
ada76e820a
Merge pull request #238 from sharelatex/as-ol-emails
...
v2 themed emails
2018-01-03 11:30:28 +00:00
James Allen
882286afb1
Merge pull request #245 from sharelatex/as-autocompile-rollout-100
...
Increase autocompile rollout to 100%
2018-01-03 11:30:10 +00:00
James Allen
2dcc17ad09
Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history
...
Handle deleted and renamed files better in v2 history UI; Fixes #226
2018-01-03 11:29:59 +00:00
Alasdair Smith
b2d92ea482
Increase autocompile rollout to 100%
2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0
lock project when uploading a file
2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04
Ensure the dirname is not affected when we rename an entity
...
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
2017-12-22 14:24:00 +00:00
Nate Stemen
d2ee03d9b9
make commandNames object for fast lookups
2017-12-21 15:51:50 -05:00
Alasdair Smith
562534034f
Stub out brandPrefix for email tests
2017-12-21 17:18:10 +00:00
Paulo Reis
0484b46027
Redundancy.
2017-12-21 13:52:34 +00:00
Paulo Reis
399ebc473f
Center global alerts in v2.
2017-12-21 13:38:40 +00:00
Paulo Reis
baa57c56aa
Improve dropdown spacing in v2.
2017-12-21 13:34:11 +00:00
Paulo Reis
f5751c34a9
Make inline tags look nicer with v2 typography.
2017-12-21 12:57:33 +00:00
Paulo Reis
484d34e296
Only render announcements in SL.
2017-12-21 12:57:07 +00:00
Alasdair Smith
8c29b93ae9
Merge pull request #216 from sharelatex/as-update-v2-copy
...
Update v2 copy
2017-12-21 12:00:04 +00:00
Alasdair Smith
1be9e29f35
Switch from button to link to fit better
2017-12-21 11:10:23 +00:00
Paulo Reis
d5502fd502
Make layout work nicely without navbar (content BG now expands to the top).
2017-12-21 11:03:27 +00:00
Alasdair Smith
fb23b30c45
Merge branch 'master' into as-update-v2-copy
2017-12-21 10:57:16 +00:00
Alasdair Smith
0114ed362f
Swap out email templates based on brand prefix
2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48
Fix OL auto-linking styles
2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824
Change an erroneous logger.error to logger.log
2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146
Add OL themed email templates
2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1
Clean up whitespace
2017-12-20 17:52:49 +00:00
James Allen
e6281911f0
Add history-file-tree.pug
2017-12-20 16:42:23 +00:00
James Allen
940b22ef95
Remove debug line
2017-12-20 16:42:09 +00:00
James Allen
d0fee7e76c
Show a file tree of changed paths, so we can work with renamed and deleted files
2017-12-20 16:22:32 +00:00
Paulo Reis
70b755603d
Fix empty project list card.
2017-12-20 16:03:12 +00:00
Paulo Reis
d22a9acc76
Highlight project name a little, style renaming widget in v2.
2017-12-20 15:56:32 +00:00
Paulo Reis
cf30cfd923
Create new style for links inside alerts; apply it to the reconnection alert.
2017-12-20 15:39:50 +00:00
Hayden Faulds
8663dba37c
remove unused EditorController.getListOfDocPaths
2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e
Remove unnecessary & incorrect title
2017-12-20 14:10:05 +00:00
Shane Kilkelly
18ae27fd66
Merge branch 'sk-account-sync'
2017-12-20 14:02:45 +00:00
