Commit graph

9242 commits

Author SHA1 Message Date
Brian Gough
0eaf6db2d6 Merge pull request #1703 from sharelatex/bg-handle-send-before-rejoin
handle error gracefully when client has not yet joined project

GitOrigin-RevId: 21e337f6adbbb23a2126eaf4fa026c78178efef0
2019-04-16 08:34:31 +00:00
Hugh O'Brien
9644ff4f51 Merge pull request #1714 from sharelatex/spd-middlewear-oops
Fix spelling in UserMembershipAuthorization

GitOrigin-RevId: cca5e5d13d7eb33e12f73be9172bc5cbe90312c0
2019-04-15 16:09:26 +00:00
Hugh O'Brien
5edead4446 Merge pull request #1694 from sharelatex/hb-clear-ip-notifications
Remove notification for university enrolment on affiliation add

GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287
2019-04-15 16:09:16 +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
Shane Kilkelly
f3dd61abce Merge pull request #1657 from sharelatex/sk-rate-limit-join-project
Add a rate-limit to joinProject

GitOrigin-RevId: 27edd8b56ae80868b5fcd0b803d0e042dce26f31
2019-04-13 01:57:10 +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
Brian Gough
f8066349c4 Merge pull request #1700 from sharelatex/bg-simplify-queue
simplify queuing code

GitOrigin-RevId: 9c6ce66e9a3272dea28284d3cbf1dc65c9cbc825
2019-04-09 11:01:42 +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
Jessica Lawshe
ca9e6044c8 Merge pull request #1683 from sharelatex/jel-gallery-layout
Gallery list column styling

GitOrigin-RevId: 9ec3207dcd867894a5318a8d71c48be175615480
2019-04-08 16:11:14 +00:00
nate stemen
2ae27fbc6a Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas
Revert "allow toggling of captchas via setting"

GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613
2019-04-08 15:20:49 +00:00
nate stemen
5aac144d5b Merge pull request #1650 from sharelatex/ns-toggle-captchas
allow toggling of captchas via setting

GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
2019-04-08 13:53:54 +00:00
Paulo Jorge Reis
144d936141 Merge pull request #1691 from sharelatex/cmg-tag-duplicates
Stop duplicate tags being created

GitOrigin-RevId: 7e2b4228dc6ec7ebc2a4e30e18a6d5dcbd5cb6c8
2019-04-08 10:31:16 +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
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