Paulo Reis
f902eb7d4a
Add the project name as a translation local var when rendering project invites.
...
GitOrigin-RevId: 80f4b10adc142173c2194f56c55df8b3ce9f948b
2019-02-04 17:59:05 +00:00
Chrystal Maria Griffiths
91594eee6d
Merge pull request #1473 from sharelatex/as-fix-notification-translation
...
Inject data into translation string to workaround removed potential XSS
GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b
2019-02-04 16:24:57 +00:00
Chrystal Maria Griffiths
d9692b7f91
Merge pull request #1168 from sharelatex/cmg-range-prototype
...
Rich text track changes pt. 1 view changes
GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
2019-01-30 14:07:06 +00:00
Timothée Alby
9a0dd31d8c
Merge pull request #1061 from sharelatex/ja-remove-domain-license-code
...
Remove deprecated domain license code
GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
2019-01-29 12:08:29 +00: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
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
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
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
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
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
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
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
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
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
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
Brian Gough
8bf9d79d2f
Merge pull request #1157 from sharelatex/jel-aria-hidden-fix
...
Add value to aria-hidden attribute
GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9
2018-11-19 09:57:35 +00:00
Jessica Lawshe
d97fe4e39d
Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y
...
Image alt tags and accessible icons
GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004
2018-11-15 17:41:22 +00:00
Shane Kilkelly
81b09c7800
Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2
...
Enable git-bridge in v2
GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
2018-11-14 11:29:35 +00:00
Ersun Warncke
efaa77dbd7
Merge pull request #1143 from sharelatex/robots-noindex
...
Add noindex, nofollow to editor pages (read/write and read only)
GitOrigin-RevId: b1bcd3c7203a0027d86aced3ea8371b077c4ac75
2018-11-09 23:55:43 +00:00
Paulo Jorge Reis
49388c868b
Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui
...
Editor cobranding UI
GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5
2018-11-07 11:43:31 +00:00
Timothée Alby
0cfb765501
Merge pull request #1090 from sharelatex/spd-sharing-sl-sidebar
...
Remove errant space before fullstop in 'sharing_sl' sidebar section
GitOrigin-RevId: 449cce021feebe2e0454d3cd0d7f60dd3df95ea4
2018-10-30 14:38:32 +00:00
Simon Detheridge
c18ca779ba
Merge pull request #1073 from sharelatex/spd-bonus-page-ui
...
Add links and update UI for Bonus page
GitOrigin-RevId: e993d4b7dc59f5ea145892e9cddb87f2193ae013
2018-10-30 10:16:20 +00:00
Timothée Alby
2421e15d7a
Merge pull request #1060 from sharelatex/ja-remove-v2-banner
...
Remove unneeded v2 banner
GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87
2018-10-25 15:25:35 +00:00
Paulo Jorge Reis
6dd9680af8
Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout
...
Fix single-quotes breaking layout directive
2018-10-19 11:30:59 +01:00
Paulo Reis
00a489a000
Fetch brand variation details for branded projects; inject details into the editor page front-end.
...
Test brand variation details.
Rename BrandVariationsController to BrandVariationsHandler.
Use the V1 API helper.
Do not swallow errors when fetching brand details for project load.
Fix indentation.
2018-10-19 10:47:02 +01:00
Paulo Reis
a957593b62
Avoid adding custom toggler attributes when the feature flag is false.
2018-10-19 10:34:07 +01:00
Paulo Reis
4232732646
Avoid using Angular eval for user-provided strings in the layout directive.
2018-10-19 10:00:52 +01:00
Hugh O'Brien
3b766bf523
Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id
...
Create projects with brand variation id
2018-10-16 11:17:09 +01:00
Tim Alby
6f63cd7ca0
add notification to confirm unconfirmed emails
2018-10-15 14:47:16 +02:00
Timothée Alby
89590d5199
Merge pull request #1003 from sharelatex/cmg-split-screen-button
...
Switch between pdf and editor with full-screen button
2018-10-11 10:54:53 +01:00