Commit graph

17992 commits

Author SHA1 Message Date
Ersun Warncke
935877222a oauth and collabratec migration
* make v2 system of record for collabratec id
* migrate oauth apps, tokens to v2
* set collabratec id on reg/link from ctec
* copy collabratec id from user stub to user on merge

GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248
2019-05-13 12:04:56 +00:00
Ersun Warncke
c0ab195eed fix auth error response and use 401 for malformed header
GitOrigin-RevId: 6dc4d10c25db7710b3e4e8e876d425a1e84574c8
2019-05-13 12:04:51 +00:00
Ersun Warncke
dc06069dff add oauth2-server
GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae
2019-05-13 12:04:46 +00:00
Ersun Warncke
8f339603f4 add thirdPartyIdentifiers to User model and add manager class
GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70
2019-05-13 12:04:40 +00:00
Christopher Hoskin
fd8ac10bf7 Merge pull request #46 from das7pad/misc/node7plus-support
[misc] add support for node 7+
2019-05-13 11:58:27 +01:00
Christopher Hoskin
20683f3094 Update Node from 6.15.1 to 10.15.3 2019-05-13 11:55:42 +01:00
Christopher Hoskin
5f045d9792 Update buildscripts to 1.1.21 2019-05-13 11:54:37 +01:00
Brian Gough
07b7566466 Merge pull request #1089 from overleaf/bg-compute-filestore-hash
compute filestore hash

GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e
2019-05-13 08:49:42 +00:00
Brian Gough
c989179517 Merge pull request #1758 from overleaf/as-remove-unused-middleware-file
Remove unused TemplatesMiddlewear file

GitOrigin-RevId: 00cf49c970171f1f99d133ee4876f2a35c89c023
2019-05-13 08:49:36 +00:00
Brian Gough
d1cc605855 Merge pull request #1755 from overleaf/bg-admin-resync-project-history
add button to resync history for project in admin page

GitOrigin-RevId: e52e85ee6d1f7dea7930bf3dee0ec70b28b8a6c2
2019-05-13 08:49:29 +00:00
Henry Oswald
69ccac8f49 log out job in tpdsupdate sender
GitOrigin-RevId: 8ff4665f62a1f36580c5864f2185ddf1a792f6cf
2019-05-11 01:54:39 +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
Alasdair Smith
51a4c33e91 Merge pull request #1748 from overleaf/hb-fix-change-plan-vat-display
Use two decimal places for inc-vat change plan prices

GitOrigin-RevId: 6dd46c42693345ba0aaca5cfe061bc907a112a68
2019-05-09 13:03:09 +00:00
John Lees-Miller
81fcddf7e9 Merge pull request #9 from das7pad/misc/add-license
[misc] Add a copy the the GNU Affero General Public License v3.0
2019-05-09 13:18:45 +01:00
Jakob Ackermann
5a2e9f5088 [misc] Add a copy the the GNU Affero General Public License v3.0
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-05-09 13:36:04 +02:00
John Lees-Miller
e9e7f23686 Add missing license statement 2019-05-09 12:03:27 +01:00
Alasdair Smith
36035e8ccd Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3
Pass build-id when downloading pdf

GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b
2019-05-08 09:09:11 +00:00
Alasdair Smith
cbab60476a Merge pull request #1747 from overleaf/hb-graphics-autocomplete-additions
Make image autocomplete file type case insensitive

GitOrigin-RevId: 8a39a600340d8cea7bbfda08d8cc95343c8002ad
2019-05-08 09:09:05 +00:00
Alasdair Smith
9b94b32b83 Merge pull request #1751 from overleaf/as-fix-cite-auto-complete
Don't show shortened arguments in cite autocomplete

GitOrigin-RevId: 75e86e1b97adb7632f30960a50ad775511868d5b
2019-05-08 09:08:57 +00:00
Brian Gough
6eba954b52 Merge pull request #64 from overleaf/bg-downgrade-delete-component-error
downgrade delete component error
2019-05-08 09:07:11 +01:00
Brian Gough
0bbfa7de27 Merge branch 'master' into bg-downgrade-delete-component-error 2019-05-08 09:07:02 +01:00
Brian Gough
40a893a632 Merge pull request #63 from overleaf/ho-flush-all-projects
Ho flush all projects
2019-05-08 09:05:52 +01:00
Tim Alby
cae2dcfa5f update README
- change app name
- update copyright notice
- update links
- change authors
2019-05-07 19:29:46 +02:00
Timothée Alby
986378932f Update README.md
GitOrigin-RevId: ea14f37a281d6d1fafcee0d17d92b0d50fb74d24
2019-05-07 17:04:40 +00:00
Timothée Alby
6ff1ca3967 update Git URL in Jenkinsfile 2019-05-07 17:48:59 +01:00
Timothée Alby
ddd53dec6b update Git URL in Jenkinsfile 2019-05-07 17:45:10 +01:00
Timothée Alby
8dc41da0ba update Git URL in Jenkinsfile 2019-05-07 17:45:08 +01:00
Timothée Alby
eff364d451 update Git URL in Jenkinsfile 2019-05-07 18:43:08 +02:00
Timothée Alby
3de8e93815 update Git URL in Jenkinsfile 2019-05-07 18:39:09 +02:00
Timothée Alby
f081546ec0 update Git URL in Jenkinsfile 2019-05-07 17:37:07 +01:00
Timothée Alby
8ccb639a69 update Git URL in Jenkinsfile 2019-05-07 17:36:42 +01:00
Tim Alby
4ccaa3bf2f update Git URL in Jenkinsfile 2019-05-07 18:31:54 +02:00
Tim Alby
2c1f83138c update Git URL in Jenkinsfile 2019-05-07 18:31:14 +02:00
Henry Oswald
d169cca425 Merge branch 'master' into ho-flush-all-projects 2019-05-07 17:02:14 +01:00
Brian Gough
27a8248196 convert "Delete component" errors into warnings 2019-05-07 16:55:17 +01:00
Timothée Alby
70a1f7c110 Update README.md 2019-05-07 16:41:17 +01:00
Timothée Alby
d8ada98704 Update README.md 2019-05-07 16:40:11 +01:00
Timothée Alby
93743b6834 Update README.md 2019-05-07 16:34:12 +01:00
Timothée Alby
0ee7a81a02 Update README.md 2019-05-07 16:25:59 +01:00
Timothée Alby
a332c6a8b9 Update README.md 2019-05-07 17:23:20 +02:00
Timothée Alby
018bfeeff5 Update README.md 2019-05-07 16:23:02 +01:00
Timothée Alby
32a54a7e37 Update README.md 2019-05-07 17:22:35 +02:00
Timothée Alby
63920ce33c Update README.md 2019-05-07 16:21:52 +01:00
Timothée Alby
6d33d383d0 Update README.md
- change app name
2019-05-07 16:16:11 +01:00
Tim Alby
8b40da701e update README
- remove build status badge
- change app name
- update copyright notice
- update links
2019-05-07 17:03:09 +02:00
Tim Alby
d316f172bf update repo URL for Jenkins 2019-05-07 17:03:06 +02:00
Henry Oswald
c6bf123ccd Merge pull request #8 from overleaf/ho-ioredis-default
make ioredis default
2019-05-07 15:57:53 +01:00
Henry Oswald
e57741cb80 stub out project flusher for unit tests 2019-05-07 15:46:30 +01:00
Henry Oswald
4b8a27a220 change github url 2019-05-07 14:01:12 +01:00
Christopher Hoskin
8aa8840db0 Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3
Csh issue 1118 node 10.15.3

GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3
2019-05-07 10:58:52 +00:00