Commit graph

17886 commits

Author SHA1 Message Date
Henry Oswald
db590651ee make ioredis the driver for standard connections 2019-05-03 11:33:24 +01:00
Christopher Hoskin
a33cd6cbbf Bump buildscripts from 1.1.11 to 1.1.20 2019-05-03 10:29:38 +01:00
Henry Oswald
daca83a057 add dryRun option to flush all projects 2019-05-02 16:54:22 +01:00
Henry Oswald
d5d1736a5e adds /flush_all_projects project 2019-05-02 16:43:35 +01:00
Timothée Alby
5b7b9fc97b Store lastUpdatedBy Value on Projects (#1727)
Store lastUpdatedBy Value on Projects

GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39
2019-05-02 14:17:41 +00:00
Timothée Alby
5b7974065d Prevent registration of new accounts with existing secondary emails (#1696)
Prevent registration of new accounts with existing secondary emails

GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15
2019-05-02 14:17:34 +00:00
Timothée Alby
70c505830b Persist Last Author id on Document Flush (#50)
Persist Last Author id on Document Flush
2019-05-02 15:09:58 +01:00
Jakob Ackermann
a79adcd325 [logging] do not overwrite the logger name
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-02 12:48:43 +02:00
Brian Gough
f583ffdbff Merge pull request #1740 from sharelatex/spd-captcha-on-register
Don't add captcha fields to register form if captcha is disabled

GitOrigin-RevId: 7ac3a3b41734377243ac1e31a99b3778c9a2e77d
2019-05-02 10:18:57 +00:00
Tim Alby
c1c23e4bee record last author id on document flush
This is a multi-steps process:
* get a update's `user_id` from the metadata
* store the `user_id` (`lastUpdatedBy`) and current date (`lastUpdatedAt`) for
  the document in Redis on every updates
* fetch `lastUpdatedAt` and `lastUpdatedBy` from Redis on document flush
* send the data to web to be persisted in Mongo
2019-05-02 11:10:02 +01:00
Jakob Ackermann
c59a3db4e8 [FSPersistorManager] fix the stream opening for node10+
Attaching a `readable` listener causes the stream to hang otherwise.

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-02 02:47:53 +02:00
Alasdair Smith
5049dc083e Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page
add button to upgrade history in project admin page

GitOrigin-RevId: a5f2a64028ccb002cbb96da0f910b7b494f75eb8
2019-05-01 09:38:35 +00:00
Alasdair Smith
028c3bc94c Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room
remove unnecessary callback on emitToRoom

GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883
2019-05-01 09:38:30 +00:00
Alasdair Smith
2c30ae0f8a Merge pull request #1738 from sharelatex/spd-dumpfolder
Ensure dump folder exists before opening templates

GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1
2019-05-01 09:38:24 +00:00
Jakob Ackermann
79a314d5fd [misc] disable the flash transport
We do not use flash on the website and the policy file provider is not
 compatible with node7+.

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-01 01:48:01 +02:00
Jakob Ackermann
6601e94db7 [misc] bump socket.io to 0.9.19 for node7+ support
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-01 01:48:00 +02:00
Brian Gough
77a711f7a3 Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element
make removeElementFromMongoArray atomic

GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966
2019-04-29 09:31:09 +00:00
Brian Gough
68e7b9c4e9 Merge pull request #48 from sharelatex/bg-check-incoming-hash
check incoming hash when present
2019-04-29 10:15:44 +01:00
Shane Kilkelly
a2d041ffae Merge pull request #58 from overleaf/sk-docker-maven-base-image
Docker: maven base image
2019-04-29 10:00:15 +01:00
Jakob Ackermann
35ac848f43 [docker] install git in the app image
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:59:59 +02:00
Jakob Ackermann
a333aabfa9 [WLGitBridgeIntegrationTest] adjust the urls for the individual tests
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:54 +02:00
Jakob Ackermann
5040b4d7f0 [WLGitBridgeIntegrationTest] ensure that we stop the started servers
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-26 23:56:47 +02:00
Shane Kilkelly
c3308e565b Add git, make, and curl to docker image 2019-04-26 15:29:44 +01:00
Shane Kilkelly
bf44fe3b29 Merge pull request #56 from das7pad/misc/dry-dockerfile
[docker] use a base image that already contains maven and openjdk
2019-04-26 14:09:23 +01: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
d2de6d8e87 Merge pull request #1689 from sharelatex/revert-1684-revert-1637-as-clear-undo-stack-remote-edit
Bring back clearing of undo stack when remote change is received

GitOrigin-RevId: f18b1b4c1af0ab0c8563c3670c73d75afa6d8345
2019-04-25 14:37:27 +00:00
Simon Detheridge
9808eb7f55 Merge pull request #1722 from sharelatex/jel-password-descriptive-message
Use descriptive error message for password reset

GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff
2019-04-25 14:37:21 +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
Simon Detheridge
6c04bc8712 Merge pull request #1728 from sharelatex/jel-feature-event
Track events that display "Start Free Trial" buttons

GitOrigin-RevId: 4890d8f1da8b0cd47d7c97eab322e6048f774d30
2019-04-25 14:37:08 +00:00
Simon Detheridge
cc96ecfd74 Merge pull request #1734 from sharelatex/spd-delete-user-crash
Don't fail in refreshFeatures if the v1 user doesn't exist

GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706
2019-04-25 14:36:58 +00:00
Brian Gough
e1ec01eb0f Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots
Show and restore doc snapshots from admin panel

GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab
2019-04-24 13:24:46 +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
d3f0285fd2 Ensure project name is unique when transferring to another user (#1712)
Ensure project name is unique when transferring to another user

GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859
2019-04-23 14:35:27 +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
2a73d8106b Send Email on Subscription Reactivation (#1721)
Send Email on Subscription Reactivation

GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e
2019-04-23 14:35:05 +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
Timothée Alby
e2793f659c Don't Sanitize Undefined Team Notices (#1725)
Don't Sanitize Undefined Team Notices

GitOrigin-RevId: 540316d71bc4047d25100bb0ef524d5d2adba0b1
2019-04-23 14:34:48 +00:00
Timothée Alby
6232854ff7 Remove User Memberships on Deletion (#1688)
Remove User Memberships on Deletion

GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1
2019-04-23 14:34:40 +00:00
Henry Oswald
b9c3bf3f58 add missing aspell-sl lang 2019-04-23 13:47:11 +01:00
Jakob Ackermann
5b1481fc12 [docker] add support for a different docker group id on the docker host
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-23 01:53:40 +02:00
Jakob Ackermann
a517c15053 [docker] include the LICENSE file in the image
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 23:10:08 +02: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
Jakob Ackermann
2ebae69044 [docker] build the git-bridge in docker
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-04-17 13:45:21 +02: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
8b7b49f72a Merge pull request #1693 from sharelatex/cmg-clone-owners
Return new project data from api when cloning

GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786
2019-04-17 10:26:11 +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