Commit graph

7979 commits

Author SHA1 Message Date
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
Alasdair Smith
b1a615bad9 Merge pull request #1684 from sharelatex/revert-1637-as-clear-undo-stack-remote-edit
Revert "Clear undo stack when remote change is received"

GitOrigin-RevId: ac313f008e54696f548e6396851fe22568248055
2019-03-29 12:24:42 +00:00
Simon Detheridge
61cd448832 Merge pull request #1672 from sharelatex/ns-input-autocomplete
improve autocomplete when inserting over existing arguments

GitOrigin-RevId: 8d1401cca141348dd33b965c92e120cf66350d7e
2019-03-28 15:14:35 +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
88446ffa9b Merge pull request #1677 from sharelatex/spd-hide-heapdump
Move 'heapdump' endpoint to private API router

GitOrigin-RevId: 581cc13b60ee944b3e1ad21a973d70ebab606a5b
2019-03-28 15:14:22 +00:00
Brian Gough
ce556499c0 remove unnecessary comparison in queue logic
GitOrigin-RevId: 4dd8d1892ca090bd9ac93940d985cb21437f1ae1
2019-03-28 10:32:01 +00:00
Brian Gough
9a48142919 Merge pull request #1671 from sharelatex/bg-reorder-messages
queue incoming out of order updates to avoid out of sync errors

GitOrigin-RevId: ed666bedea442facc92e88227abe68fdce0aebd8
2019-03-27 14:27:54 +00:00
Alasdair Smith
7b1832a96e Merge pull request #1668 from sharelatex/jel-plans-group-modal-selected
Set group plan options via query

GitOrigin-RevId: 730d9a0721f2866a0720baa873ffd6c15b857c2b
2019-03-27 10:21:15 +00:00
Simon Detheridge
bb81a47d58 Merge pull request #1641 from sharelatex/spd-soft-delete-users
Add initial support for soft-deletion of users

GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7
2019-03-26 13:59:49 +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
d9522f563d Merge pull request #1631 from sharelatex/ho-remove-recurly-sign
remove RecurlyWrapper.sign and recurly private api key

GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152
2019-03-25 15:52:54 +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
Shane Kilkelly
90cb50f4ac Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3
Upgrade bcrypt to version 3, and specify minor-version of hash function

GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca
2019-03-25 09:50:41 +00:00
Simon Detheridge
db162cfe0a Merge pull request #1656 from sharelatex/cmg-reintroduce-beta-fix-path
Use path.join() in reintroduce beta script to pass linting

GitOrigin-RevId: 4936de04b389571e73de3ddcae8ee611634efcaf
2019-03-22 13:02:21 +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
Simon Detheridge
2bf6e4e072 Merge pull request #1638 from sharelatex/spd-delete-user-rate-limit
Add rate limit to user deletion

GitOrigin-RevId: 4269277ea88b32b93f897a2b2709385ab379e479
2019-03-22 12:28:30 +00:00
Simon Detheridge
d184087a53 Merge pull request #1643 from sharelatex/spd-transfer-projects
Add support for transferring project ownership

GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258
2019-03-22 12:28:24 +00:00
Shane Kilkelly
a5ad2e48d4 Merge pull request #1629 from sharelatex/sk-censor-token-prefix
Censor `tokens.readAndWritePrefix` when building project model

GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee
2019-03-22 10:27:56 +00:00
Shane Kilkelly
49a5056e78 Merge pull request #1637 from sharelatex/as-clear-undo-stack-remote-edit
Clear undo stack when remote change is received

GitOrigin-RevId: 1a1d1e34827e002e08a264bffa467d77701ce758
2019-03-22 10:27:51 +00:00
Shane Kilkelly
a51fefae6c Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import
Allow deleted v1 user when importing project invite inviter

GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d
2019-03-22 10:27:45 +00:00
Brian Gough
0305ba0c6b Merge pull request #1639 from sharelatex/bg-add-message-ids
include a unique id in every message published to redis

GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d
2019-03-21 16:17:37 +00:00
Henry Oswald
494f749e72 Merge pull request #1651 from sharelatex/ho-check-exit-codes
Check exit codes of parallel build tasks

GitOrigin-RevId: fb242722d8a886c64b61876cfdcbece9bfa987e6
2019-03-21 11:14:37 +00:00
Timothée Alby
983b1a0f57 Merge pull request #1648 from sharelatex/ho-simple-client-build
Simple client build

GitOrigin-RevId: d7107104960c97bad7ec1316b5e6720a6c1017b6
2019-03-20 17:12:10 +00:00
Timothée Alby
27251bc1ac Merge pull request #1646 from sharelatex/ho-fail-lint
Remove `set -e` from build process and wait for each previous task

GitOrigin-RevId: 4ece4b70c729e8de654adae0053fdb28f0f86799
2019-03-20 17:12:02 +00:00
Timothée Alby
5de25032d8 Merge pull request #1634 from sharelatex/ta-no-institution-autocreate
Don't Auto-Create Institutions

GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861
2019-03-19 23:51:53 +00:00
Henry Oswald
991cbf3fee Merge pull request #1636 from sharelatex/ho-fail-lint
throw error in bash quickly on error

GitOrigin-RevId: 03df23aff25583f3af122f9a643c8faef64c5c46
2019-03-18 15:37:03 +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
Brian Gough
c704312c85 Merge pull request #1625 from sharelatex/bg-move-entities-safely
move project entities safely without losing data on error

GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e
2019-03-18 09:30:28 +00:00
Timothée Alby
429709dfcb Merge pull request #1621 from sharelatex/ns-update-spam-regexes
allow hyphen in email hostname and ' in project name

GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1
2019-03-14 16:02:45 +00:00
Timothée Alby
ca2c854452 Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt
Add unit test for 'real' bcrypt

GitOrigin-RevId: 670282b5235484ac03d3451dc2685af18d84a4e3
2019-03-14 16:02:38 +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
970ca2e122 Merge pull request #1604 from sharelatex/ns-fix-capitalization
improve project invite email wording

GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37
2019-03-14 16:02:27 +00:00
Timothée Alby
e4c684786d Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2
Fix Publisher Creation Form Take2

GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985
2019-03-14 13:43:12 +00:00
Jessica Lawshe
a1e16c9676 Merge pull request #1600 from sharelatex/as-rttc-text-markers
Switch delete track change markers to use bookmark system to improve performance

GitOrigin-RevId: 865003ba30728f7104ad4c1b9e114998aa7d66a0
2019-03-13 16:52:11 +00:00
Jessica Lawshe
4652b69488 Merge pull request #1617 from sharelatex/ho-logger-use-metrics-name
use METRICS_APP_NAME for the logger

GitOrigin-RevId: 536a76119f7b4be92985f62d4e007a88c36cd430
2019-03-13 16:52:03 +00:00
Jessica Lawshe
0b841aacef Merge pull request #1605 from sharelatex/jel-portal-team-data
Refactor portals

GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230
2019-03-13 16:51:52 +00:00
Brian Gough
32925f0c4e Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely
allow reserved names safely

GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a
2019-03-13 11:18:06 +00:00
Brian Gough
0f22a626c8 Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request
remove old project version request

GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77
2019-03-13 09:12:42 +00:00
Henry Oswald
0c5346460f log ops in filestore error
GitOrigin-RevId: 008722ba2ff335ebedb2e17e9413737d0244f78e
2019-03-12 11:48:51 +00:00
Timothée Alby
5b5b06307a Merge pull request #1596 from sharelatex/ja-more-client-error-logging
Increase the number and type of events we log

GitOrigin-RevId: 5384beb86f095d673deebe7b17d76668137fc912
2019-03-11 11:08:20 +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
8187eb7fcb Merge pull request #1592 from sharelatex/ew-clean-stray-containers
Clean Up Containers

GitOrigin-RevId: 334f5458981b68432f0e0d086176f508ee83e836
2019-03-11 11:07:59 +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
nate stemen
f699877959 Merge pull request #1540 from sharelatex/ns-less-spam-mail
add spam checkers on project invite emails

GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef
2019-03-11 11:07:09 +00:00
Simon Detheridge
f5ecc5ad85 Merge pull request #1585 from sharelatex/spd-bin-run
Add bin/run wrapper to web

GitOrigin-RevId: e324256fdca6b334d25385148e7517b4c4c5e702
2019-03-11 11:06:57 +00:00
Brian Gough
01fd6e9c8a Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version
use atomic project structure version

GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8
2019-03-11 11:06:45 +00:00
Douglas Lovell
b9e88c7998 Merge remote-tracking branch 'origin/bg-accept-larger-document-size-on-api-requests'
GitOrigin-RevId: b06511daa7000878646f5cb8132d6077304f5f8c
2019-03-11 11:06:23 +00:00
Douglas Lovell
f090eb6d06 Merge remote-tracking branch 'origin/pr-update-files-to-hash'
GitOrigin-RevId: dec35961f496f14357757248a62fe4c7d7fc1def
2019-03-11 11:06:10 +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
Douglas Lovell
eadc6b838b Merge branch 'dcl-i1507e'
GitOrigin-RevId: 6368f274c2b19d12c571cf065291805a4ff50a4e
2019-03-11 11:05:26 +00:00
Simon Detheridge
3553fb2d9d Merge pull request #1581 from sharelatex/spd-wearing-middle
Fix spelling of "middleware"

GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda
2019-03-11 11:05:12 +00:00
Simon Detheridge
939922485c Merge pull request #1555 from sharelatex/spd-email-escape-html
HTML-escape user-supplied data in HTML emails

GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91
2019-03-11 11:05:01 +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
Simon Detheridge
97145847ef Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge
When a document is updated externally via git-bridge, don't show warning

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
2019-03-11 11:04:35 +00:00
Simon Detheridge
870f183595 Merge pull request #1476 from sharelatex/spd-character-sets
Detect encoding of non-utf8 files and convert during load

GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69
2019-03-11 11:04:22 +00:00
Henry Oswald
68c7cc6fa3 Merge pull request #1577 from sharelatex/ho-jenkins-github-connection
point to the web-sharelatex-internal repo for github-> jenkins

GitOrigin-RevId: 9f31bed9296181484baf9dc11d488763f1b57b50
2019-03-11 11:04:10 +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
Douglas Lovell
65012e5037 Merge branch 'dcl-i1507c'
GitOrigin-RevId: fc12ab4d20918e83f7aa05ba5263c785d594c8dc
2019-03-11 11:03:18 +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
Hugh O'Brien
72933bdd81 Merge pull request #1546 from sharelatex/sk-add-routes-script
Add a script to print all routes in the project

GitOrigin-RevId: 47e55bb24fb16864296222b7a87b21901c56f084
2019-03-11 11:02:51 +00:00
Jessica Lawshe
0d4c92054b Merge pull request #1557 from sharelatex/ew-update-clean
add network/image prune for clean_ci

GitOrigin-RevId: 23be6f849c0c0fd473a76c12e5ba03565f1f3808
2019-03-11 11:02:32 +00:00
Jessica Lawshe
dc06e166c3 Merge pull request #1562 from sharelatex/jel-blog-sidebar
Add blog sidebar

GitOrigin-RevId: 9eab27eaad650e20166cceb20b9df49c2f9e2601
2019-03-11 11:02:18 +00:00
Jessica Lawshe
e5d453454e Merge pull request #1561 from sharelatex/jel-subscription-events
Also send subscription events to Google Analytics

GitOrigin-RevId: b1a078550c7c92863f3d8225aa78b9240faa2e72
2019-03-11 11:02:08 +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
Henry Oswald
e4153ae3e4 Merge pull request #1554 from sharelatex/ew-build-tests
Bump timeout for unit tests

GitOrigin-RevId: 2354d4620d1c91e99c80612659a43509b54cdbc9
2019-03-11 11:01:45 +00:00
Henry Oswald
d12dd862c8 Merge pull request #1551 from sharelatex/ho-docker-debug
Add missing config into defaults file

GitOrigin-RevId: 7d47bce6b6b429eab8d2765b081967ce52908c27
2019-03-11 11:01:34 +00:00
Henry Oswald
b9edc0f414 Merge pull request #1548 from sharelatex/ho-tpds-linode-hosts
read linode_url in for tpdsworker jobs

GitOrigin-RevId: 23d5b36a881e4d96ddc343444802354594d798d7
2019-03-11 11:01:25 +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
Ersun Warncke
2421593d85 run unit and acceptance tests in parallel (#1545)
GitOrigin-RevId: fefdfa04d9b9496bf6c98b37331fc4a084de065a
2019-03-11 11:00:58 +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
f84e94dc88 Merge pull request #1533 from sharelatex/as-fix-extra-bracket
Fix autocomplete inserting extra brace when completing command with optional argument

GitOrigin-RevId: cb01eb0b7df400997e5f7dc25a92ef7660689709
2019-03-11 11:00:36 +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
Simon Detheridge
838fe00058 Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade
Notify users when affiliations are upgraded

GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6
2019-03-11 11:00:01 +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
Henry Oswald
0df9c6440b test commit
GitOrigin-RevId: be8e7c9ffd2be973fe9ae38f55951aa7a24415db
2019-03-11 10:59:30 +00:00
Henry Oswald
d55b38cc05 Merge pull request #1471 from sharelatex/ho-docker2
Move to docker image based builds

GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
2019-03-11 10:59:20 +00:00
Ersun Warncke
57450bb0fb Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit
Remove smoke test rate limit, use POST for logout

GitOrigin-RevId: 0152f259b4a4375147857cc25156621de87f8bc9
2019-03-11 10:59:09 +00:00
Brian Gough
1ee4a1816c Merge pull request #1483 from sharelatex/jel-cms-table-style
Add styling for tables on CMS pages

GitOrigin-RevId: 3d258c5453cd47b434a6d3804687ca044cc704eb
2019-03-11 10:58:57 +00:00
Brian Gough
15a6169a06 Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind
Revert "Enable search keybinding globally in editor"

GitOrigin-RevId: 423bebb48a237c8bda935bb6cb70c5cf953b7015
2019-03-11 10:58:47 +00:00
Brian Gough
43899589dc Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html

GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
2019-03-11 10:58:32 +00:00
Brian Gough
2ab346e762 Merge pull request #1511 from sharelatex/as-inc-linked-file-rev
Increment rev of linked file to fix bug where dropbox not syncing

GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
2019-03-11 10:58:21 +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
bf5a28b258 Merge pull request #1509 from sharelatex/as-update-google-config
Use env var for brandPrefix for compatibility with google infrastructure

GitOrigin-RevId: c7749007d3fbd3746cd8f6771d6b394f5864dd9f
2019-02-15 13:33:49 +00:00
Chrystal Maria Griffiths
d52c30f272 Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint
Rate limit confirm university domain endpoint

GitOrigin-RevId: 1d03eec3c0e8208e5f643000693f685957e15442
2019-02-15 13:33:42 +00:00
Chrystal Maria Griffiths
96f283e2c6 Merge pull request #1477 from sharelatex/as-confirm-quick-action-archive-leave
Confirm archive or leave when clicking quick action buttons

GitOrigin-RevId: 95d728f22284bab17887a5ac7bc7461d501db7a2
2019-02-15 13:33:38 +00:00
Chrystal Maria Griffiths
b1c40d2c58 Merge pull request #1501 from sharelatex/cmg-anonymous-display-name
Label only truly anonymous users as anonymous

GitOrigin-RevId: c33a5c0584bd8a0603921fcf1579204b5fcac009
2019-02-15 13:33:33 +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
Chrystal Maria Griffiths
778af6ca40 Merge pull request #1510 from sharelatex/ns-moar-contrast
better contrast in github modal

GitOrigin-RevId: b841f18933bfa2c916c8d2092578a895db0346dd
2019-02-15 13:33:23 +00:00
Jessica Lawshe
429e392fbb Merge pull request #1518 from sharelatex/jel-search-result-url
encodeURIComponent on wiki search result

GitOrigin-RevId: 87cb53784de691677a56a5e3fc139a35ad7ae941
2019-02-14 18:24:27 +00:00
Jessica Lawshe
c9eab36031 Merge pull request #1455 from sharelatex/jel-cms-color-block
Add color block feature to CMS pages

GitOrigin-RevId: 51a9828d62275308422bdb0d6e2e90cfef0a638a
2019-02-14 18:24:22 +00:00
Brian Gough
cc613f4370 Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors
Return error status to the publish modal on export creation error

GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
2019-02-14 15:03:42 +00:00
Brian Gough
1940e9b061 Merge pull request #1523 from sharelatex/bg-avoid-unwanted-fallback-on-network-errors
avoid fallback to old websocket if initial connection succeeded

GitOrigin-RevId: 1b3f38d0a0f4889b9a15fa071de90a0a9c9a5699
2019-02-14 14:39:19 +00:00