James Allen
|
2a1e843558
|
Merge pull request #49 from sharelatex/ja-record-snapshots-of-ranges
Record a snapshot to mongo when a doc's comments/changes get collapsed
|
2019-04-16 14:34:51 +01:00 |
|
James Allen
|
52f3596e53
|
Review feedback
|
2019-04-16 11:05:17 +01:00 |
|
James Allen
|
33478f95fd
|
Fix package.json versions
|
2019-04-11 16:32:31 +01:00 |
|
James Allen
|
3d76f4b9bf
|
Record a snapshot to mongo when a doc's comments/changes get collapsed
|
2019-04-11 13:27:46 +01:00 |
|
James Allen
|
b9a1723eb8
|
Merge pull request #612 from sharelatex/remove-travis-icons
Remove travis build status icons
|
2019-04-01 10:30:08 +01:00 |
|
James Allen
|
286dd564e2
|
Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection
Fix history default file selection and bug when comparing with version zero
GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
|
2019-01-29 10:12:17 +00:00 |
|
James Allen
|
b85595b8ca
|
Merge pull request #1426 from sharelatex/as-cleanup-grunt
Cleanup grunt config & dependencies
GitOrigin-RevId: e44445e727e8cf56d03bf33a8741b9a47418a620
|
2019-01-29 10:12:10 +00:00 |
|
James Allen
|
abb259a98b
|
Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4
Upgrade to angular-sanitize 1.6.4
GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e
|
2019-01-29 10:12:02 +00:00 |
|
James Allen
|
ea415ea639
|
Merge pull request #1374 from sharelatex/as-fix-dash-user-fetch
Include owners email in user fetch to show on dashboard if needed
GitOrigin-RevId: 7175700f77501723f48763b9ee9397c0448d4109
|
2019-01-09 17:08:57 +00:00 |
|
James Allen
|
7ee0dcbd7c
|
Merge pull request #1377 from sharelatex/as-deemphasise-download-zip
De-emphasise download zip button if not the primary action
GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5
|
2019-01-09 17:08:52 +00:00 |
|
James Allen
|
b969526c19
|
Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs
Handle UserStubs when linking projects with owners
GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3
|
2019-01-09 13:41:06 +00:00 |
|
James Allen
|
1530062d00
|
Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging
Update messaging on v1 tags now that v1 dash is inaccessible
GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e
|
2019-01-09 13:40:55 +00:00 |
|
James Allen
|
563cdfd439
|
Merge pull request #1363 from sharelatex/as-gdpr-notice
Add note about deleting a project if no owner to import status page
GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4
|
2019-01-08 13:02:19 +00:00 |
|
James Allen
|
8653a3d9cd
|
Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports
Handle UserStubs for project owner
GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04
|
2019-01-08 13:02:14 +00:00 |
|
James Allen
|
e624f697d2
|
Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes
Handle import of zip files that include filenames with backslashes
GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41
|
2019-01-07 11:33:35 +00:00 |
|
James Allen
|
1bddd03335
|
Merge pull request #1319 from sharelatex/ja-account-deletion-message
Change account deletion message when v1 access is removed
GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
|
2019-01-07 11:33:30 +00:00 |
|
James Allen
|
47ab15c39f
|
Merge pull request #1318 from sharelatex/ja-hide-v1-dash-link
Hide link back to v1 dash after we start force exporting to v2
GitOrigin-RevId: 1221bfc3d09224b09040604e0a3f6120d63d8946
|
2019-01-07 11:33:25 +00:00 |
|
James Allen
|
87b983ec6b
|
Merge pull request #1348 from sharelatex/as-tweak-import-status-page
Tweak import status page
GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60
|
2019-01-07 11:33:19 +00:00 |
|
James Allen
|
12a2d71ac9
|
Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing
use different api to check if project is exporting
GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147
|
2019-01-07 11:33:14 +00:00 |
|
James Allen
|
0de359b70b
|
Merge pull request #1345 from sharelatex/ja-remove-git-warning
Remove warning about no git bridge in import modal
GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
|
2019-01-04 16:33:49 +00:00 |
|
James Allen
|
df2dd2cb80
|
Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding
Open in Overleaf: Fix character-encoding problems when passing content via 'snip' parameter
GitOrigin-RevId: d5d9faef8583696dfe7c94e4b5dfd88fc5bf6f4a
|
2019-01-03 10:20:55 +00:00 |
|
James Allen
|
93bf6fcb19
|
Merge pull request #1323 from sharelatex/spd-open-in-overleaf-documentation
Open in Overleaf: Add '/devs' documentation page
GitOrigin-RevId: 4ab5a296570bee147cd79bccb436392f941c076b
|
2019-01-03 10:20:50 +00:00 |
|
James Allen
|
6bcf209fab
|
Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta
Take git-bridge out of beta-program
GitOrigin-RevId: ba95dcd1c818f11f44915ea3731d29aa50473622
|
2019-01-03 10:20:44 +00:00 |
|
James Allen
|
2cf7fefaeb
|
Merge pull request #1307 from sharelatex/pr-git-bridge-modal
Redo the git bridge trial modal.
GitOrigin-RevId: 9ddb61a84a018459fa040ab1514dc35085c93d4e
|
2018-12-20 15:48:58 +00:00 |
|
James Allen
|
5a7f72c9f9
|
Merge pull request #1302 from sharelatex/jel-cms-iframe-attr
Allow style attribute on iframes
GitOrigin-RevId: f6a88f544eab665fecc00b8c89e87d489f39b88d
|
2018-12-20 15:48:52 +00:00 |
|
James Allen
|
3bc9ce995a
|
Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create
Set reversedHostname on user creation
GitOrigin-RevId: 35ba4a5ae6aa792ee1c46e8b2b99d2e6ed00af17
|
2018-12-13 09:25:58 +00:00 |
|
James Allen
|
65c1943c63
|
Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2
Move to running acceptance tests in same process as web server
GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd
|
2018-12-13 09:25:50 +00:00 |
|
James Allen
|
d0744d779e
|
Merge pull request #1233 from sharelatex/ja-owner-userstubs
Allow importing projects by non-owners
GitOrigin-RevId: b8e5597deef8229b22c5605965d246e6ed95d624
|
2018-12-13 09:25:45 +00:00 |
|
James Allen
|
79a7a596b0
|
Merge pull request #1228 from sharelatex/ja-fix-subscription-tests
Remove redundant sandboxed module require in tests
GitOrigin-RevId: 957af70aacefed34f853549ef2357f59c01a4b3e
|
2018-12-05 12:32:41 +00:00 |
|
James Allen
|
16e1980b41
|
Merge pull request #1225 from sharelatex/spd-ensure-zip-file-project-name-valid
Ensure project names are valid when importing from zip
GitOrigin-RevId: db36dde6d756e6577d7e89f9f50f76c40575a5f0
|
2018-12-05 12:32:36 +00:00 |
|
James Allen
|
12004962fb
|
Merge pull request #1221 from sharelatex/ew-collabratec-zip-upload-api
collabratec zip upload api
GitOrigin-RevId: cf93d47112404e9dcbecd723aa806fc213c057f3
|
2018-12-05 12:32:31 +00:00 |
|
James Allen
|
e603afe106
|
Merge pull request #1217 from sharelatex/ja-download-zip-version
Add option to download zip file of version in history
GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68
|
2018-12-05 12:32:26 +00:00 |
|
James Allen
|
fc069c1752
|
Merge pull request #1216 from sharelatex/ja-remove-only-from-tests
Remove stray 'only' in acceptance tests
GitOrigin-RevId: 37417cfb98a512584723f5eaf6c3c684b5c60f68
|
2018-12-03 18:02:11 +00:00 |
|
James Allen
|
ee800f7448
|
Merge pull request #1176 from sharelatex/ja-manage-v1-subs
Manage v1 subscriptions from v2
GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076
|
2018-11-30 10:43:37 +00:00 |
|
James Allen
|
1070cd36bb
|
Merge pull request #1163 from sharelatex/ja-zotero
Add support for Zotero linked files
GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941
|
2018-11-28 11:35:27 +00:00 |
|
James Allen
|
38a2b9ee53
|
Merge pull request #1181 from sharelatex/ja-git-bridge-beta
Open up v2 git bridge to beta users but only with v2 only projects
GitOrigin-RevId: 0895a4636ca9dbffcb112c2b1459773303ecc2cd
|
2018-11-23 14:19:26 +00:00 |
|
James Allen
|
2fbbdb25be
|
Merge pull request #1137 from sharelatex/as-allow-brand-variation-project-import
Allow import of projects with brand variation
GitOrigin-RevId: 3ede6d1e34a30c42698f9010ed31741cbc341305
|
2018-11-20 11:04:05 +00:00 |
|
James Allen
|
49e19cad64
|
Merge pull request #1162 from sharelatex/ja-show-group-management
Add group and institution membership and management info to subscription dashboard
GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60
|
2018-11-20 11:03:56 +00:00 |
|
James Allen
|
392be7cb44
|
Merge pull request #1165 from sharelatex/ja-fix-undefined-id-error
Fixes an undefined _id error when looking for project owner for new project
GitOrigin-RevId: 6ad5230380431b4a5866088911ce27175633dbbb
|
2018-11-19 16:02:07 +00:00 |
|
James Allen
|
0f1c732d15
|
Merge pull request #1130 from sharelatex/ja-subscription-dashboard
Refactor subscription dashboard
GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c
|
2018-11-19 16:01:59 +00:00 |
|
James Allen
|
8c70d680f4
|
Merge pull request #1145 from sharelatex/ew-collabratec-create-project2
Collabratec create project api
GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884
|
2018-11-14 14:44:17 +00:00 |
|
James Allen
|
95f7d3da24
|
Merge pull request #1118 from sharelatex/as-upgrade-ace-1.2.9
Upgrade to Ace 1.2.9
GitOrigin-RevId: 8700f6decb530a0f0bbaefbe32a83893e8d91a90
|
2018-11-14 14:30:12 +00:00 |
|
James Allen
|
6cd35d66d5
|
Set tax type to digital in Recurly plans script
GitOrigin-RevId: 3f30aadc1dd27a7b7e37ca096404a9d12a68d29e
|
2018-11-13 15:02:30 +00:00 |
|
James Allen
|
140f97eb20
|
Merge pull request #1107 from sharelatex/ja-purchase-groups
Purchase group/team accounts directly via app
GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
|
2018-11-13 13:50:46 +00:00 |
|
James Allen
|
eecbbc045d
|
Merge pull request #1044 from sharelatex/ja-merge-modules
Merge modules into web monorepo
GitOrigin-RevId: 742df73bff72010b01c93e20759a489969b04ed3
|
2018-10-24 10:29:57 +00:00 |
|
James Allen
|
1aecd0be3d
|
Merge pull request #1039 from sharelatex/ja-copybara
Sync to OSS repo using copybara
GitOrigin-RevId: 5ce0c08d614f3d84e7c3e1f9b3413681e5049103
|
2018-10-19 12:46:51 +00:00 |
|
James Allen
|
a35b3eea7f
|
Merge pull request #976 from sharelatex/ja-disable-blog-in-v2
Don't enable legacy blog in v2
|
2018-09-27 11:01:42 +01:00 |
|
James Allen
|
0cb563816d
|
Don't enable legacy blog in v2
|
2018-09-27 10:56:14 +01:00 |
|
James Allen
|
8ebfd7882d
|
Add logos for homepage
|
2018-09-26 10:34:50 +01:00 |
|
James Allen
|
f7acd448e7
|
Merge pull request #970 from sharelatex/pr-remove-front-chat
Hide front chat widget
|
2018-09-25 10:31:54 +01:00 |
|
James Allen
|
1d657e1700
|
Merge pull request #968 from sharelatex/ja-show-register-button
Show register button on OL v2
|
2018-09-25 10:25:38 +01:00 |
|
James Allen
|
e2f90ba01a
|
Merge pull request #966 from sharelatex/as-no-project-token-based
Redirect logged out users to v1 if project is not found from token based url
|
2018-09-25 10:25:30 +01:00 |
|
James Allen
|
19b97e953f
|
Show register button on OL v2
|
2018-09-25 08:29:34 +01:00 |
|
James Allen
|
a451a0b3f8
|
Merge pull request #937 from sharelatex/pr-login-signup-forms
Login and register forms styling
|
2018-09-24 08:48:56 +01:00 |
|
James Allen
|
9e827be3ed
|
Merge pull request #951 from sharelatex/as-copy-v1-assets
Copy assets from v1
|
2018-09-21 17:41:55 +01:00 |
|
James Allen
|
ea9f788fc1
|
Merge pull request #954 from sharelatex/cmg-better-buttons
Improve gallery detail
|
2018-09-21 17:41:43 +01:00 |
|
James Allen
|
9b3bf78f2d
|
Merge pull request #952 from sharelatex/as-fix-500-favicon
Ensure brand prefixed favicon is used on 500 page
|
2018-09-21 17:41:36 +01:00 |
|
James Allen
|
035109177a
|
Merge pull request #950 from sharelatex/as-fix-navbar-logic
Fix plans & pricing showing for logged in users
|
2018-09-21 13:07:49 +01:00 |
|
James Allen
|
91ee445277
|
Merge pull request #936 from sharelatex/cmg-gallery-styling
Extra v2 gallery styling
|
2018-09-21 11:06:25 +01:00 |
|
James Allen
|
772ac42005
|
Fix messed up rebase
|
2018-09-21 10:42:20 +01:00 |
|
James Allen
|
525aa9fd3a
|
Merge pull request #946 from sharelatex/as-chrome-redirect
Add /chrome redirect to match v1 behaviour
|
2018-09-21 10:36:09 +01:00 |
|
James Allen
|
c0dee4508e
|
Merge pull request #949 from sharelatex/jel-blog-style-tag-figure
Blog tag and <figure> styling
|
2018-09-21 10:34:00 +01:00 |
|
James Allen
|
2d9cadb487
|
Merge pull request #935 from sharelatex/as-teams-redirect
Add route to handle /teams similar to v1
|
2018-09-21 08:37:10 +01:00 |
|
James Allen
|
4d00227924
|
Merge pull request #945 from sharelatex/sk-disable-public-registration
Add the enableLegacyRegistration option to acceptance test settings
|
2018-09-21 08:37:02 +01:00 |
|
James Allen
|
ffe09f7349
|
Merge pull request #930 from sharelatex/ew-sso
NPM modules for google, orcid, and twitter SSO
|
2018-09-20 07:44:58 +01:00 |
|
James Allen
|
fee2a1f401
|
Merge pull request #912 from sharelatex/ja-improve-redirect-logic
Add additional functionality to RedirectManager
|
2018-09-17 16:41:58 +01:00 |
|
James Allen
|
15103ac894
|
Support the same URL with multiple methods in redirects
|
2018-09-17 15:38:58 +01:00 |
|
James Allen
|
83a1039b7e
|
Add acceptance tests for RedirectManager
|
2018-09-17 15:38:58 +01:00 |
|
James Allen
|
40f08d1592
|
Add additional functionality to RedirectManager
|
2018-09-17 15:38:45 +01:00 |
|
James Allen
|
14b77a2060
|
Merge pull request #916 from sharelatex/revert-900-ja-show-last-modified
Revert "Record and show last modified by user for projects"
|
2018-09-13 14:01:36 +01:00 |
|
James Allen
|
ef11161ddb
|
Revert "Record and show last modified by user for projects"
|
2018-09-13 14:00:30 +01:00 |
|
James Allen
|
078575b236
|
Merge pull request #900 from sharelatex/ja-show-last-modified
Record and show last modified by user for projects
|
2018-09-13 13:19:25 +01:00 |
|
James Allen
|
5dbebc0693
|
Translate 'by'
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
ab871b9ba7
|
Fix tabs vs spaces
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
dd4b85b809
|
Combine v1 and v2 projects into item.pug
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
225d30ffd2
|
Add missed lines from rebase
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
c072961183
|
Update project-list list to a table and show last updated user
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
ab10336110
|
Record last update time and user from project-history
|
2018-09-13 10:38:52 +01:00 |
|
James Allen
|
29e9d5a1e6
|
Merge pull request #899 from sharelatex/sk-account-delete-confirm-delete-sharelatex
Add another confirmation checkbox to account-delete.
|
2018-09-06 11:57:34 +01:00 |
|
James Allen
|
24f60bf791
|
Don't include the license name twice in invite emails
|
2018-09-05 11:05:38 +01:00 |
|
James Allen
|
5025b54c9c
|
Merge pull request #887 from sharelatex/as-logout-of-v1
Extract logout to function, so different redirect can be called
|
2018-09-03 14:04:22 +01:00 |
|
James Allen
|
52381c8fb7
|
Merge pull request #851 from sharelatex/jel-remove-a-b-test
Remove Plans and Pricing A/B Test
|
2018-08-30 15:19:56 +01:00 |
|
James Allen
|
b86ac31c63
|
Don't suggest bonus page to v2 users
|
2018-08-30 10:56:31 +01:00 |
|
James Allen
|
6a04800f70
|
Merge pull request #810 from sharelatex/ja-v2-templates
Split out feature flags into publish and view templates
|
2018-08-29 10:27:23 +01:00 |
|
James Allen
|
a9a6dcf82a
|
Move template modal to template module
|
2018-08-10 17:17:00 +01:00 |
|
James Allen
|
ff506b2b03
|
Make publishing and viewing templates separate features
|
2018-08-10 17:16:49 +01:00 |
|
James Allen
|
0f8fe53bc9
|
Allow confirmed_at date to be specified
|
2018-08-10 17:48:43 +02:00 |
|
James Allen
|
69e8eddff0
|
Merge pull request #796 from sharelatex/pr-history-labels-ui
History labels UI
|
2018-08-09 10:50:28 +01:00 |
|
James Allen
|
3546e842b0
|
Merge pull request #787 from sharelatex/ns-autocomplete-w-escaped-percent
still trigger autocomplete if % is escaped
|
2018-08-09 10:50:17 +01:00 |
|
James Allen
|
9cbb51bbbc
|
Merge pull request #793 from sharelatex/sk-sl-login-v2
If we're creating v1 accounts, don't allow login for users already linked up
|
2018-08-08 15:51:25 +01:00 |
|
James Allen
|
b1228b7eb2
|
Merge pull request #789 from sharelatex/mm-exports-specify-clsi-image
Add compiler and imageName to export API request
|
2018-08-01 11:43:20 +01:00 |
|
James Allen
|
e89f24886c
|
Merge pull request #786 from sharelatex/hb-metrics-style-pass
Metrics style pass
|
2018-08-01 11:43:11 +01:00 |
|
James Allen
|
7dc82597e1
|
Merge pull request #765 from sharelatex/ja-update-email-in-v1
Update email in v1 when setting as default in v2
|
2018-07-26 10:58:57 +01:00 |
|
James Allen
|
20cd723df2
|
Merge pull request #766 from sharelatex/ja-affiliations-ui-state
Update affiliations UI to show specific errors for conflicting emails
|
2018-07-26 10:58:37 +01:00 |
|
James Allen
|
de6a790f3d
|
Merge pull request #780 from sharelatex/ns-autocompile-w-syntax-error
dont stop compiling if user has turned off syntax validation
|
2018-07-24 10:06:03 +01:00 |
|
James Allen
|
c7c75af568
|
Merge pull request #778 from sharelatex/as-configure-mathjax
Configure mathjax globally
|
2018-07-24 10:05:12 +01:00 |
|
James Allen
|
f99b6b6f0a
|
Merge pull request #746 from sharelatex/ta-refresh-features
Refresh Features After Confirming Email
|
2018-07-24 10:04:48 +01:00 |
|
James Allen
|
4130a934a3
|
Merge pull request #779 from sharelatex/ho-ClsiCookieManager-bug-fix
fix router issue where ClsiCookieManager isn't calling a function to set
|
2018-07-24 10:04:41 +01:00 |
|
James Allen
|
faf36f0265
|
Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels
Add v2 history labels endpoints
|
2018-07-24 10:04:13 +01:00 |
|
James Allen
|
5b989f0a8e
|
Merge pull request #759 from sharelatex/sk-login-with-v1-credentials
Login with v1 credentials
|
2018-07-24 10:04:02 +01:00 |
|