Commit graph

74 commits

Author SHA1 Message Date
Mathias Jakobsen
67e7621633 Merge pull request #13572 from overleaf/mj-bibtex-grammar
[cm6] Add support for bibtex

GitOrigin-RevId: 28bc8e47c53df1612c1e30cf690e893b0bbf500c
2023-07-17 10:47:59 +00:00
Miguel Serrano
7e6613a1a0 Merge pull request #13327 from overleaf/msm-web-track-changes-cleanup
[web] Cleanup track-changes from web

GitOrigin-RevId: 8cef709ec5e91e4ffe8cd06826038ed84f36ef67
2023-07-17 10:28:12 +00:00
Tim Down
7f37ba737c Move source editor out of module (#12457)
* Update Copybara options in preparation for open-sourcing the source editor

* Move files

* Update paths

* Remove source-editor module and checks for its existence

* Explicitly mention CM6 license in files that contain code adapted from CM6

GitOrigin-RevId: 89b7cc2b409db01ad103198ccbd1b126ab56349b
2023-04-13 08:40:56 +00:00
Alf Eaton
85fbded781 Improve the Rich Text toolbar (#11616)
GitOrigin-RevId: d1999be629ac048058ffd82004865728796a3feb
2023-02-07 09:04:39 +00:00
Miguel Serrano
6787e9c50d Merge pull request #11490 from overleaf/msm-migrate-history-fix
[web/scripts] `history/migrate_history.js` fixes

GitOrigin-RevId: 249e9a3f1dbf89d46335ee208f5922905477845c
2023-01-27 12:04:01 +00:00
ilkin-overleaf
6c9fddf93f Merge pull request #9054 from overleaf/ii-gitignore-cypress-screenshots
Ignore cypress results locally

GitOrigin-RevId: 2f813c2ba5827f8cf1b4e15977df0a4c74b9b82f
2022-08-01 08:03:25 +00:00
Jakob Ackermann
f11e1a83cd Merge pull request #8776 from overleaf/jpa-drop-service-worker
[web] goodbye service worker

GitOrigin-RevId: ce85d4850faba15c5877ce1f3e78026de30c6eae
2022-07-11 08:03:57 +00:00
June Kelly
3d38087297 Merge pull request #7880 from overleaf/jk-cm6-parser-migrate-to-web
[web] CM6: Migrate lezer parser to web

GitOrigin-RevId: d6f63ab2f3440292373bcc814c3769285be47c2b
2022-06-24 08:03:44 +00:00
Alf Eaton
5e9af2c15c Migrate worker tests to Cypress (#7359)
GitOrigin-RevId: f373f4215e5f25d14256008cf5f6582eb3124431
2022-04-07 08:03:52 +00:00
Alf Eaton
53324b0cd2 Add Cypress React component testing (#6974)
GitOrigin-RevId: 1260312a0644f3bc60e007a840045974336e264d
2022-04-05 12:17:30 +00:00
Alf Eaton
371270c622 [web] Convert Ace themes to CodeMirror 6 (#6543)
GitOrigin-RevId: 510064f04afb65387ee9ed7d56ad91db4b7a84d3
2022-02-07 09:03:29 +00:00
Brian Gough
d706109823 Merge pull request #5615 from overleaf/revert-5611-revert-4746-ae-project-history
Add endpoint for migrating a project from track-changes to full project history (second attempt)

GitOrigin-RevId: 86ff0a149bd56f028fc7af854f1684bf126e503f
2021-11-03 09:02:54 +00:00
Brian Gough
ce7af09728 Merge pull request #5611 from overleaf/revert-4746-ae-project-history
Revert "Add endpoint for migrating a project from track-changes to full project history"

GitOrigin-RevId: 4a37d31daa2855622bfd3e7d96eeabe813b5d8bb
2021-10-29 08:03:32 +00:00
Brian Gough
da4fdfe11e Merge pull request #4746 from overleaf/ae-project-history
Add endpoint for migrating a project from track-changes to full project history

GitOrigin-RevId: 74e1fb1379a78a9569dda2007e677a4d277e38fb
2021-10-29 08:03:18 +00:00
June Kelly
e34c83f3f7 Merge pull request #5435 from overleaf/as-ignore-assets
Ignore some more generated assets

GitOrigin-RevId: b9cce0f477b3b111d04836e6900a8f14c4cdd861
2021-10-21 08:03:11 +00:00
Jakob Ackermann
611019d718 Merge pull request #4297 from overleaf/jpa-prepare-separate-defaults-per-env
[config] prepare separate overrides per env

GitOrigin-RevId: fc000c023e7cc8383075c633c2882ab8e6b36c4b
2021-07-08 12:54:01 +00:00
Alexandre Bourdin
40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Alf Eaton
59fe11f0ff Merge pull request #3936 from overleaf/ae-gitignore-js-config
Add .js files in config/ to .gitignore

GitOrigin-RevId: c20ca5a4e58092336829d9cac2700cf3c61a6fd2
2021-04-23 02:09:50 +00:00
Alexandre Bourdin
6e35561aeb Merge pull request #3725 from overleaf/ab-ta-pdf-sync-spinner
Stop spinner on PDF sync when file does not exist anymore

GitOrigin-RevId: cba4bf3dd3d90c2894c6c5f1b28d184f18bb08fd
2021-03-11 03:05:04 +00:00
Alf Eaton
a481ffef17 Merge pull request #3645 from overleaf/ae-import-config
Add config for optional modules

GitOrigin-RevId: 082261eff5d505ce98dfaafe179547b312c0511b
2021-03-04 03:04:21 +00:00
Jessica Lawshe
197cf5e577 Merge pull request #3081 from overleaf/jpa-npmc-via-dev-env
[misc] drop the npmrc from the git-tree -- the dev-env will handle it

GitOrigin-RevId: 096b7f8d9c88e54eff6972feaaf205b32940c54d
2020-08-10 15:56:04 +00:00
Hugh O'Brien
d9d8f9a531 Merge pull request #2956 from overleaf/as-c8
Add frontend test coverage command

GitOrigin-RevId: ae4e760e343807ebdc94292d21434d4154694f0c
2020-07-14 02:06:41 +00:00
Alasdair Smith
db610f7efb Merge pull request #2657 from overleaf/revert-2650-revert-2570-as-sentry-source-maps
Bring back upload source maps to Sentry

GitOrigin-RevId: 22024e3ec2462d0bc9ad9c14e8d1c21880c55cd1
2020-04-01 03:21:16 +00:00
Alasdair Smith
ad361a6617 Merge pull request #2650 from overleaf/revert-2570-as-sentry-source-maps
Revert "Upload source maps to Sentry"

GitOrigin-RevId: 6f6a122209553b9fde664ff55ebec37f7cb6ef7e
2020-03-04 04:21:39 +00:00
Eric Mc Sween
a11a4ac614 Merge pull request #2570 from overleaf/as-sentry-source-maps
Upload source maps to Sentry

GitOrigin-RevId: badbce7a5a72c3c2b5ad61d1ab2e458a52128e37
2020-03-04 04:21:34 +00:00
Alasdair Smith
0d6cd8fca6 Merge pull request #2523 from overleaf/revert-2520-revert-2488-as-import-pr-708
Bring back reverted Vendor web fonts PR

GitOrigin-RevId: 7430df7cefca120def048f8bbe2799b30772c686
2020-01-29 12:07:22 +00:00
Alasdair Smith
9e36de9da0 Merge pull request #2520 from overleaf/revert-2488-as-import-pr-708
Revert "[Imported] Vendor web fonts, (#708)"

GitOrigin-RevId: a9276168b880326fda51ba3d172d6cbfbdf74f6a
2020-01-15 04:20:50 +00:00
Alasdair Smith
a084d620ae Merge pull request #2488 from overleaf/as-import-pr-708
[Imported] Vendor web fonts, (#708)

GitOrigin-RevId: b286a0d4bac9d84f70bf9d4ff99220f67ce67425
2020-01-15 04:20:37 +00:00
Alasdair Smith
26190da566 Merge pull request #2349 from overleaf/as-webpack-css
Compile CSS using webpack

GitOrigin-RevId: 489834038667dde572ea5d9b4b9392b362259a09
2019-11-28 10:39:09 +00:00
Alasdair Smith
e035d526d6 Merge pull request #2287 from overleaf/as-frontend-rearch
Restructure frontend directories

GitOrigin-RevId: 5a1224ca186f4809df45680a80d374c1c318d7bf
2019-11-05 14:22:52 +00:00
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
2019-10-16 10:36:21 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00
Alasdair Smith
9b97af8977 Merge pull request #1403 from sharelatex/as-swap-brand-prefix
Swap brand prefix so OL is the default

GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db
2019-02-12 11:32:28 +00:00
Paulo Jorge Reis
02eb683298 Merge pull request #1113 from sharelatex/pr-compile-only-ol-dark-dev
Move LESS compilation process to Makefile

GitOrigin-RevId: 5a3871759eda2685ec0690899b0904d45c7db0a6
2018-11-16 12:02:47 +00:00
Shane Kilkelly
e0e6a72374 Fix the gitignore pattern for index.js in modules
GitOrigin-RevId: c5fef305f47a5e738790c079b17cef330f858d4c
2018-11-14 12:17:23 +00:00
Ersun Warncke
f3b92bbeec Collabratec Get Projects API (#1092)
collabratec get projects api

GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495
2018-11-06 13:48:49 +00:00
Alasdair Smith
659242b457 Merge pull request #1037 from sharelatex/as-decaffeinate
Decaffeinate frontend

GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de
2018-11-05 10:19:25 +00:00
Simon Detheridge
4842a45d8c Merge pull request #1109 from sharelatex/spd-module-gitignore
Remove .gitignore files from modules and add to main ignore file

GitOrigin-RevId: e71d07e8e4915077a89d824a68514c0936d9612c
2018-11-02 15:01:21 +00:00
Timothée Alby
27475bd980 Merge pull request #1059 from sharelatex/ja-ignore-modules-makefiles
gitignore module makefiles

GitOrigin-RevId: e8473b8e23f59ecfb27b449a503f8a7b023533a2
2018-10-24 14:03:16 +00:00
Timothée Alby
3abfe36279 Merge pull request #1057 from sharelatex/ja-update-git-ignore
Don't gitignore new module directories

GitOrigin-RevId: f6c4a65af6fa98c879c0ceb952f3161d6f395dee
2018-10-24 12:49:53 +00:00
Paulo Reis
e88b840da7 Update gitignore with the light theme generated CSS file. 2018-08-24 12:07:14 +01:00
Paulo Reis
f3806faeb2 Make git ignore compiled Coffeescript Angular components. 2018-06-20 11:37:34 +01:00
Alasdair Smith
74099440f3 Generate webpack entry points including modules 2018-03-23 12:37:16 +00:00
Alasdair Smith
98e2e3ada1 Ignore everything in modules except gitkeep, to ensure directory exists 2018-03-23 11:39:46 +00:00
Alasdair Smith
fe3636c714 Ignore compiled es directory 2018-03-15 09:42:26 +00:00
Brian Gough
38cb2885d8 Merge pull request #364 from sharelatex/bg-support-debug-mode
add support for debugging
2018-02-26 11:34:29 +00:00
Brian Gough
18cd5a5e54 ignore sourcemap for app.js 2018-02-26 09:51:37 +00:00
James Allen
20347da44d Ignore public/brand 2018-02-15 14:54:58 +00:00
James Allen
662122bb1c CI and local dev environment improvements
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
2018-01-15 09:36:41 +00:00
James Allen
98ff097981 Merge pull request #219 from sharelatex/as-ignore-require
Ignore content-addressible compiled require js
2017-12-19 15:00:50 +00:00