Commit graph

8925 commits

Author SHA1 Message Date
Eric Mc Sween
ced31d6131 Merge pull request #2055 from overleaf/jel-sso-layouts
Layouts for login, register, institutional log in, & linking pages

GitOrigin-RevId: af0ea36e3bd6e39b0a6305bf0882c296eb931d5b
2019-08-20 12:59:41 +00:00
Eric Mc Sween
0e8866f651 Merge pull request #2079 from overleaf/ta-institution-new-licences
Add Routing for New Licences Metrics Graph

GitOrigin-RevId: 9e7def383d257db1eef03b1224b4b5fef376427c
2019-08-20 12:59:36 +00:00
Eric Mc Sween
4d69b63993 Merge pull request #2070 from overleaf/pr-fix-light-drag-and-drop
Change hover highlights and draggable helper when moving files

GitOrigin-RevId: b7a6e9cd1484115fa5fbf1ed40127a6aba525cbd
2019-08-20 12:59:30 +00:00
Alasdair Smith
c5da705fa0 Use babel-eslint for parsing (#2073)
Eslint's default parser cannot handle some newer es6+ syntax (e.g.
dynamic import() function). Babel-eslint uses babel for parsing instead
which can handle the newer syntax

GitOrigin-RevId: 0a5666ac3bdc3c0885842dcdbc6f6d3b4dbf2d4b
2019-08-19 15:20:06 +00:00
Miguel Serrano
9a8a182c1b Fix UserGetter email retrieval with affiliations disabled (#2085)
GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b
2019-08-19 15:19:57 +00:00
Miguel Serrano
8c55989166 Create User.emails field for newly created users in launchpad (#2083)
GitOrigin-RevId: b6cfad25eeba21294f70769e11c3e3fa825f93aa
2019-08-19 15:19:51 +00:00
Miguel Serrano
9386bdeaff Delete copybara sync server pro (#2082)
This actually reverts https://github.com/overleaf/web-internal/pull/2052

GitOrigin-RevId: c282655cf29533e8cb523f854247bd37396b1346
2019-08-16 14:27:30 +00:00
Miguel Serrano
e8790a638c affiliations flag checks Settings.overleaf (#2080)
GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827
2019-08-15 14:00:24 +00:00
Brian Gough
9833f1ec93 Merge pull request #2060 from overleaf/spd-linkedfiletests-nondependent
Refactor and clean up LinkedFileTests to not be dependent on previous run

GitOrigin-RevId: 199a4ab6b463b2248244a067c765078816da182b
2019-08-14 15:19:40 +00:00
Brian Gough
b591c950e0 Merge pull request #2077 from overleaf/bg-fast-reconnect-for-websocket
handle 'retry' messages from realtime

GitOrigin-RevId: a896b491f978e37a4afef67e434795b0f7cd301c
2019-08-14 15:19:35 +00:00
Henry Oswald
87605d835e Merge pull request #2075 from overleaf/ho-setting-doc-log-level
downgrade log of no root doc to log to reduce noise

GitOrigin-RevId: f729f44b46704a26a8bcd808e64a239a0da38107
2019-08-14 15:19:29 +00:00
Eric Mc Sween
df2d46b332 Merge pull request #2074 from overleaf/em-o-error
Introduce OError in CLSI manager

GitOrigin-RevId: 4299de10a21242be4a127e761720de48f587412b
2019-08-13 12:50:25 +00:00
Eric Mc Sween
29dec409d6 Merge pull request #2072 from overleaf/as-fix-local-lint
Fix linting locally

GitOrigin-RevId: eeb6dab09f3e3f7208ea104e7ceecd3d0e29564b
2019-08-13 12:50:05 +00:00
Eric Mc Sween
1bb9d2f944 Merge pull request #2049 from overleaf/jel-cms-decaf-cleanup
CMS eslint and post decaf cleanup

GitOrigin-RevId: 67d98668f0b9c1d8f973116dc689486ef418a3fd
2019-08-13 12:49:46 +00:00
Eric Mc Sween
72ea7eb5f0 Merge pull request #1992 from overleaf/pr-history-file-selection-improvements
History file selection and scrolling improvements

GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788
2019-08-13 12:49:32 +00:00
Simon Detheridge
6defe1a693 Make tests in RegistrationTests not depend on previous run state
GitOrigin-RevId: 68bcf9530ec6f5831c67449f35d0f010e5104f78
2019-08-13 08:50:19 +00:00
Simon Detheridge
7d253651ca Remove 'this' usage from UserUpdater
GitOrigin-RevId: f49126b69b22f8f6860d77ba07d9ae8fd68b5aaf
2019-08-13 08:50:13 +00:00
Ersun Warncke
c0cc8fdd3f add tests for error handling, clean up
GitOrigin-RevId: 8b102d54fd3d7f703dca81da182d3ab8eae3c9c2
2019-08-13 08:50:01 +00:00
Ersun Warncke
cd57ff4e7f return errors and clean up ProjectOptionsHandler
GitOrigin-RevId: 5be79a317419998216e9f207313c114888beb415
2019-08-13 08:49:55 +00:00
Ersun Warncke
39cb437bb6 more package.json changes
GitOrigin-RevId: 00ae56b88127d858250d56c876c5a65afc338cd8
2019-08-13 08:49:50 +00:00
Ersun Warncke
6ff5ef92ce add version for timekeeper
GitOrigin-RevId: ec3664df27823ae2ee63982070dcd0615de19e5b
2019-08-13 08:49:44 +00:00
Eric Mc Sween
b9bf16d22a Decaf cleanup (#2069)
GitOrigin-RevId: 2412480d495bfa0b4ad35edbbbeaaaf8644906ca
2019-08-12 11:39:23 +00:00
Miguel Serrano
6006c8ca79 Fixed incompatibilities between overleaf.com and community (#2028)
GitOrigin-RevId: fc1e4e3e179cab75144043d83197f09e4f6c7642
2019-08-12 11:39:17 +00:00
Timothée Alby
7d1bab4e88 Merge pull request #2025 from overleaf/ta-metrics-admin
Admin Metrics

GitOrigin-RevId: 1179893b9b2148110b86caca12b057fccb04f3af
2019-08-12 07:55:44 +00:00
Simon Detheridge
67b68b0171 Change token-access acceptance tests to not depend on previous test runs (#2063)
GitOrigin-RevId: 3727af6743cc530fe4a9dc7ec787dad25f1eadef
2019-08-10 01:58:33 +00:00
Alasdair Smith
48481e431e Merge pull request #2034 from overleaf/as-upgrade-babel
Upgrade babel to v7

GitOrigin-RevId: 1626f0d3343a5cb32a71dba5a8f32657b2d7237c
2019-08-09 09:54:37 +00:00
Alasdair Smith
3422c17dc4 Merge pull request #1948 from overleaf/cmg-allow-array-archiving
Make checking for project.archived array-friendly

GitOrigin-RevId: 2902a12fb4611a5786d4b10feba534b1cd29668b
2019-08-09 09:54:27 +00:00
Alasdair Smith
c8140f9641 Merge pull request #2059 from overleaf/spd-no-console
Don't allow 'console.log' in backend code

GitOrigin-RevId: f52413b574487eef54e8bd27cc61d15a011beb6f
2019-08-09 09:54:16 +00:00
Alasdair Smith
5b458e32ac Merge pull request #2057 from overleaf/spd-promisify-userhelper
Add promisified version of User helper in acceptance tests

GitOrigin-RevId: ce2c28dd0d8ec66edaef54a260a3944f4cdd55d6
2019-08-09 09:53:58 +00:00
Simon Detheridge
1d13f41163 Merge pull request #2045 from overleaf/hb-fix-ipmatcher-dash-call
checking ip matcher on dash load correctly

GitOrigin-RevId: dae581808d0bdc57b7bbc3601729e54e773b6c7f
2019-08-07 15:29:36 +00:00
Simon Detheridge
a815c6a3e8 Merge pull request #2016 from overleaf/sk-fix-session-data
Fix mismatched user session data

GitOrigin-RevId: d464d05431ac86e279109aa3f7bc26dcf76662f4
2019-08-07 15:29:31 +00:00
Simon Detheridge
7588393580 Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows
Enforce consistent callback style in mocha tests

GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85
2019-08-07 15:29:25 +00:00
Brian Gough
5c32523b53 Merge pull request #2050 from overleaf/bg-fix-session-logging-error
fix error in session logging

GitOrigin-RevId: e31ac3585f4c502a04602e9a49445319502c5d52
2019-08-07 08:58:24 +00:00
Eric Mc Sween
523b5b2114 Merge pull request #2046 from overleaf/hb-detect-changes-pre-export
Do one compile on toggle to autocompile

GitOrigin-RevId: 21776835c691bec9a1f80a7c0d4e651cc8c59dac
2019-08-06 15:33:07 +00:00
Eric Mc Sween
83495f4559 Merge pull request #2037 from overleaf/hb-detect-changes-pre-export
Detect for uncompiled changes before export

GitOrigin-RevId: a8b044c79ea4a6678388130d5ce77a05693c2d60
2019-08-06 12:34:37 +00:00
Eric Mc Sween
2269e4c4f1 Merge pull request #2031 from overleaf/bg-avoid-binary-text-mismatch-on-dropbox-updates
avoid writing binary data into existing docs via dropbox

GitOrigin-RevId: c6bc0ee3854c737ad80ea10a91bc27c88db2f838
2019-08-06 12:34:32 +00:00
Eric Mc Sween
e0c3a971bb Merge pull request #2044 from overleaf/em-forwarded-for
Get client IP behind proxies

GitOrigin-RevId: aed5e0bdcefb22b45db1b8745c5cd7522a32c21f
2019-08-06 12:34:26 +00:00
Eric Mc Sween
7fcfbe8930 Merge pull request #2038 from overleaf/spd-refactor-project-structure-tests
Refactor ProjectStructureTests to not depend on previous run state

GitOrigin-RevId: c004e980406db0f0c547b9407a6f5a76cccabe03
2019-08-06 12:34:21 +00:00
Eric Mc Sween
1c43219315 Merge pull request #2039 from overleaf/spd-more-nondependent-tests
Replace before with beforeEach in (most) acceptance tests

GitOrigin-RevId: 888c320d5616d541c112c007c488c38448c4c88d
2019-08-06 12:34:15 +00:00
Eric Mc Sween
5d0c6cddf6 Merge pull request #2040 from overleaf/spd-projectinvite-tests
Ensure tests ProjectInviteTests are not dependent on previous test state

GitOrigin-RevId: 0db825789f86d2a22a8ad981d4d1875a93c83017
2019-08-06 12:34:10 +00:00
Eric Mc Sween
2df7a8eaad Merge pull request #2032 from overleaf/as-upgrade-webpack
Upgrade webpack to v4

GitOrigin-RevId: a92c487fee79c29c5314273bf05439c9dbb0ce4d
2019-08-06 12:34:03 +00:00
Brian Gough
2e20975f53 Merge pull request #2042 from overleaf/bg-fix-applyCMToShareJS-offsets
fix startPos calculation for applyCMtoShareJs

GitOrigin-RevId: 642dc1fd2d7b2a1b34031900c137ffc10f94ddeb
2019-08-06 07:51:57 +00:00
Brian Gough
8237319683 Merge pull request #2041 from overleaf/bg-enforce-consistency-check
enforce consistency check for editors

GitOrigin-RevId: 2b8abed4519476be52563cbfecb799858f6dad0c
2019-08-06 07:51:52 +00:00
Alasdair Smith
de60c3d25f Merge pull request #2036 from overleaf/jel-footer-link
Support full URLs in link to tabs within the same page

GitOrigin-RevId: 50f66c57b2b3e4771b9b9620af9417822956be0a
2019-08-05 14:48:08 +00:00
Alasdair Smith
1b3f4033e7 Merge pull request #2009 from overleaf/as-remove-coffee-script
Remove coffee-script & other unused dependencies

GitOrigin-RevId: 22736dbed80b2654ad8498862d424c2de7ef0393
2019-08-05 14:47:58 +00:00
Alasdair Smith
efbcfd10be Merge pull request #2030 from overleaf/jel-card-z-index
Remove card position styling

GitOrigin-RevId: 298998f5f3032064b7bce8016cab96a54597c2b3
2019-08-02 08:59:17 +00:00
Alasdair Smith
07e68cbc00 Merge pull request #2008 from overleaf/as-package-lock
Switch shrinkwrap to package-lock

GitOrigin-RevId: 672a71f86be700ba995f25a383efe2bdaf8f02b9
2019-08-02 08:59:10 +00:00
Timothée Alby
7785c7b59e Merge pull request #2029 from overleaf/ta-build-main-recurly-3
Load Recurly JS Separately

GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
2019-07-31 15:44:44 +00:00
Timothée Alby
befa4e932e Merge pull request #2027 from overleaf/ta-build-main-recurly-2
add main-recurly.js to Gruntfile

GitOrigin-RevId: 5527f97394efe6ca3d8c206276c46993547c8edc
2019-07-31 10:48:57 +00:00
Timothée Alby
8fb6835f8a Merge pull request #2026 from overleaf/ta-build-main-recurly
Add build steps for main-recurly.js

GitOrigin-RevId: 25231c62854b75904b1b5288b3a5157e10220f9d
2019-07-31 09:49:07 +00:00