17a5dfa5a5
Inject v2 user details into project-history updates and diffs
2018-01-11 11:32:16 +00:00
945ef25ef5
Merge pull request #244 from sharelatex/hof-lock-file-upload
...
Project Locking: ProjectUploadController
2018-01-11 08:42:36 +00:00
79055d0e8d
Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs
...
Show apology message instead of raw binary files
2018-01-11 08:42:13 +00:00
c1febbeb7c
run analytics proxy on public API router
2018-01-11 09:34:24 +02:00
bdef7b707d
Merge pull request #241 from sharelatex/ta-analytics-proxy
...
Proxy requests to analytics service
2018-01-10 15:39:28 +02:00
859e03cd4f
Merge pull request #234 from sharelatex/hof-remove-unused-method
...
remove unused EditorController.getListOfDocPaths
2018-01-10 15:26:02 +02:00
08b74c95f5
proxy requests to analytics service
2018-01-10 15:03:14 +02:00
a81b56556f
Add test for SubscriptionViewModelBuilder
2018-01-09 17:00:56 +00:00
817840840a
use LockManger.runWithLock
2018-01-09 16:37:34 +00:00
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
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
626e0a16ef
Fix acceptance test when overleaf setting not present
2018-01-04 15:49:31 +00:00
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
692182c784
Show apology message instead of raw binary files
2018-01-04 10:53:49 +00:00
967353d080
Update comment to use button for import dialog for a11y
2018-01-03 17:06:51 +00:00
bbfcff30fb
Enable project history for new projects if enabled in settings
2018-01-03 16:55:33 +00:00
f0d7658bdd
Don't show import dialog for projects, just link to v1 editor
2018-01-03 16:46:26 +00:00
8b9f3268b1
Make plans page consistent with others, fixing header issues.
2018-01-03 13:54:33 +00:00
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
7918232757
Merge pull request #240 from sharelatex/pr-v2-styling-fixes
...
v2 styling fixes
2018-01-03 11:30:39 +00:00
ada76e820a
Merge pull request #238 from sharelatex/as-ol-emails
...
v2 themed emails
2018-01-03 11:30:28 +00:00
882286afb1
Merge pull request #245 from sharelatex/as-autocompile-rollout-100
...
Increase autocompile rollout to 100%
2018-01-03 11:30:10 +00:00
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
b2d92ea482
Increase autocompile rollout to 100%
2018-01-03 10:01:35 +00:00
fe62db05a0
lock project when uploading a file
2018-01-02 12:43:41 +00:00
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
0484b46027
Redundancy.
2017-12-21 13:52:34 +00:00
484d34e296
Only render announcements in SL.
2017-12-21 12:57:07 +00:00
1be9e29f35
Switch from button to link to fit better
2017-12-21 11:10:23 +00:00
fb23b30c45
Merge branch 'master' into as-update-v2-copy
2017-12-21 10:57:16 +00:00
0114ed362f
Swap out email templates based on brand prefix
2017-12-21 10:26:14 +00:00
1fc527ff48
Fix OL auto-linking styles
2017-12-21 09:59:19 +00:00
c76bdaa824
Change an erroneous logger.error to logger.log
2017-12-21 09:54:35 +00:00
9657108146
Add OL themed email templates
2017-12-20 17:53:45 +00:00
7f7916f5b1
Clean up whitespace
2017-12-20 17:52:49 +00:00
e6281911f0
Add history-file-tree.pug
2017-12-20 16:42:23 +00:00
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
70b755603d
Fix empty project list card.
2017-12-20 16:03:12 +00:00
cf30cfd923
Create new style for links inside alerts; apply it to the reconnection alert.
2017-12-20 15:39:50 +00:00
8663dba37c
remove unused EditorController.getListOfDocPaths
2017-12-20 15:14:56 +00:00
b1f656826e
Remove unnecessary & incorrect title
2017-12-20 14:10:05 +00:00
18ae27fd66
Merge branch 'sk-account-sync'
2017-12-20 14:02:45 +00:00
c191ac2e8d
Show deleted files in v2 history
2017-12-20 13:59:17 +00:00
ec41f984e6
Merge branch 'ho-remove-groove'
2017-12-20 13:37:15 +00:00
0a0c6c6c0c
Merge branch 'master' into pr-style-v2-chatpane
2017-12-20 09:50:49 +00:00
339b7ec14f
Merge branch 'ja-allow-importing-without-history'
2017-12-19 15:06:17 +00:00
1d89a535a1
Merge pull request #208 from sharelatex/ja-front-end-history
...
Add in web front end that supports v2 history; Fixes #168
2017-12-19 15:00:34 +00:00
0a4febfce6
Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only
...
only hash the static content when minified is on
2017-12-19 15:00:15 +00:00
e18dc1e41d
Merge pull request #214 from sharelatex/hof-version-entity-deletion
...
version entity deletion
2017-12-19 14:59:37 +00:00
731cd57250
Make intermediate argument signature clearer
2017-12-19 13:59:06 +00:00
James Allen