github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-30 14:25:01 -05:00
Code Issues Projects Releases Packages Wiki Activity
19740 commits 3 branches 7 tags 206 MiB
Commit graph

2972 commits

Author SHA1 Message Date
Jessica Lawshe
6e09af6fbe Merge pull request #1971 from overleaf/jel-settings-add-aria-label 
Update label to match input ID

GitOrigin-RevId: 849c9d49d861cf3b5645496b5e4eed1dc6d7392a
 2019-07-11 17:07:51 +00:00
Jessica Lawshe
ed6891e66d Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check 
Remove checks for `force-import-to-v2`

GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120
 2019-07-11 15:35:36 +00:00
Jessica Lawshe
d4a8f38736 Merge pull request #1942 from overleaf/jel-user-settings-form-msg 
Move user settings form message next to submit button and add ID attributes

GitOrigin-RevId: 3d87242e5a7211f9fa58b07f38a278fb94019046
 2019-07-11 15:35:31 +00:00
Eric Mc Sween
545b57d6be Merge pull request #1939 from overleaf/jel-no-search-results 
Show message when there are no learn wiki search results

GitOrigin-RevId: cb1600baeb4a9860575385be78a825cb3942903a
 2019-07-04 12:51:22 +00:00
Timothée Alby
e029616ed4 Merge pull request #1914 from overleaf/jel-no-pw-message 
Check for password on delete modal

GitOrigin-RevId: a2ec40b9c73e92490a9dfd0377b10f9d1831f56f
 2019-07-01 14:06:42 +00:00
Miguel Serrano
dc54a261e3 Merge pull request #1907 from overleaf/as-fix-tag-project-count 
Fix tag project count

GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d
 2019-06-27 10:32:01 +00:00
Simon Detheridge
bd3f59c22a Merge pull request #1895 from overleaf/jel-oauth-db-flip 
Add setting var for OAuth data source

GitOrigin-RevId: e8a2ce588c7b5c8a9cf2c782d0434b421df7b356
 2019-06-25 11:22:17 +00:00
Simon Detheridge
14c176a832 Merge pull request #1896 from overleaf/as-remove-v1-return-message-flag 
Remove unused v1-return-message feature flag

GitOrigin-RevId: c8ffe88fc3294ec207ad8888254ee8d4b95cde05
 2019-06-25 11:21:58 +00:00
Simon Detheridge
6fc507aea3 Merge pull request #1883 from overleaf/as-remove-rttc-beta-program 
Move rich text track changes out of the beta program

GitOrigin-RevId: 4b23a42f3b2ef53012b5c6cca310fe82de5d9a0c
 2019-06-21 13:58:52 +00:00
Alasdair Smith
f83ab4ec3b Merge pull request #1767 from overleaf/as-color-contrast 
Improve colour contrast

GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976
 2019-06-19 09:01:43 +00:00
Simon Detheridge
ab5b1b6dc4 Merge pull request #1870 from overleaf/spd-invalid-intent-sso 
Fix invalid intent errors when logging in with OAuth

GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b
 2019-06-18 15:48:29 +00:00
Simon Detheridge
08861187d5 Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder 
display warning if synctex fails to return filename

GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d
 2019-06-17 15:14:31 +00:00
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
Brian Gough
c242a8d4c1 Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout 
enable sharejs hash checking

GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7
 2019-06-13 08:47:52 +00:00
nate stemen
642081dd17 Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked 
OAuth provider check and capitalize button text

GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4
 2019-06-03 18:32:13 +00:00
Hugh O'Brien
d4eb71b525 Merge pull request #1788 from overleaf/ta-ensure-can-delete-account 
Prevent Subscription Owner from Deleting their Account

GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0
 2019-05-28 15:51:27 +00:00
Simon Detheridge
ff4e0013cd Merge pull request #1809 from overleaf/ns-escape-archive-translation 
treat translate call as var, not string

GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0
 2019-05-28 09:33:31 +00:00
Timothée Alby
d86abf49e6 Merge pull request #1729 from overleaf/ta-show-last-modified 
Show LastUpdatedBy on Dashboard

GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9
 2019-05-21 13:39:29 +00:00
Jessica Lawshe
e03b5ae691 Merge pull request #1741 from overleaf/jel-manage-linked-accounts 
Manage linked accounts via v2

GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06
 2019-05-20 16:10:46 +00:00
Alasdair Smith
dc09095ae7 Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf 
Resize Ace when toggling PDF view

GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9
 2019-05-10 08:56:21 +00:00
Simon Detheridge
5517adcbd1 Merge pull request #1726 from sharelatex/hb-sso-password-setting 
Check for password from v1 before showing password change form

GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658
 2019-04-25 14:37:38 +00:00
Simon Detheridge
16f905358a Merge pull request #1690 from sharelatex/cmg-color-tags 
Color-code tags/folders

GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e
 2019-04-25 14:37:32 +00:00
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page 
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
 2019-04-25 14:37:15 +00:00
Timothée Alby
967973f354 Only show label version button for users with write permission (#1665) 
Only show label version button for users with write permission

GitOrigin-RevId: f0a6504b51c1e9018942592ad6784599694c571a
 2019-04-23 14:35:32 +00:00
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720) 
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
 2019-04-23 14:35:21 +00:00
Timothée Alby
44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723) 
Fix Wording in Subscription Cancellation Flow

GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
 2019-04-23 14:35:14 +00:00
Timothée Alby
54186d9db1 Add linked accounts section to user settings page (#1705) 
Add linked accounts section to user settings page

GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040
 2019-04-23 14:34:55 +00:00
Jessica Lawshe
1306de81e1 Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie 
Fix review panel toggles in IE11.

GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8
 2019-04-17 14:14:27 +00:00
Jessica Lawshe
f455a11aa8 Merge pull request #1655 from sharelatex/jel-user-must-reconfirm 
Reconfirm user accounts

GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8
 2019-04-17 14:14:19 +00:00
Paulo Jorge Reis
f2fbdcc078 Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link 
Revert "Add survey link in the projects list sidebar."

GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2
 2019-04-17 10:45:15 +00:00
Paulo Jorge Reis
5a6cdf0999 Merge pull request #1679 from sharelatex/cmg-dashboard-owner 
Fix ordering by Owner on the dashboard

GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767
 2019-04-17 10:26:03 +00:00
Paulo Jorge Reis
6c6bc1216a Merge pull request #1670 from sharelatex/pr-fix-contrast-issues 
Fix contrast issues (and others)

GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec
 2019-04-17 10:25:55 +00:00
Shane Kilkelly
0773311805 Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip 
Change the wording on emails from 'default' to 'primary'

GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15
 2019-04-13 01:57:15 +00:00
Chrystal Maria Griffiths
36d0e8e199 Merge pull request #1654 from sharelatex/ns-add-status-page 
add status.overleaf.com to 500 page

GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82
 2019-04-10 09:52:46 +00:00
Chrystal Maria Griffiths
5d6a307234 Merge pull request #1664 from sharelatex/as-fix-read-only-comment 
Only show add comment button if user has permission

GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f
 2019-04-10 09:52:41 +00:00
Chrystal Maria Griffiths
ab6565beb8 Merge pull request #1697 from sharelatex/cmg-leave-archived 
Leave an archived project

GitOrigin-RevId: c1da7fdff9ae90b9992ed99dbcff3e7ee31ec4d9
 2019-04-10 09:52:36 +00:00
Paulo Jorge Reis
9c5c6922b9 Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection 
History drag and drop selection

GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01
 2019-04-09 10:11:13 +00:00
Paulo Jorge Reis
9e63211a17 Merge pull request #1680 from sharelatex/cmg-hide-unarchive 
Only show unarchive button for project owners

GitOrigin-RevId: 5990be70cfcd9cf0708248d78845dc163a59a8b3
 2019-04-08 10:31:10 +00:00
Paulo Jorge Reis
e6943e8e71 Merge pull request #1667 from sharelatex/pr-add-post-integration-survey-link 
Add survey link in the projects list sidebar.

GitOrigin-RevId: 085f969336e81d546c51043c3ab9dc63585f97fb
 2019-04-08 10:14:19 +00:00
Alasdair Smith
9ff021cc88 Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943 
Upgrade PDFjs to v2.0.943

GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb
 2019-04-01 09:27:32 +00:00
Simon Detheridge
385da07930 Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui 
Display more descriptive errors when uploading a project fails

GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8
 2019-03-28 15:14:30 +00:00
Simon Detheridge
364561d5fb Merge pull request #1666 from sharelatex/cmg-rttc-typo 
Remove duplicate text on review panel

GitOrigin-RevId: 20d37f392ed28ebbe31bae4f66892414b2966b87
 2019-03-25 16:34:18 +00:00
Simon Detheridge
f9594707ca Merge pull request #1662 from sharelatex/as-fix-wrong-favicon 
Fix missed favicon path update and make track-changes page inherit from layout

GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3
 2019-03-25 15:52:44 +00:00
Simon Detheridge
cd9ed1dd6b Merge pull request #1663 from sharelatex/cmg-rttc-typo 
Fix lack of whitespace typo on review panel

GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275
 2019-03-25 15:52:38 +00:00
Simon Detheridge
d2e053f456 Merge pull request #1610 from sharelatex/cmg-reintroduce-beta 
Revive the beta program in the settings area

GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43
 2019-03-22 12:28:36 +00:00
Alasdair Smith
e6e3c023ed Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax 
Fix broken messages in chat due to mathjax XSS filtering

GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647
 2019-03-18 12:12:10 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss 
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
 2019-03-18 10:37:15 +00:00
Timothée Alby
1edf1964c8 Merge pull request #1607 from sharelatex/spd-succserror 
Don't show 'No errors' message if PDF generation fails

GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79
 2019-03-14 16:02:32 +00:00
Timothée Alby
b86a949f50 Merge pull request #1485 from sharelatex/cmg-comments-track-changes 
Add comments highlighting to rich text track changes

GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5
 2019-03-11 11:08:10 +00:00
Timothée Alby
89f31d71e3 Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working 
Don't use multipart/form-data for admin panel buttons

GitOrigin-RevId: 97c265a1c0addbddf5628d5e0c70fedb38bda75d
 2019-03-11 11:07:45 +00:00
Timothée Alby
e1fb28ae28 Merge pull request #1598 from sharelatex/jel-wiki-search 
Stop search bar clearing on enter

GitOrigin-RevId: 54d0de33fc196ea97b3f8628442704475aa959dd
 2019-03-11 11:07:34 +00:00
Timothée Alby
72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes 
Fixes for unsubscribing from metrics email

GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
 2019-03-11 11:07:20 +00:00
Douglas Lovell
24da4799ed Merge remote-tracking branch 'origin/jel-payment-countries' 
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
 2019-03-11 11:05:58 +00:00
Douglas Lovell
ce8695c951 Merge branch 'dcl-i1261b' 
GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6
 2019-03-11 11:05:47 +00:00
Douglas Lovell
44dd7c1c75 Merge remote-tracking branch 'origin/as-fix-email-address' 
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
 2019-03-11 11:05:36 +00:00
Simon Detheridge
96759a90f4 Merge pull request #1578 from sharelatex/jel-student-disclaimer 
Show disclaimer on student subscription trials

GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
 2019-03-11 11:04:46 +00:00
Hugh O'Brien
491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out 
v2 metrics email opt out and last sent tracking

GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
 2019-03-11 11:03:39 +00:00
Douglas Lovell
9b6ac8f715 Merge remote-tracking branch 'origin/ta-entity-create-form-fix' 
GitOrigin-RevId: e16167515c1c64bb350751fc1e748b719446a5b3
 2019-03-11 11:03:28 +00:00
Hugh O'Brien
f887bcb121 Merge pull request #1556 from sharelatex/cmg-search-clearing 
Stop search bar clearing on enter

GitOrigin-RevId: c3dc6236e3fd889b229f68633a17b396cbe45f60
 2019-03-11 11:03:07 +00:00
Paulo Jorge Reis
46c6d11574 Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar 
Show the toolbar in SL history projects.

GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
 2019-03-11 11:01:56 +00:00
Simon Detheridge
6e960492ff Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept 
Fix broken accept-team-invite page

GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
 2019-03-11 11:01:10 +00:00
Simon Detheridge
5d8b8ff012 Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite 
Only prompt for group cancellation if group is personal when accepting invite

GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
 2019-03-11 11:00:48 +00:00
Simon Detheridge
c6b8ab3245 Merge pull request #1542 from sharelatex/as-fix-noopener 
Fix some missing noopener attributes

GitOrigin-RevId: a833fc26b2c783bb713f771fb2ae4a494e5fec63
 2019-03-11 11:00:17 +00:00
Jessica Lawshe
b8bb118fe3 Merge pull request #1528 from sharelatex/jel-portal-print 
Update portals for printing

GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d
 2019-03-11 10:59:47 +00:00
Chrystal Maria Griffiths
e379691767 Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener 
Add some missing rel="noreferrer noopener" attributes

GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d
 2019-02-15 13:33:54 +00:00
Chrystal Maria Griffiths
9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice 
Show sanitized HTML for team notice on subscription page

GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
 2019-02-15 13:33:28 +00:00
Timothée Alby
c4dd8b5da8 Merge pull request #1502 from sharelatex/jel-social-metatags 
Update `og` metatags and add protocol to image URL

GitOrigin-RevId: 9548ca5f378cb770e454bc75062e80bd1c3da9ac
 2019-02-12 15:48:00 +00:00
Timothée Alby
fb5caf7b63 Merge pull request #1504 from sharelatex/jel-portal-sign-in-redirect 
Add redircts when signing in/up via portal

GitOrigin-RevId: b84105f35b5f1c14fa57ca91e766b8b6de00ccd7
 2019-02-12 15:47:53 +00:00
Simon Detheridge
255981bdc2 Merge pull request #1486 from sharelatex/ta-subscription-dash-fix 
Fix Subscirption Dashboard Messaging

GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99
 2019-02-11 11:42:34 +00:00
Ersun Warncke
81e3db260c Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route 
Add close site setting and private disconnect all users route

GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
 2019-02-06 14:24:52 +00:00
Brian Gough
c51461da09 Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url 
allow setting separate wsUrl for websockets

GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
 2019-02-06 10:20:36 +00:00
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
2463fef390 Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging 
Subscription page messaging updates

GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
 2019-02-04 16:24:35 +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
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
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
dd41a50377 Merge pull request #1151 from sharelatex/jel-wiki-search-a11y 
Accessible Wiki Search

GitOrigin-RevId: af9b5444fe1be1ced16f3049bfc1ac731c8bebd5
 2018-11-15 17:41:27 +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
Paulo Jorge Reis
4c9eee51df Merge pull request #1114 from sharelatex/as-fix-sentry-reporting 
Fix Sentry reporting

GitOrigin-RevId: 1bbe598b520fe9edb136a148cc57af63df77cec4
 2018-11-15 10:04:23 +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
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
Chrystal Maria Griffiths
afbeec3b02 Merge pull request #1099 from sharelatex/ta-management-ui-title 
Management UI Wording Tweaks

GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544
 2018-11-13 10:53:56 +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
Jessica Lawshe
fceb8e9e66 Merge pull request #1096 from sharelatex/jel-plans-mobile-layout 
Plans page mobile layout

GitOrigin-RevId: d650447bd7df4eda17471c2fa7fb2b376fcc0172
 2018-11-08 16:11:49 +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
Simon Detheridge
baa5574669 Merge pull request #1120 from sharelatex/spd-bonus-page-facebook-link 
Use asynchronous initialisation for Facebook API

GitOrigin-RevId: 263817edcd8fee03d2d2bf62453e247f61128cdc
 2018-11-07 10:37:13 +00:00
Alasdair Smith
4733a7940d Merge pull request #1100 from sharelatex/as-html-lang-attr 
Add lang attribute to html tag

GitOrigin-RevId: ddc22ae6e742d9b501bac8d3c35d6640a7635b92
 2018-11-05 14:17:47 +00:00
Jessica Lawshe
81f027b4c3 Merge pull request #1104 from sharelatex/jel-content-bg-color 
Lighten .content-alt background color

GitOrigin-RevId: 3a1f73a469b1a2bb537a3f15722ce115f54e1ed0
 2018-11-01 17:48:20 +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
Timothée Alby
92582fdc38 Merge pull request #1076 from sharelatex/ta-ui-error-handling 
Management UI Error Handling

GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
 2018-10-30 14:37:59 +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
Jessica Lawshe
7a03fbeb06 Merge pull request #1018 from sharelatex/jel-track-changes-info-page 
Styling for track changes info page and add existence checks for metadata

GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80
 2018-10-19 14:12:30 +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
Timothée Alby
c41fb5c9f4 Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation 
Email confirmation notification UI fixes
 2018-10-15 14:49:06 +02:00
Tim Alby
6f63cd7ca0 add notification to confirm unconfirmed emails 2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a refactor to use config file 2018-10-15 14:46:38 +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
Simon Detheridge
e7506489d1 Fix missing string in modals.pug 
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.

Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-10 15:06:37 +01:00
Paulo Reis
29787c42c5 Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates. 2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22 Merge pull request #1005 from sharelatex/spd-no-more-asterisks 
Sanitize paths in all relevant ProjectEntityHandler methods
 2018-10-10 10:44:13 +01:00
Simon Detheridge
32149e652f Handle 'invalid element name' error in project list ui 
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.

Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7 update error message 2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800 add account merge error 2018-10-09 09:47:03 -04:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Chrystal Griffiths
7ae39a0f84 Revert to ng-show 2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7 Avoid duplicating code 2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412 Merge pull request #1008 from sharelatex/ta-fix-help-link 
fix link to link sharing help page
 2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c fix link to link sharing help page 2018-10-08 16:07:11 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850 
Display password change form in Account Settings
 2018-10-08 13:59:04 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout 
The CMS is already using `image`, which is an object based on data from the API.
 2018-10-05 11:06:21 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Jessica Lawshe
bbe847c16d Update default meta images 
Favicons are not picked up by social sites.
 2018-10-03 17:34:40 +01:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850 
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
 2018-09-24 09:11:48 -03:00
Alasdair Smith
b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith
945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +01:00
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Jessica Lawshe
d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates 
Plans page updates
 2018-09-20 09:00:58 -05:00
Hugh O'Brien
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03:00
Hugh O'Brien
78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta 
Replace profile completion CTA with affiliations CTA
 2018-09-19 11:32:55 +01:00
Hugh O'Brien
18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification 
Add notification to confirm unconfirmed emails
 2018-09-19 11:32:44 +01:00
Douglas Lovell
4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03:00
hugh-obrien
277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +01:00
Timothée Alby
7981d867e8 Merge pull request #924 from sharelatex/ta-sign-in-v1 
Change Links to v1 to Sign User In
 2018-09-18 12:24:08 +01:00
hugh-obrien
2d40c3d21a Use existing notification styling 2018-09-18 11:01:10 +01:00
hugh-obrien
f76ff55b6f email alert styling 2018-09-18 10:54:20 +01:00
hugh-obrien
e343c04423 add notification to confirm unconfirmed emails 2018-09-18 10:54:20 +01:00
Jessica Lawshe
4f5c12e9ac More specific group contact controller name and email subject 
This form is only used on the group contact modal.
 2018-09-17 10:47:57 -05:00
Jessica Lawshe
66bfbce45f Correct link mixin paths 2018-09-17 09:46:34 -05:00
Douglas Lovell
7d10e64840 Alter endpoint for account settings, change password form submission. 2018-09-14 16:19:02 -03:00
Tim Alby
09c92c0b69 don't encode / 2018-09-14 16:09:24 +01:00
Tim Alby
2e4d3d7aab change links to v1 to sign user in first 2018-09-14 14:26:16 +01:00
Chrystal Griffiths
6334066d2d Merge branch 'master' into cmg-share-modal 2018-09-14 12:09:10 +01:00
Chrystal Griffiths
915bd18058 Read-only collaborators table 2018-09-14 11:47:18 +01:00
Chrystal Griffiths
3b43cf9075 Slight copy change 2018-09-13 17:57:11 +01:00
Chrystal Griffiths
b51fc01bde Remove temporary solution 2018-09-13 17:17:18 +01:00
James Allen
ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
hugh-obrien
26defd0833 reword CTA 2018-09-13 13:54:43 +01:00
hugh-obrien
8697edc149 replace profile completion CTA with affiliationa adding CTA 2018-09-13 12:34:18 +01:00
Chrystal Griffiths
57ac858004 Style the notice 2018-09-13 12:19:44 +01:00
James Allen
5dbebc0693 Translate 'by' 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
Hugh O'Brien
24c479e984 Merge pull request #885 from sharelatex/hb-ip-matcher-notifications 
IP matcher affiliation CTA notifications
 2018-09-13 08:59:25 +01:00
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03:00
Chrystal Griffiths
46eadfada4 Conditionally show sharing bits 2018-09-07 17:23:03 +01:00
Jessica Lawshe
aa2f6ad0dd Merge pull request #880 from sharelatex/jel-v2-launch-plans 
Launch v2 Plans Page
 2018-09-06 08:51:05 -05:00
Shane Kilkelly
3d369b725c Add another confirmation checkbox to account-delete. 
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
 2018-09-06 11:35:28 +01:00
Jessica Lawshe
c3c2e524f5 Add quotes 2018-09-05 08:14:32 -05:00
Jessica Lawshe
40a412b6b9 Remove plans message about v2 beta 2018-09-05 08:14:05 -05:00
Jessica Lawshe
65b2715e62 Remove unused layout for v2 plans 2018-09-05 08:14:05 -05:00
hugh-obrien
5605e1c5c3 update copy for ip match notifications 2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f use new routes and params from v1 ip matcher endpoint 2018-09-05 11:22:26 +01:00
hugh-obrien
38faa5c25e correctly create and display ip matched affiliations 2018-09-05 11:22:25 +01:00
Shane Kilkelly
81c845850e Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1 
Account-delete, clarify what happens to v1 account and projects
 2018-09-05 10:22:32 +01:00
Christopher Hoskin
c3e64b12cf Remove 'beta' from v2 welcome text 2018-09-04 15:11:27 +01:00
Shane Kilkelly
680654f7e7 Account-delete, clarify what happens to v1 account and projects 2018-09-04 13:31:22 +01:00
Shane Kilkelly
7be716e889 Merge pull request #879 from sharelatex/sk-handle-user-account-delete 
Sk handle user account delete
 2018-09-03 10:41:49 +01:00
Shane Kilkelly
bafcf24cc9 Add missing column class to the change-password panel 2018-09-03 10:21:45 +01:00
Shane Kilkelly
1776482159 Update wording of the change-password instruction 2018-09-03 10:21:45 +01:00
Shane Kilkelly
0300ffbdc6 Bonus, add a link to the v1 settings page to change password 2018-09-03 10:21:45 +01:00
Shane Kilkelly
27a2e06d7b Revert "Move the new logic to the externalAuthenticationSystemUsed function" 
This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
 2018-09-03 10:21:45 +01:00
Shane Kilkelly
40a500648c Move the new logic to the externalAuthenticationSystemUsed function 2018-09-03 10:21:45 +01:00
Shane Kilkelly
be6720d805 Add a janky warning that this action will delete the account on v1 also. 2018-09-03 10:21:45 +01:00
Shane Kilkelly
9141f678b1 Show the account delete option on v2 2018-09-03 10:21:45 +01:00
Paulo Reis
60cbc989e2 Add delete as an inline table action (only when viewing archived projects). 2018-09-02 15:14:45 +01:00
Paulo Reis
fbf98d89f2 Improve the collapsing behaviour of 'change' entries in track-changes. 2018-09-01 15:36:02 +01:00
Paulo Reis
4ff7410391 Disable the review button when history is open. 2018-08-31 17:10:15 +01:00
Paulo Reis
f88a3815c6 Add loading spinner when cloning a project. 2018-08-31 16:14:20 +01:00
Paulo Reis
7e5094f53d Avoid z-index issues with the new project dropdown. 2018-08-31 15:37:22 +01:00
Paulo Reis
fc7b5bdd63 * Share button shown to all users, with a tooltip for non-admin; remove its id. 2018-08-31 15:33:56 +01:00
Timothée Alby
59b137e303 Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type 
Update university, role and department value as the user types.
 2018-08-31 13:15:01 +02:00
Jessica Lawshe
dff29637b7 Move quotes to partial 2018-08-30 09:52:55 -05:00
Jessica Lawshe
eb8e279ac7 Add border styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe
7d249f513b Remove Positive SSL badge for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c1d37a712c Update translations to use appName 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c920dc37d2 Update button classes for v2 
Use `.btn-default` instead of `.btn-info`
 2018-08-30 09:52:55 -05:00
Jessica Lawshe
26f2ff3d6f Unlink instapages for v2 FAQ and add group contact modal 
group contact link: v2 opens contact portal and SL opens instapage
 2018-08-30 09:52:50 -05: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
Paulo Jorge Reis
cf075b0c42 Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2 
Don't suggest bonus page to v2 users
 2018-08-30 11:29:41 +01:00
Paulo Jorge Reis
4be364cd93 Merge pull request #864 from sharelatex/pr-history-restore-placeholder 
Add a placeholder "restore" button, showing a tooltip.
 2018-08-30 11:25:25 +01:00
Paulo Jorge Reis
cb4d4145a1 Merge pull request #855 from sharelatex/pr-v2-light-theme 
v2 light theme
 2018-08-30 11:24:52 +01:00
Paulo Jorge Reis
8b9397f80c Merge pull request #863 from sharelatex/as-update-v1-import-modal 
Update project import modal to be more friendly near the launch
 2018-08-30 11:24:44 +01:00
James Allen
b86ac31c63 Don't suggest bonus page to v2 users 2018-08-30 10:56:31 +01:00
Jessica Lawshe
3a2400b212 Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links 
remove wufoo latex error response logging
 2018-08-29 12:24:22 -05:00
Jessica Lawshe
a5d84ecc0a Merge pull request #842 from sharelatex/jel-portals-user-affiliation 
Add dashboard link mixin
 2018-08-29 12:23:50 -05:00
Paulo Reis
79f1e7b0ee Update ui-select value as the user types. 2018-08-29 17:31:47 +01:00
Alasdair Smith
4174b8edee Update image and adjust size 2018-08-29 10:50:07 +01:00
Alasdair Smith
3dc437d932 More copy updates 2018-08-29 10:50:07 +01:00
Alasdair Smith
ff275e3425 Replace image and improve copy 2018-08-29 10:50:07 +01:00
Alasdair Smith
2e0d6ab305 Remove 2 step modal and make copy more friendly 2018-08-29 10:50:07 +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
Shane Kilkelly
b8ff6ae9a2 Merge pull request #862 from sharelatex/ta-increase-space 
Increase Spacing Between Buttons
 2018-08-29 09:21:31 +01:00
Shane Kilkelly
2c782fee67 Merge pull request #858 from sharelatex/sk-update-v2-migration-banner 
Update the color and wording of the warning message shown on SL
 2018-08-29 09:21:19 +01:00
Shane Kilkelly
6157db1964 Merge pull request #835 from sharelatex/sk-sanitize-system-messages 
Sanitize display of system messages.
 2018-08-29 09:21:07 +01:00
Shane Kilkelly
33a4882bd3 Update the color and wording of the warning message shown on SL 2018-08-29 09:08:44 +01:00
Paulo Reis
0df5c61c44 Add a placeholder restore button, showing a tooltip. 2018-08-28 21:35:35 +01:00
Jessica Lawshe
e1fbef6910 Move style from winning test variant to main class 
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.

Also alphabetize CSS classes.

Remove .more-details and extra .container from layout

CSS statements for .more-details were moved to .plans
 2018-08-28 12:42:09 -05:00
Jessica Lawshe
ae85bfafef Move FAQ to partial 2018-08-28 12:42:09 -05:00
Jessica Lawshe
e5c3d72e1a Move winning variant layout to main layout 2018-08-28 12:42:09 -05:00
Jessica Lawshe
8889f2aed2 Remove Plans and Pricing A/B Test 
Remove all layouts, analytics events, and scope related to the A/B test.

The group modal from the default layout of the A/B test should be maintained though for v2.
 2018-08-28 12:42:09 -05:00
Tim Alby
204423696d increase spacing between buttons 2018-08-28 17:34:49 +02:00
Paulo Reis
32ff66b0dd Add two more font-size options to the editor. 2018-08-28 14:52:25 +01:00
Paulo Reis
90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +01:00
Timothée Alby
8057f4e74d Merge pull request #849 from sharelatex/pr-fix-add-new-university 
Correctly invoke the function to add unknown universities.
 2018-08-28 14:03:35 +02:00
Paulo Reis
64c29787c0 Add i18n; update the review icon image. 2018-08-27 15:57:51 +01:00
Paulo Reis
efc926ffc5 Load theme as a user setting; allow the user to change it; update tests. 2018-08-27 15:25:00 +01:00
Tim Alby
e19882455a improve affiliation endorsement button 
- design as button instead of link
- disable unless role and department are set
 2018-08-27 11:32:48 +02:00
Tim Alby
7863561bff display university licence in affiliations UI 2018-08-27 11:26:13 +02:00
Paulo Reis
4f6f459bfe Remove debug code. 2018-08-24 15:35:52 +01:00
Paulo Reis
920c24cacb Correctly invoke the function to add unknown universities. 2018-08-24 15:29:48 +01:00
Nate Stemen
c034b0654b Merge branch 'master' into ns-remove-wufoo-log-links 2018-08-24 09:18:48 -04:00
Paulo Reis
2491bee38e Merge branch 'master' into pr-v2-light-theme 2018-08-24 12:11:16 +01:00
Paulo Reis
7c95de29cd Avoid breaking the page if isnt set. 2018-08-24 12:06:26 +01:00
Nate Stemen
80c74ce07b add back learn more link 2018-08-23 11:42:00 -04:00
Paulo Jorge Reis
d838f8778a Merge pull request #832 from sharelatex/pr-change-free-history-limits 
Change history limits for free users
 2018-08-23 14:02:08 +01:00
Jessica Lawshe
787f0fe239 Add dashboard link mixin 2018-08-22 16:35:06 -05:00
Nate Stemen
6d3b7cbe7b remove wufoo latex log responses 2018-08-22 15:45:08 -04:00
Henry Oswald
ab1848d0ae Add a trusted filter for iframe downloads (#836) 
* add trusted helper to iframe downloads
 2018-08-22 14:47:15 +01:00
Paulo Reis
a15706ce24 Merge branch 'master' into pr-v2-light-theme 2018-08-22 11:19:01 +01:00
Shane Kilkelly
7f7b10aa09 Sanitize display of system messages. 
When showing system-messages, use default Angular sanitizer, also,
on the admin panel itself, show the verbatim text of the message.

This solves a mild Stored-XSS vulnerability whereby a user could
put `<script>` tags in a message. We don't want that, but we do want
to be able to use basic html tags.
 2018-08-22 10:15:50 +01:00
Jessica Lawshe
484d7acbc8 Merge pull request #817 from sharelatex/jel-mixins 
Add a mixin for FAQ search and move links mixin file
 2018-08-21 11:44:30 -05:00
Paulo Reis
54e0a7cfd2 Merge branch 'master' into pr-change-free-history-limits 2018-08-21 11:23:28 +01:00
Jessica Lawshe
09efced352 Add pagination mixin and color variables 2018-08-20 09:25:33 -05:00
Paulo Jorge Reis
53a9a174a2 Merge pull request #821 from sharelatex/as-account-deletion-note 
Add message about deleting SL account affecting v2 account
 2018-08-20 13:58:50 +01:00
Jessica Lawshe
45cc278acb Add FAQ search mixin 2018-08-17 16:31:06 -05:00
Jessica Lawshe
f8b85cb848 Move link mixins to mixins folder 2018-08-17 16:12:24 -05:00
Jessica Lawshe
5b5ece37a5 Handle sixpack timeouts and include variant in metabase segmentation 
Render default when sixpack timesout

Only convert when variant exists

Use Angular cookies module to add variant cookie, which is used on the new subscription page.
 2018-08-17 10:29:45 -05:00
Paulo Reis
96aa418b94 Show upgrade prompts when the free history limit is hit. 2018-08-17 16:04:31 +01:00
Paulo Reis
fc424aee9e Adapt styles to avoid layout breaking/showing options that do not make sense when no history entries are loaded. 2018-08-17 15:31:59 +01:00
Alasdair Smith
b9e63421a8 Merge pull request #814 from sharelatex/as-fix-delete-modal-copy 
Fix delete wording on archive modal
 2018-08-16 16:33:30 +01:00
Alasdair Smith
3b31125a62 Add message about deleting account affecting v2 
Only show on SL and if the user has linked accounts
 2018-08-16 14:11:43 +01:00
Paulo Reis
02701a996d Merge branch 'master' into pr-history-labels-part-2 2018-08-16 11:56:36 +01:00
Paulo Reis
652be9efe6 Slightly adapt the markup for the generic history error. 2018-08-16 11:41:19 +01:00
Paulo Reis
23bb866988 Show an error message when history fails to load updates. 2018-08-16 11:26:34 +01:00
Jessica Lawshe
2c9977d26e Add analytics to link mixins 2018-08-14 12:06:28 -05:00
Jessica Lawshe
cf532b93d8 Merge pull request #784 from sharelatex/jel-portals 
Add styling and mixins for portals
 2018-08-14 12:00:36 -05:00
Timothée Alby
5e488dcab7 Merge pull request #813 from sharelatex/ta-enable-affiliations-ui 
Enable Affiliations UI
 2018-08-14 16:40:35 +02:00
Paulo Reis
663ca275cb Add i18n. 2018-08-13 17:09:18 +01:00
Alasdair Smith
bd94e55ce9 Handle archive and leave action 2018-08-13 14:25:38 +01:00
Alasdair Smith
009c5c363b Also fix modal body for archiving projects 2018-08-13 14:25:38 +01:00
Alasdair Smith
5836c029c8 Show archive heading if archiving and on OL 2018-08-13 14:25:38 +01:00
Alasdair Smith
274ac8b1ba Another fix 2018-08-13 14:25:38 +01:00
Alasdair Smith
085c2529d9 Inject isOverleaf setting globally 2018-08-13 14:25:38 +01:00
Tim Alby
bfb2f636cd enable affiliations UI 2018-08-13 14:59:39 +02:00
Paulo Reis
2ee42af1de Change strategy to store selected label; improve the history toolbar layout to accomodate larger labels; fix issues with layout not being updated when changing history view modes. 2018-08-13 13:39:25 +01:00
Brian Gough
19dfe5fc8b intial version of user setting for texlive imageName 2018-08-13 10:53:43 +01:00
James Allen
a9a6dcf82a Move template modal to template module 2018-08-10 17:17:00 +01:00
Paulo Reis
a5c6f81573 Merge branch 'master' into pr-history-labels-part-2 2018-08-10 15:57:32 +01:00
Paulo Reis
7e86218b21 Allow multiple events to trigger layout external resizes. 2018-08-10 11:28:17 +01:00
Alasdair Smith
7830a5f69d Update copy in v1 import modal now that more features are supported 2018-08-09 13:21:11 +01:00
Paulo Reis
4f4ab57958 Use controller binding in the label tooltip. 2018-08-09 12:05:00 +01:00
Paulo Reis
d6ab993519 Dont hide history entries while loading. 2018-08-09 12:00:53 +01:00
Paulo Reis
d59fe61a83 Handle sorting of labels; keep selection between view changes. 2018-08-09 11:03:00 +01:00
Paulo Reis
f2b957e5b3 Add history labels view. 2018-08-08 13:46:43 +01:00
Paulo Reis
cd853abb3c Load labels list from the backend. 2018-08-08 11:02:14 +01:00
Paulo Reis
7e8e2a89ae Create history labels list component. 2018-08-08 11:01:51 +01:00
Paulo Reis
9a27a39f55 Make tooltip optional in the label component. 2018-08-08 11:01:20 +01:00
Paulo Reis
b0261970fc Make label removal also work in compare mode. 2018-08-06 11:26:22 +01:00
Paulo Reis
e0707253a7 Remove debug lines and unneeded HTML. 2018-08-06 11:03:15 +01:00
Paulo Reis
bd6dcc007b Remove prototype code. 2018-08-06 11:00:45 +01:00
Paulo Reis
f418929dcf Adjust i18n. 2018-08-02 16:28:13 +01:00
Paulo Reis
2c2bb4c130 Add i18n; avoid injecting unneeded dependencies. 2018-08-02 16:28:13 +01:00
Paulo Reis
dc235b91d9 Fix some issues with the label tooltip in compare mode. 2018-08-02 16:28:13 +01:00
Paulo Reis
a8ee879746 Use history label component; restrict label deletion to label owners. 2018-08-02 16:28:13 +01:00
Paulo Reis
d21f6ef624 Label handling in compare mode. 2018-08-02 16:28:13 +01:00
Paulo Reis
5a64313e24 Add label delete functionality; styles. 2018-08-02 16:28:13 +01:00
Paulo Reis
3a80c34078 Basic label support (showing labels in the entries list; creating labels via a modal). 2018-08-02 16:28:13 +01:00
Jessica Lawshe
c7941ac00e Links mixins 2018-07-26 10:35:48 -05: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
Alasdair Smith
ffe3bc2977 Switch review panel to use richTextEnabled variable 2018-07-18 09:26:03 +01:00
Alasdair Smith
4202b9c717 Use hard-coded feature flag for rich text 2018-07-18 09:26:03 +01:00
Alasdair Smith
fba0cd04f5 Fix TC underlines being offset because review panel above editor toolbar 2018-07-17 17:34:09 +01:00
Jessica Lawshe
64a257dae2 Merge pull request #708 from sharelatex/jel-mathjax 
MathJax - library path, directive, and use `Safe` extension
 2018-07-17 09:32:06 -05:00
James Allen
4435eab423 Update affiliations UI to show specific errors for conflicting emails 2018-07-17 11:12:47 +01:00
James Allen
b150a7b4ae Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments 
Affiliations UI, second round
 2018-07-16 10:08:47 +01:00
James Allen
a238c74440 Remove inline style 2018-07-13 11:19:49 +01:00
Alasdair Smith
b00cad19ff Merge pull request #751 from sharelatex/as-fix-loading-toolbar 
Fix bug where loading panel was showing over toolbar
 2018-07-13 11:17:46 +01:00
James Allen
452d698a47 ng-show -> ng-if 2018-07-13 11:17:05 +01:00
James Allen
d7e0b8c369 Show unconfirmed email status in UI and add link to resend confirmation 2018-07-12 17:13:26 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
85cf518457 Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies. 2018-07-12 16:37:09 +01:00
Paulo Reis
c817094a2d Add i18n keys; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
4d1b6c6ba8 Add error handling. 2018-07-12 16:37:09 +01:00
Paulo Reis
c630c5d952 Preemptively remove front-end data when removing user emails. 2018-07-12 16:37:09 +01:00
Paulo Reis
19b57571bf Basic affiliation change implementation. 2018-07-12 16:37:08 +01:00
Paulo Reis
1514e5e071 Isolate affiliations form in a component. 2018-07-12 16:37:08 +01:00
Alasdair Smith
ba6560ce04 Fix bug where loading panel was showing over toolbar 2018-07-12 11:18:09 +01:00
Alasdair Smith
dc56ffb8a6 Improve copy 2018-07-11 15:22:20 +01:00
Alasdair Smith
b1a47ddae4 Improve copy 2018-07-11 15:15:22 +01:00
Alasdair Smith
538aba323a Add first pass at unsupported message and style 2018-07-11 15:15:22 +01:00
Alasdair Smith
00c089448e Add review panel unsupported message 2018-07-11 15:15:22 +01:00
Alasdair Smith
9d81cf20f9 Add new unsupported class to control visibility while rich text is open 2018-07-11 15:15:22 +01:00
Paulo Reis
2ef1b4904d Bootstrap the light theme. 2018-07-09 15:45:09 +01:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Alberto Fernández-Capel
a1c49b0cf9 Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects 
Add a warning message when there are no other projects to choose.
 2018-07-03 13:38:33 +01:00
Alasdair Smith
04a98c4d91 Merge pull request #697 from sharelatex/pr-user-affilitations 
User affiliations
 2018-07-02 11:36:04 +01:00
Alberto Fernández Capel
d76a6ae710 Ensure overleaf settings is defined before linking to the v1 subscription page 2018-06-29 15:33:03 +01:00
Paulo Reis
d021cd8e3f Add role hints and deparment hints (when not provided by the uni). 2018-06-28 16:37:36 +01:00
Jessica Lawshe
a34dcef8b7 Use express local for MathJax path 2018-06-27 17:27:27 -05:00
Paulo Reis
270c67df5f Move affiliations form and table into specific file. 2018-06-27 17:08:25 +01:00
Paulo Reis
d1467784bb Avoid showing a comma when the user only has department info. 2018-06-27 14:21:03 +01:00
Jessica Lawshe
9f5e976539 Merge pull request #681 from sharelatex/jel-cms-meta-and-btn 
CMS: control of metadata
 2018-06-26 08:19:57 -05:00
Shane Kilkelly
c5defc9203 Update wording, tell user to create another project 2018-06-26 09:54:58 +01:00
James Allen
fbfb0d6472 Remove conflicting .modal class from upload alerts 2018-06-26 09:09:10 +01:00
Paulo Reis
e7f819fbdd Hide affiliations UI behind feature flag. 2018-06-25 17:06:23 +01:00
Paulo Reis
8ac6f4d6f4 Use v1 proxy; even more style adjustments. 2018-06-25 16:13:43 +01:00
Paulo Reis
b92dc98b99 Merge branch 'master' into pr-user-affilitations 2018-06-25 14:13:26 +01:00
Paulo Reis
00dfcf66c6 More styling adjustments. 2018-06-25 13:44:43 +01:00
Shane Kilkelly
b3d17fc753 Add a warning message when there are no other projects to choose. 2018-06-25 11:48:05 +01:00
Shane Kilkelly
f6424ada40 Merge pull request #655 from sharelatex/sk-linked-files-output-redux 
Linked files from project output
 2018-06-25 10:28:29 +01:00
Jessica Lawshe
af2417bdc5 Move metadata to separate file and update metadata existence check 2018-06-22 13:42:01 -05:00
Paulo Reis
a1da24a86d Styling adjustments. 2018-06-22 16:07:54 +01:00
James Allen
c004cdb200 Remove hardcoded ShareLaTeX reference in upgrade blurb 2018-06-22 14:24:41 +01:00
Shane Kilkelly
ebe828aa62 Refactor, and remove the source_project_display_name prop from linkedFileData 2018-06-22 13:09:18 +01:00
Shane Kilkelly
67dcbff450 Remove linked-files items from the left-menu test controls 2018-06-22 13:09:18 +01:00
Shane Kilkelly
7fc99a38f8 Better styling on the output-files toggle 2018-06-22 13:08:13 +01:00
Shane Kilkelly
6672a20c2b Enable switching between source and output files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
64ec90f34f Move the isOutputFilesMode flag onto the scope 2018-06-22 13:08:13 +01:00
James Allen
5717496685 Create unified new file modal with linked files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
d4beba24b6 Backend for project output file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
e916d96792 WIP: basic backend for project-output-file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
ead245721b Mostly working selection of output files from another project 2018-06-22 13:08:13 +01:00
Shane Kilkelly
60ca298db3 WIP 2018-06-22 13:08:13 +01:00
Paulo Reis
9bc70d479c Use university-provided list of departments when available. 2018-06-22 11:24:14 +01:00
Paulo Reis
62ab9dbb98 Rearrange layout to have the new affiliation form within the affiliations table. 2018-06-21 17:18:01 +01:00
James Allen
46fbf0c641 Merge pull request #672 from sharelatex/ja-refactor-email-templating 
Refactor email templating
 2018-06-21 10:28:26 +01:00
James Allen
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
Paulo Reis
147d74d92a Integrate e-mails table with backend. 2018-06-20 14:22:06 +01:00
Paulo Reis
917776aede Change the UI to gradually show needed fields for affiliations. 2018-06-20 11:37:55 +01:00
Paulo Reis
c0241df15c Rewrite service and controller code to send the correct payload according to use case (no uni; known uni; new uni). 2018-06-19 17:10:55 +01:00
Jessica Lawshe
ad50db858e Merge pull request #664 from sharelatex/jel-pricing-plans-event 
Plans and Pricing Google Analytics events
 2018-06-19 08:48:12 -05:00
James Allen
a3e92a8867 Merge pull request #658 from sharelatex/ja-enable-subscriptions 
Add message explaining Collaborator subscription to v1 users
 2018-06-19 08:37:50 +01:00
Jessica Lawshe
fe225fbbd3 Include event label when features table viewed 2018-06-15 16:29:42 -05:00
Paulo Reis
3ddb8d0bef Add affiliations UI. 2018-06-15 11:33:47 +01:00
James Allen
eda031023c Update subscription thank you page to remove ShareLaTeX references 2018-06-14 10:15:20 +01:00
James Allen
1e7601d647 Add null check to subscription dash 2018-06-14 09:03:14 +01:00
James Allen
e5bd7ce551 Add message explaining Collaborator subscription to v1 users 2018-06-13 17:22:34 +01:00
James Allen
82c6d9b293 Merge pull request #629 from sharelatex/ja-display-subscriptions 
Link subscriptions to v1
 2018-06-13 13:55:57 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
James Allen
a417dc8ff4 v1Subscription -> v1Subscriptions 2018-06-12 13:52:47 +01:00
James Allen
9d84263463 Fetch subscription details from v1 and display to user 2018-06-12 13:52:46 +01:00
James Allen
1d7accabdd Update group notification for new group invite URL 2018-06-12 09:54:54 +01:00
James Allen
f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens 
Use emails with tokens for team invites
 2018-06-12 08:30:23 +01:00
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01:00
Jessica Lawshe
07aedaa92b Merge pull request #645 from sharelatex/jel-add-cms 
Existence check for data from CMS
 2018-06-08 10:14:23 -05:00
Jessica Lawshe
43da34098e Existence check 2018-06-08 10:07:44 -05:00
Jessica Lawshe
ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms 
Add CMS
 2018-06-08 07:18:03 -05:00
Jessica Lawshe
d57660aeb5 Merge pull request #632 from sharelatex/jel-plans-pricing-fix 
Plans and Pricing fixes
 2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-08 12:21:17 +01:00
Alberto Fernández Capel
c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +01:00
Alasdair Smith
8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave 
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
 2018-06-06 16:59:13 +01:00
Alberto Fernández Capel
4885b70016 Better translation key 2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b Replace hardcoded string 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
b308dcef63 Clean up markup 
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
 2018-06-06 15:36:53 +01:00
Jessica Lawshe
679d91c4d2 Update default plans view conditional 
Fixes a flash of unwanted content on Firefox
 2018-06-05 12:58:18 -05:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Jessica Lawshe
b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans 
Plans and pricing variant
 2018-06-05 09:30:43 -05:00
Paulo Reis
bfad95ae61 File restore button needs to be smaller to fit the new toolbar height. 2018-06-05 13:59:27 +01:00
Paulo Reis
4088c164c9 Update translations; use underscores for keys. 2018-06-05 11:15:39 +01:00
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Paulo Reis
1624639bc8 Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui 2018-06-05 10:32:06 +01:00
Paulo Reis
f858786f2d Add i18n. 2018-06-05 10:14:16 +01:00
Jessica Lawshe
10cf5825a5 Add plans variant 
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
 2018-06-04 14:42:26 -05:00
Jessica Lawshe
64ead238e4 Add meta tags 2018-06-04 09:51:35 -05:00
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
Hugh O'Brien
a79c9b94a8 Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web 
Extract v1 templates code to web
 2018-06-01 11:29:36 +01:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Brian Gough
fef667a738 Merge pull request #614 from sharelatex/ja-restrict-restore 
Don't allow read-only users to restore
 2018-05-31 15:52:40 +01:00
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin 
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
 2018-05-31 14:25:47 +01:00
James Allen
f5367985c3 Don't allow read-only users to restore 2018-05-31 13:44:37 +01:00
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c extract v1 templates code to web 2018-05-31 11:12:31 +01:00
Shane Kilkelly
d3ae276091 Merge pull request #579 from sharelatex/sk-linked-files-from-project 
Linked Files from Project
 2018-05-31 11:08:08 +01:00
Alasdair Smith
57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns 
Add action buttons to v2 dash
 2018-05-31 10:11:20 +01:00
Alasdair Smith
5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith
7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith
2354f4156b Download project action button 2018-05-31 10:04:59 +01:00
Alasdair Smith
ffc06f2a3b Archive project action button 2018-05-31 10:04:50 +01:00
Alasdair Smith
a2dff4bfbb Right align actions header 2018-05-31 09:59:35 +01:00
Alasdair Smith
83c62c8ab1 Only show action buttons on v2 2018-05-31 09:58:39 +01:00
Alasdair Smith
20cca0fcd4 Add action buttons to project list 2018-05-31 09:58:18 +01:00
James Allen
4f5148e668 Wrap text like normal 2018-05-30 17:55:47 +01:00
Paulo Reis
6e7e76a3ce Margin and padding adjustments. 2018-05-30 17:34:46 +01:00
Paulo Reis
66d7bdb26b Change buttons copy. 2018-05-30 15:03:22 +01:00
Paulo Reis
4c4a4f10c1 Rename history file tree and move it around. 2018-05-30 14:21:01 +01:00
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +01:00
Alasdair Smith
d0b160d9a2 Rename flag for clarity 2018-05-30 11:55:09 +01:00
Alasdair Smith
c6d2b4f1e7 Use single rich text include instead of split toolbar & body includes 2018-05-30 11:44:27 +01:00
Alberto Fernández Capel
7e09c0e0b1 First stab at email token invites (WIP) 2018-05-30 11:29:21 +01:00
Paulo Reis
637c492e6e Merge branch 'master' into pr-v2-history-ui 2018-05-30 11:24:33 +01:00
Paulo Reis
8d2189f843 Support using both point-in-time and compare modes. 2018-05-29 16:50:15 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Shane Kilkelly
0cb5beb689 Merge branch 'master' into sk-linked-files-from-project 2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911 Merge pull request #582 from sharelatex/sk-add-test-controls-panel 
Add a "Test Controls" section to the left-panel
 2018-05-24 11:41:10 +01:00
Shane Kilkelly
578d667efa Disable the 'select a project/file' options in project-linked-file modal 2018-05-24 11:30:53 +01:00
Shane Kilkelly
561b62f7db Add a hidden 'Test Controls' section to the left-menu. 
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
 2018-05-23 12:37:42 +01:00
Paulo Reis
fb33fc6c30 Add loading indicators; handle binary files; keep selected file across points in time. 2018-05-23 12:14:27 +01:00
James Allen
2ff5ecb342 Use intelligent /user/trial v2 URL for v2 trials 2018-05-22 16:59:59 +01:00
Paulo Reis
f4f3a4375b Add history toolbar (just scaffolding); show files at point in time. 2018-05-22 15:40:57 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Paulo Reis
81c93e11d0 History file tree integration with the backend. 2018-05-21 15:13:34 +01:00
Shane Kilkelly
1f2ee4e3fc Show error if refresh fails 2018-05-21 11:02:12 +01:00
James Allen
8b533841d4 Merge pull request #563 from sharelatex/ja-hide-timeout-upgrade 
Put the compile timeout upgrade behind an enableSubscriptions flag
 2018-05-17 11:55:28 +01:00
James Allen
e7a4aeaf79 Merge pull request #560 from sharelatex/ja-enable-v2-for-all 
Enable the v2 banner for everyone if showV2Banner is set
 2018-05-17 11:55:21 +01:00
James Allen
3724edfc10 Fix translation string interpolation 2018-05-17 11:25:14 +01:00
Shane Kilkelly
c626446aad Tidy up the project/file display in project-linked-file 2018-05-16 13:52:54 +01:00
Shane Kilkelly
9624e2a290 Record the source project display name, to render with the file 2018-05-16 13:44:21 +01:00
Shane Kilkelly
f533674dbd Clean up 2018-05-16 13:26:59 +01:00
Shane Kilkelly
7292602167 More fine-grained loading spinners 2018-05-16 11:49:10 +01:00
Shane Kilkelly
74d8e67a05 Remove leading slash from path names, for display 2018-05-16 10:58:56 +01:00
Shane Kilkelly
f2702c7b0a Show the linked-files UI for project-linked-files 2018-05-16 10:41:21 +01:00
Shane Kilkelly
103832af7d Functioning project-linked-file importer 2018-05-16 10:29:51 +01:00
Shane Kilkelly
9c33f3f8bc WIP: Project Linked File modal 2018-05-15 16:22:47 +01:00
James Allen
66846cc68c Put the compile timeout upgrade behind an enableSubscriptions flag 2018-05-15 10:17:04 +01:00
James Allen
58b5d67bdd Enable the v2 banner for everyone if showV2Banner is set 2018-05-14 10:29:42 +01:00
James Allen
35dc518d05 Merge pull request #553 from sharelatex/ja-configurable-fonts 
Allow font family and line height to be user configurable
 2018-05-11 13:50:03 +01:00
Alasdair Smith
df9294816e Show archive or leave icon based on selected projects 2018-05-11 13:46:15 +01:00
Alasdair Smith
64061f0079 Switch name of deleted projects to archived projects to reduce confusion 2018-05-11 13:45:33 +01:00
James Allen
331f9ea9df Translate default 2018-05-10 18:04:30 +01:00
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
James Allen
78aefc2871 Merge pull request #542 from sharelatex/ja-match-front-to-v1 
Update font and line spacing in Ace to match OL v1
 2018-05-09 12:24:37 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
James Allen
42ac8faaae Add dependency mapping for vim keybindings 2018-05-03 17:01:34 +01:00
James Allen
09486f2eea Recompile on Cmd-S and :w 2018-05-03 12:20:53 +01:00
Paulo Reis
9f6dc12658 Add custom styling; add code to handle point-in-time selection. 2018-05-01 17:27:51 +01:00
James Allen
d2e54c5e0c Merge pull request #504 from sharelatex/afc-show-group-export-csv 
Show export user CSV even if the group has reached max capacity
 2018-05-01 08:50:04 +01:00
James Allen
a294fe795c Merge pull request #519 from sharelatex/ja-relative-dates-in-v2 
Display last modified as a relative date in v2
 2018-05-01 08:48:14 +01:00
James Allen
6399621d1f Show front widget for paid and sampled free users 2018-04-30 17:13:57 +01:00
James Allen
5c87a2aa90 Display last modified as a relative date in v2 2018-04-27 16:50:46 +01:00
Paulo Reis
6e6bc91130 Style the history entries components. 2018-04-27 15:59:28 +01:00
Paulo Reis
8249f4e17e Wrap copies of existing history UI elements in components. 2018-04-27 11:22:20 +01:00
Alasdair Smith
4759097e49 Merge pull request #494 from sharelatex/as-main-role 
Add main role
 2018-04-25 09:45:17 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4 
Payment page improvments
 2018-04-24 09:01:34 +01:00
Jessica Lawshe
8bedd99d73 Merge pull request #492 from sharelatex/jel-annual-buy-text 
Update button text for annual plan
 2018-04-23 11:35:09 -05:00
Jessica Lawshe
5d5edb7808 Button text for annual plan 
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
 2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994 Don't include v1 folders in "Add to folders" list 2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309 Don't show dropdown for v1 folders 2018-04-23 11:34:10 -05:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar 
Add toggle switch directive to editor toolbar
 2018-04-23 10:04:12 +01:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works 
it may have been broken from an angular upgrade or similar.
 2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352 capitalise month and year on payment page 2018-04-16 15:11:31 +01:00
Henry Oswald
39e41681a0 change to plans[currencyCode]['symbol'] from price.currency.symbol 
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
 2018-04-16 12:19:55 +01:00
Alasdair Smith
671a2c9767 Make content wrapper have main role 2018-04-16 11:43:24 +01:00
Alasdair Smith
3482724679 Make ide body have main role 2018-04-16 11:33:53 +01:00
Henry Oswald
086f080ee4 add !isFormValid(simpleCCForm) back in, was used during debugging 2018-04-16 11:01:14 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144 make a seperate external error class which is used on entire payment form 2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f add highlight for bad card/cvv/mmyy number in. 2018-04-16 10:26:39 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Henry Oswald
c050791905 change ng to use show/hide 
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
 2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae remove the form control, it just breaks the iframe styling 2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Jessica Lawshe
8d2c3ca6a1 Remove undefined controller 2018-04-12 11:53:31 -05:00
Jessica Lawshe
f9a56f7b37 Remove unknown experiments 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment 
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
 2018-04-12 10:18:15 -05:00
Alasdair Smith
c87cb1d361 Basic styles for editor toolbar 2018-04-12 13:46:19 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
c3b2af4345 Instead of checking RT flag at compile time, adjust at run time 2018-04-06 16:59:06 +01:00
James Allen
1e8439a2c6 Fix restore of docs from old deleted docs 2018-04-06 10:30:13 +01:00
James Allen
415be6b4e0 Open file after restoring 2018-04-06 10:30:13 +01:00
James Allen
0a1c543841 Hook up front end to restore documents 2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce First pass at restore end point 2018-04-06 10:30:13 +01:00
Paulo Reis
2e898bcf13 Use LESS to conditionally hide SL assets. 2018-04-03 09:01:43 -05:00
Paulo Reis
396b29f32d Conditionally load SL assets on error pages; adjust styles for OL v2. 2018-04-03 09:01:42 -05:00
Jessica Lawshe
b2c7bb9d95 Track v2 onboard events 
Added events to the v2 banner to track on Metabase and Google
Analytics.
 2018-04-03 08:48:11 -05:00
James Allen
216b17ab92 Fill in v2 link 2018-04-03 11:55:19 +01:00
Alasdair Smith
672305c9c2 Merge pull request #453 from sharelatex/ja-update-import-modal 
Tone down and reword v1 import modal
 2018-04-03 10:24:39 +01:00
Paulo Jorge Reis
bc46044f85 Merge pull request #466 from sharelatex/pr-v2-system-messages 
v2 system messages
 2018-03-28 15:17:26 +01:00
Paulo Jorge Reis
efee5a88bf Merge pull request #434 from sharelatex/jel-preview-unsupported 
Remove expressions used for debugging
 2018-03-28 15:16:49 +01:00
Paulo Reis
525deabc2b Move language subdomain message into the projects list too; make the close buttons similar. 2018-03-28 13:54:02 +01:00
Paulo Reis
b8049f3c46 Move system messages into the project list page (only). 2018-03-28 12:05:32 +01:00
Alasdair Smith
2e93e0bf23 Revert "Hotfix RT button showing up when it isn't enabled" 2018-03-28 10:13:23 +01:00
Alasdair Smith
4217b48a15 Hotfix RT button showing up when it isn't enabled 2018-03-27 20:10:03 +01:00
James Allen
21424f6bba Add placeholder read more link 2018-03-27 10:36:57 +01:00
Paulo Jorge Reis
70433e59da Merge pull request #447 from sharelatex/ja-remove-sixpack-from-history 
Don't show history teaser image since it refers to SL
 2018-03-27 10:10:27 +01:00
Paulo Jorge Reis
9a1a0794f3 Merge pull request #450 from sharelatex/pr-v2-favicons 
V2 favicons and related assets
 2018-03-27 10:09:34 +01:00
Paulo Jorge Reis
8f7228d26e Merge pull request #437 from sharelatex/pr-v2-splitters 
Improve v2 splitters
 2018-03-27 10:08:05 +01:00
Paulo Jorge Reis
f633276570 Merge pull request #438 from sharelatex/ja-panel-style-tweaks 
Focus and spacing tweaks
 2018-03-27 10:07:17 +01:00
James Allen
dc1b30dc8e Update import modal to be less scary 2018-03-26 15:11:17 +01:00
Paulo Reis
b7a11ff766 Add Overleaf favicon-related assets; configure layout.pug to show the Overleaf green when tinting the SVG favicon. 2018-03-26 14:24:53 +01:00
James Allen
d2ba1c7266 Don't show history teaser image since it refers to SL 2018-03-26 11:43:48 +01:00
Alasdair Smith
5e2f838af4 Instead of loading script directly use requirejs config so it can be lazy loaded 2018-03-23 13:52:48 +00:00
Alasdair Smith
1a0154c9ea Load rich text code from module view include instead of hard coding 2018-03-23 12:37:16 +00:00
Alasdair Smith
74099440f3 Generate webpack entry points including modules 2018-03-23 12:37:16 +00:00
James Allen
d517bae95c Merge pull request #423 from sharelatex/ja-set-google-analytics-cookie-domain 
Set ga cookie domain to same as site
 2018-03-23 11:52:00 +00:00
James Allen
45c853d30a Merge pull request #425 from sharelatex/ja-disable-beta-program 
Disable beta program pages
 2018-03-23 11:51:46 +00:00
James Allen
be3306aa0b Focus and spacing tweaks 2018-03-22 17:18:47 +00:00
James Allen
b1ca81bf2d Merge pull request #430 from sharelatex/ja-hide-v2-notification 
Allow dismissing/hiding v2 and v1 banners
 2018-03-22 16:33:02 +00:00
Paulo Reis
906f4899aa Only use custom togglers in v2. 2018-03-22 12:10:34 +00:00
Paulo Reis
db68134f81 Add i18n. 2018-03-22 11:48:14 +00:00
Jessica Lawshe
f37c34db19 Remove expressions used for debugging 2018-03-21 16:50:37 -05:00
Paulo Reis
3f073c2341 Rename attributes and vars for clarity 2018-03-20 16:11:09 +00:00
Paulo Reis
a3034fc79f Enable custom togglers. 2018-03-20 16:11:09 +00:00
James Allen
a023512872 Collapse panel with v1 info 2018-03-20 13:50:51 +00:00
Jessica Lawshe
89cfd98af3 Add details to analytics label 2018-03-20 08:31:35 -05:00
James Allen
3551f1453b Use flexible height v2 message panel 2018-03-20 12:15:18 +00:00
James Allen
d8ed0e5277 Allow v2 notification banner to be dismissed 2018-03-20 12:15:18 +00:00
James Allen
161d7b1d9d Disable beta program pages 2018-03-20 12:03:48 +00:00
James Allen
10aa4a29ca Set ga cookie domain to same as site 2018-03-20 11:54:03 +00:00
Alasdair Smith
408c195c6a Instead of using webpack chunk hashing, use existing system 2018-03-15 09:42:26 +00:00
James Allen
e77168d791 Don't render URL section if not linked file 2018-03-05 11:21:31 +00:00
James Allen
d4025908b7 Add in enabledLinkedFileTypes setting 2018-03-05 10:37:53 +00:00
James Allen
6848e97a82 Hook up refresh button to backend 2018-03-05 10:37:00 +00:00
James Allen
9733223840 Show linked file status in front end 2018-03-05 10:37:00 +00:00
James Allen
b1dda931f4 Add in modal for creating linked URL file 2018-03-05 10:37:00 +00:00
Paulo Reis
1b7d3917ed Update Front chat widget according to latest config changes. 2018-02-21 14:58:00 +00:00
Paulo Reis
12233a23c9 Avoid erroring if the front object is undefined. 2018-02-21 13:39:39 +00:00
Paulo Reis
978a8eae59 Move files around. 2018-02-21 13:39:39 +00:00
Paulo Reis
ef119402cf Add Front chat widget. 2018-02-21 13:39:39 +00:00
Alasdair Smith
fafbbfef87 Fix bug where cursor position wouldn't be saved when switching documents 
This was caused by an underlying bug/poor optimisation where the aceEditor
directive would be reconstructed every time when switching between documents.
This wiped instances like CursorPositionManager which relies on keeping state
between doc changes.

Now the directive is only removed when switching between Ace and CM. This
prevents other potential bugs and improves performance.
 2018-02-19 11:45:00 +00:00
Paulo Reis
ebad9091c7 Create class to scope main header changes (avoids overriding too much Bootstrap stuff); apply styles. 2018-02-15 11:08:12 +00:00
James Allen
a7fabb8e43 Merge pull request #321 from sharelatex/ja-recompile-tweaks 
Animate toolbar for auto-compile and consolidate trigger logic
 2018-02-14 09:34:16 +00:00
Brian Gough
5fef846a6c Merge pull request #323 from sharelatex/bg-translate-error-message-for-duplicate-names 
add translation for new doc/folder  "already exists" error
 2018-02-12 10:08:46 +00:00
Brian Gough
8e048bcf67 add translation for new doc/folder "already exists" error 2018-02-09 16:37:38 +00:00
Alasdair Smith
6088fcf82b Merge pull request #310 from sharelatex/ja-link-sharing-tweaks 
Link sharing UX improvments
 2018-02-09 11:23:28 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm 
CodeMirror
 2018-02-09 11:23:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Alasdair Smith
b9327cb2d4 Add toolbar with button to toggle rich text 2018-02-09 10:42:00 +00:00
Alasdair Smith
f5b6d3ff3e Load basic CM instance with dummy content 2018-02-09 10:38:51 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message 
improved recaptcha error message
 2018-02-09 10:26:33 +00:00
James Allen
bd9f30d858 Adjust icon spacing in PDF toolbar 2018-02-08 14:41:39 +00:00
James Allen
5bf2ff0a47 Show animated bar while auto-compile is pending 2018-02-08 13:39:56 +00:00
Brian Gough
9224e164fe Merge pull request #315 from sharelatex/bg-validate-filenames-client 
validate filenames on the client
 2018-02-08 09:16:05 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message 
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
 2018-02-07 14:15:13 +00:00
Brian Gough
ddf1d6e65e add valid-file directive for front-end 2018-02-06 11:46:50 +00:00
James Allen
6a1597560e Remove unused modal templates 2018-02-06 10:16:06 +00:00
James Allen
4f89506afc Make link sharing more prominant 2018-02-06 10:06:32 +00:00
James Allen
37115b8408 Add loading indicator while server returns links 2018-02-06 10:00:59 +00:00
James Allen
e7ba75c2e5 Don't show pop-up when changing link sharing status 2018-02-06 09:56:46 +00:00
James Allen
3e5527b826 UX tweaks to tags/folders side bar entry 2018-02-05 17:04:56 +00:00
James Allen
c89bbd7588 Merge pull request #296 from sharelatex/ja-show-v2-message 
Show v2 message if awareOfV2 flag set
 2018-02-02 11:04:06 +00:00
Brian Gough
5e52ade1ff Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames 
prevent duplicate filenames
 2018-01-31 11:50:45 +00:00
James Allen
9a9938083c Merge pull request #267 from sharelatex/as-remove-rollout 
Remove rollout logic for auto compile and link sharing
 2018-01-31 10:27:09 +00:00
James Allen
97c0577d8e Merge pull request #293 from sharelatex/ja-allow-sl-login-to-v2 
Show different message if user comes from SL instead of OL v2
 2018-01-31 10:23:22 +00:00
James Allen
de7f13aea6 Use hasFeature for message about returning to v1/SL 2018-01-31 10:05:56 +00:00
James Allen
aa6c16593e Add renamingToName override name for instant apparent renames 2018-01-31 09:42:41 +00:00
James Allen
12e55fb487 Show v2 message if awareOfV2 flag set 2018-01-26 16:44:14 +00:00
James Allen
7e829f6944 Fix OL v1 URL 2018-01-26 11:32:17 +00:00
James Allen
3ed805a65a Show different message if user comes from SL rather than OL v2 2018-01-24 16:56:51 +00:00
James Allen
a558d05ac6 Only show import modal for owned projects 2018-01-23 15:12:00 +00:00
James Allen
ce9a1fec87 Revert "Go back to allowing v1 projects to be imported" 2018-01-23 11:49:33 +00:00
James Allen
a5195fcbc3 Merge pull request #285 from sharelatex/hof-modal-success 
Stop import modal button flicker
 2018-01-23 10:35:37 +00:00
James Allen
2fb4059633 Merge pull request #258 from sharelatex/ja-allow-v1-imports 
Go back to allowing v1 projects to be imported
 2018-01-23 10:30:23 +00:00
Hayden Faulds
445ed4d604 fix ng-disabled in v1ImportModal 2018-01-18 16:44:32 +00:00
Alasdair Smith
4d29c4d769 Remove unused link sharing onboarding now at 100% 2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc Remove unused autocompile rollout logic now that at 100% 2018-01-17 15:17:55 +00:00
Alasdair Smith
89205092b6 Fix v2 faq link 2018-01-17 11:41:25 +00:00
James Allen
c466025df4 Go back to allowing v1 projects to be imported 2018-01-16 09:40:58 +00:00
James Allen
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
James Allen
626e0a16ef Fix acceptance test when overleaf setting not present 2018-01-04 15:49:31 +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
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
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
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
Paulo Reis
484d34e296 Only render announcements in SL. 2017-12-21 12:57:07 +00:00
Alasdair Smith
1be9e29f35 Switch from button to link to fit better 2017-12-21 11:10:23 +00:00
Alasdair Smith
fb23b30c45 Merge branch 'master' into as-update-v2-copy 2017-12-21 10:57:16 +00:00
James Allen
e6281911f0 Add history-file-tree.pug 2017-12-20 16:42:23 +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
cf30cfd923 Create new style for links inside alerts; apply it to the reconnection alert. 2017-12-20 15:39:50 +00:00
James Allen
c191ac2e8d Show deleted files in v2 history 2017-12-20 13:59:17 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
Paulo Reis
0a0c6c6c0c Merge branch 'master' into pr-style-v2-chatpane 2017-12-20 09:50:49 +00:00
James Allen
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
James Allen
d84580f12d Label actions with text rather than icons 2017-12-19 13:58:47 +00:00
James Allen
8a3fadbfc1 Style the edit/add/rename options 2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen
4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
James Allen
a1615e6d84 Prototype of requesting history information by doc path, while tracking renames 2017-12-19 13:58:47 +00:00
Shane Kilkelly
529d35936d Merge pull request #203 from sharelatex/sk-prevent-archived-deletion 
Prevent user from trying to delete archived project they don't own
 2017-12-19 13:36:26 +00:00
Alasdair Smith
f3342f327d Merge pull request #202 from sharelatex/as-v2-upgrade-redirect 
Use V1 trial page on V2 instead of legacy SL
 2017-12-19 10:07:08 +00:00
Alasdair Smith
dc2ddf7e09 Check for OL free trial instead of host as it may be fragile indicator 2017-12-18 16:53:58 +00:00
Alasdair Smith
61900cc1ea Restyle step 2 for side-by-side layout 2017-12-15 16:01:00 +00:00
Alasdair Smith
75a34024bc Restyle step 1 for side-by-side layout 2017-12-15 13:48:53 +00:00
Alasdair Smith
8862ed383c Fix project title & bold 2017-12-15 13:28:53 +00:00
Alasdair Smith
7130d0b270 Update v1 import modal with updated copy 2017-12-15 12:49:17 +00:00
Alasdair Smith
2b3b8b2c3b Use hardcoded OL url instead of settings - no point in linking to staging faq 2017-12-15 12:29:39 +00:00
Alasdair Smith
96af59d6b5 Update v1 project/tag tooltips 2017-12-15 12:17:08 +00:00
Alasdair Smith
a6cd210ef6 Update v1 dash pane with new copy & restyle to fit correctly 2017-12-15 12:02:11 +00:00
Alasdair Smith
da2c0b3fea Switch redirectToOLFreeTrialUrl to calculate trial url 
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
 2017-12-14 17:09:11 +00:00
Alasdair Smith
7322522323 Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl 2017-12-14 17:05:12 +00:00
Henry Oswald
bf276b0814 ripped file fingerprinting out 2017-12-14 12:11:13 +00:00
Henry Oswald
cbf656518f remove versioned files from fingerprinting 2017-12-14 11:24:47 +00:00
Paulo Reis
ca68f01a9d Build chat message styles on the controller side (allowing for extra parameters). 2017-12-14 11:23:22 +00:00
Henry Oswald
bbbba701b0 Update editor.pug 2017-12-14 10:21:53 +00:00
Henry Oswald
490c56c692 libs -> libraries 
don't use hash in non minjs version
 2017-12-13 17:15:44 +00:00
Henry Oswald
f021f21f11 only hash when minified 2017-12-13 16:37:51 +00:00
Henry Oswald
ccbb15c82e remove fingerprint from ide 2017-12-13 14:54:08 +00:00
Alasdair Smith
e7992e65e4 Merge branch 'master' into as-v2-upgrade-redirect 2017-12-13 14:45:51 +00:00
Henry Oswald
dd6bd3b91e Merge branch 'master' into ho-hash-static 2017-12-13 14:25:32 +00:00
Henry Oswald
357617d952 works with libs compiled into it 2017-12-13 14:19:19 +00:00
Henry Oswald
88334959d7 added remove extension 2017-12-13 14:13:45 +00:00
Henry Oswald
65efbbce53 seems to work now. 2017-12-13 13:06:38 +00:00
Henry Oswald
80e6a660be wip, this does not work minified yet 
for some reason lib.js is not being requested no, console errors or network errors
 2017-12-12 17:21:01 +00:00
Shane Kilkelly
603252f3b4 Prevent user from trying to delete archived project they don't own 
This change disables the select-project checkbox if the user
is on the 'archived' project pane and they don't own the project.
The request to delete would fail anyway, but this prevents UI confusion
 2017-12-12 16:23:24 +00:00
Alasdair Smith
4126e9bd31 Merge branch 'master' into as-v1-dash-link 2017-12-12 09:55:48 +00:00
Alasdair Smith
f5c914ed6c When upgrading track changes on V2, redirect to V1 trial page 2017-12-11 18:03:09 +00:00
Paulo Reis
edfc259c53 Fix missing border on SL. 2017-12-11 16:55:50 +00:00
Paulo Reis
59e675797e Merge branch 'master' into pr-style-v2-resizers 2017-12-11 15:55:50 +00:00
James Allen
69499847e4 Refactor front end code into validateCaptcha service 2017-12-11 12:32:43 +00:00
James Allen
0b03bbc7c3 Don't inject recaptcha element if recaptcha is not enabled 2017-12-11 12:04:33 +00:00
James Allen
83086e4a79 Add recaptch to share endpoint 2017-12-11 11:57:59 +00:00
Paulo Reis
7c5a7880b0 Merge branch 'master' into pr-style-v2-resizers 2017-12-06 15:49:18 +00:00
Alasdair Smith
48cd048e5c Merge branch 'master' into as-v1-dash-link 2017-12-06 15:12:29 +00:00
Paulo Jorge Reis
a5f99ccce3 Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling 
V2 editor styling
 2017-12-06 11:22:28 +00:00
Alasdair Smith
2d66fd7280 Merge pull request #169 from sharelatex/as-import-v1 
V1 Import Modal
 2017-12-05 13:19:49 +00:00
Paulo Reis
5dffdf3efc Add a small a11y fix. 2017-12-05 10:23:28 +00:00
Paulo Reis
a88538c3fd Make the back to projects button closer to current SL. 2017-12-05 10:20:25 +00:00
Alasdair Smith
c84c00d56d Change query param for nicer api on OL side 2017-12-04 15:19:03 +00:00
Paulo Reis
0bad7d8549 Adjustments to synctex controls. 2017-12-04 15:12:13 +00:00
Alasdair Smith
77dc7adf1f Revert "Move to sidebar template" 
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
 2017-12-04 14:53:18 +00:00
Paulo Reis
9fda8e62fa Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers 2017-12-04 13:48:52 +00:00
Paulo Reis
fd852004fe Refactor synctex controls z-index handling. 2017-12-04 12:25:40 +00:00
Alasdair Smith
ab78cea48d Move to sidebar template 2017-12-04 12:24:21 +00:00
Alasdair Smith
1fd518ec58 Add query param to mark as explicitly using V1 dash 2017-12-04 12:22:27 +00:00
Alasdair Smith
a25464d925 Add check for OL host 2017-12-04 11:34:00 +00:00
Alasdair Smith
f595009911 Switch to existing v1 dash flag 2017-12-04 11:23:09 +00:00
James Allen
52b414498c Merge branch 'master' into as-show-v1-warnings 2017-12-04 10:03:38 +00:00
James Allen
0b0fd576eb Merge branch 'master' into as-v1-dash-link 2017-12-04 10:02:42 +00:00
James Allen
0602fed6e5 Merge branch 'master' into as-import-v1 2017-12-04 10:02:21 +00:00
James Allen
158b0d56cf Merge branch 'master' into pr-style-v2-resizers 2017-12-04 10:01:45 +00:00