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
|
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 |
|
Timothée Alby
|
300e7d2f12
|
Merge pull request #1449 from sharelatex/ta-subscription-page-fix
Fix Subscription Page for Users with Free Affiliation
GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e
|
2019-01-28 14:38:16 +00:00 |
|
Timothée Alby
|
6985f7d1a3
|
Merge pull request #1443 from sharelatex/jel-vat-plans-page
Add VAT text to plans page
GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619
|
2019-01-28 14:38:08 +00:00 |
|
Douglas Lovell
|
2a72804434
|
Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing'
GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3
|
2019-01-24 12:13:23 +00:00 |
|
Douglas Lovell
|
c294a8425b
|
Merge remote-tracking branch 'origin/ns-new-file-modal'
GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c
|
2019-01-24 12:13:02 +00:00 |
|
Douglas Lovell
|
59d4bd6182
|
Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling'
GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2
|
2019-01-24 12:12:56 +00:00 |
|
Douglas Lovell
|
15061047a3
|
Merge remote-tracking branch 'origin/ns-check-institution'
GitOrigin-RevId: a147965b4f3294215f1396e53d184ef4919fa6cd
|
2019-01-24 12:12:51 +00:00 |
|
Ersun Warncke
|
ef9875c5a6
|
Merge pull request #1427 from sharelatex/ew-recaptcha
add recaptcha validate middleware to reg and add recaptcha v3
GitOrigin-RevId: 35375b7887832b40bc570cf848cab9c62243443b
|
2019-01-21 17:27:54 +00:00 |
|
Simon Detheridge
|
6650dfe494
|
Merge pull request #1419 from sharelatex/as-fix-invites-permissions
Fix invite permissions in share modal
GitOrigin-RevId: 8fe073faebcd84236ac58671820166a2ad73262f
|
2019-01-18 10:37:11 +00:00 |
|
Timothée Alby
|
837302327e
|
Merge pull request #1407 from sharelatex/ta-team-status-free
Hide Free v1 Teams on Subscription Dashboard
GitOrigin-RevId: ba805e77eb1f994158d3ceaa42be23943fca0f1f
|
2019-01-17 15:15:44 +00:00 |
|
Timothée Alby
|
5169b4a73f
|
Merge pull request #1415 from sharelatex/ta-trial-fix
Check if Trial is Current in Subscription Page
GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1
|
2019-01-17 15:15:33 +00:00 |
|
Ersun Warncke
|
87b2c72449
|
Merge pull request #1410 from sharelatex/ew-make-logout-area-clickable
make area around logout button clickable
GitOrigin-RevId: 8f080c6bedb7dce2ac39d877e8076b83241a4c12
|
2019-01-16 17:21:21 +00:00 |
|
Ersun Warncke
|
330f878085
|
Merge pull request #1378 from sharelatex/ew-post-logout
POST logout instead of GET
GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7
|
2019-01-15 16:48:00 +00:00 |
|
Simon Detheridge
|
b7daca4f3f
|
Merge pull request #1379 from sharelatex/jel-import-page-mobile-friendly
Mobile friendly project import page
GitOrigin-RevId: b33a3fa5113d4400beec065fe856a19967e68845
|
2019-01-11 14:43:39 +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 |
|
Alasdair Smith
|
42cf6a1216
|
Merge pull request #1362 from sharelatex/as-fix-status-page
Fixes for import status page
GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12
|
2019-01-08 12:02:58 +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
|
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
|
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 |
|
Alasdair Smith
|
9737a04125
|
Merge pull request #1338 from sharelatex/as-remove-import-modal
Don't show project import modal if feature flag is set
GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366
|
2019-01-04 10:51:47 +00:00 |
|
Ersun Warncke
|
985f0a97bc
|
Merge pull request #1332 from sharelatex/ew-block-while-project-importing
block loading project while importing
GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c
|
2019-01-03 18:14:19 +00:00 |
|
Simon Detheridge
|
ec1867198f
|
Merge pull request #1313 from sharelatex/as-import-copy
Improved copy for import status page
GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8
|
2019-01-03 12:19:35 +00:00 |
|
Alasdair Smith
|
7112e65dc5
|
Merge pull request #1303 from sharelatex/project-import-refactor
Project import refactor
GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
|
2018-12-20 12:06:15 +00:00 |
|
Shane Kilkelly
|
97e357f772
|
Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status
Remove deprecated display of v1 team data in v2
GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
|
2018-12-20 10:55:52 +00:00 |
|
Douglas Lovell
|
740dce07a9
|
Merge remote-tracking branch 'origin/hb-publisher-management'
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
|
2018-12-18 13:42:56 +00:00 |
|
Paulo Jorge Reis
|
4563ce864c
|
Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes
History compare labels fixes
GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
|
2018-12-18 11:48:49 +00:00 |
|
Alasdair Smith
|
1160620afc
|
Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page
Revert "Import status page"
GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
|
2018-12-17 15:45:36 +00:00 |
|
Alasdair Smith
|
56784c4089
|
Merge pull request #1240 from sharelatex/as-import-status-page
Import status page
GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
|
2018-12-17 14:01:24 +00:00 |
|
Paulo Jorge Reis
|
d5c651c132
|
Merge pull request #1276 from sharelatex/pr-fix-history-v1
Undo rename and removal of the v1 history list controller.
GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
|
2018-12-17 12:16:20 +00:00 |
|
Paulo Jorge Reis
|
217bc180ac
|
Merge pull request #1251 from sharelatex/pr-history-labels-compare
History labels compare
GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
|
2018-12-17 10:10:48 +00:00 |
|
Jessica Lawshe
|
7666c8a481
|
Merge pull request #1236 from sharelatex/jel-password-reset
Reset password via API request to v1
GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
|
2018-12-14 16:02:14 +00:00 |
|
Shane Kilkelly
|
a72b29efd8
|
Merge pull request #1259 from sharelatex/ja-sso-settings-link
Add link from v2 settings page to manage linked accounts in v1
GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
|
2018-12-13 15:09:59 +00:00 |
|
Simon Detheridge
|
f3a10ac221
|
Merge pull request #1192 from sharelatex/ta-publisher-create
Add Interface to Create Publishers
GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46
|
2018-12-06 11:10:20 +00:00 |
|
Jessica Lawshe
|
028ad9c05b
|
Merge pull request #1209 from sharelatex/jel-mobile-improvements
Mobile improvements
GitOrigin-RevId: 4b2fa8b1ab12b7ca23a0a64aeadea90f7cfc6f4d
|
2018-12-05 17:59:47 +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 |
|
Jessica Lawshe
|
f02e3e604b
|
Merge pull request #1172 from sharelatex/jel-portal-templates-link
Link to portal templates from project dash
GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c
|
2018-12-03 19:13:45 +00:00 |
|
Douglas Lovell
|
aae0484458
|
Merge branch 'master' into dcl-i1207
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
|
2018-11-30 13:24:27 +00:00 |
|
Douglas Lovell
|
ed3147a58f
|
Allow open from template button when lacking source
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
|
2018-11-30 13:24:23 +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 |
|
Timothée Alby
|
701ba90c7b
|
Merge pull request #1182 from sharelatex/ja-dashboard-metrics-links
Add links to metrics and hubs for groups and institutions
GitOrigin-RevId: ca83108e1d1541fdc805218ea12847b0d7a97cf8
|
2018-11-26 13:43:05 +00:00 |
|
Paulo Jorge Reis
|
794e6e146d
|
Merge pull request #1180 from sharelatex/pr-ieee-basic-styling-fixed
IEEE basic styling fixed
GitOrigin-RevId: 2f3fb3850435b52cea5228ac4a0dd2c1a874e36c
|
2018-11-22 15:32:58 +00:00 |
|
Paulo Jorge Reis
|
2f551922d6
|
Merge pull request #1179 from sharelatex/revert-1167-pr-ieee-basic-styling
Revert "IEEE basic styling"
GitOrigin-RevId: 1e473bddcfbc9b1a8aef6f4dd23ea3a716eddd71
|
2018-11-22 13:30:47 +00:00 |
|
Paulo Jorge Reis
|
41c12e2c52
|
Merge pull request #1167 from sharelatex/pr-ieee-basic-styling
IEEE basic styling
GitOrigin-RevId: 43a308fa8ce49d7b809b21fc95aefb41dcbaf46e
|
2018-11-22 11:11:34 +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
|
0f1c732d15
|
Merge pull request #1130 from sharelatex/ja-subscription-dashboard
Refactor subscription dashboard
GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c
|
2018-11-19 16:01:59 +00:00 |
|