Commit graph

5952 commits

Author SHA1 Message Date
James Allen
c466025df4 Go back to allowing v1 projects to be imported 2018-01-16 09:40:58 +00:00
Alasdair Smith
4a0628d801 Remove unnecessary test script 2018-01-15 16:23:10 +00:00
Alasdair Smith
984ecae200 Rename directory to es to align with coffee dir 2018-01-15 16:23:10 +00:00
Alasdair Smith
dadd74e730 Move public path to dev config 2018-01-15 16:23:10 +00:00
Alasdair Smith
4642d55b7b Add basic example script 2018-01-15 16:23:10 +00:00
Alasdair Smith
49c27c4c7a Port webpack config from OL 2018-01-15 16:23:10 +00:00
Alasdair Smith
9fbd7f2818 Install webpack and babel 2018-01-15 16:23:10 +00:00
James Allen
6d04eeaa03 Merge pull request #256 from sharelatex/ja-display-v2-history-users
Inject v2 user details into project-history updates and diffs
2018-01-15 14:21:14 +00:00
James Allen
67061154fe Merge pull request #237 from sharelatex/hof-editor-controller-locking
Project Locking: EditorController
2018-01-15 14:21:03 +00:00
James Allen
7de4df9702 Merge pull request #250 from sharelatex/ja-dockerize-dev
Improve local and CI build processes and make compatible with docker-compose workflow
2018-01-15 09:41:55 +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
Timothée Alby
62bc3f947f Merge pull request #257 from sharelatex/ta-remove-proxy-headers
Remove headers when proxying analytics request
2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24 use LockManager.runWithLock in EditorController 2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a rename EditorController.replaceFile -> replaceFileWithoutLock 2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149 add locking for EditorController.renameEntity 2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6 remove all headers when proxying the analytics request 2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3 Merge pull request #251 from sharelatex/fix-group-member-subscription-page
Fix subscription page for members of a group
2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f Merge pull request #242 from sharelatex/rename-entity-bugfix
Ensure the dirname is not affected when we rename an entity
2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d Fix next -> callback 2018-01-11 14:11:44 +00:00
James Allen
17a5dfa5a5 Inject v2 user details into project-history updates and diffs 2018-01-11 11:32:16 +00:00
James Allen
945ef25ef5 Merge pull request #244 from sharelatex/hof-lock-file-upload
Project Locking: ProjectUploadController
2018-01-11 08:42:36 +00:00
James Allen
0cf875bd0a Merge pull request #170 from sharelatex/pr-fix-link-rewriting
Enable HTML5 mode in Angular, to allow disabling link rewriting.
2018-01-11 08:42:29 +00:00
James Allen
79055d0e8d Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs
Show apology message instead of raw binary files
2018-01-11 08:42:13 +00:00
James Allen
47414834c8 Merge pull request #255 from sharelatex/ta-analytics-proxy-public
Run analytics proxy on public API router
2018-01-11 08:42:05 +00:00
Tim Alby
c1febbeb7c run analytics proxy on public API router 2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d Merge pull request #241 from sharelatex/ta-analytics-proxy
Proxy requests to analytics service
2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f Merge pull request #234 from sharelatex/hof-remove-unused-method
remove unused EditorController.getListOfDocPaths
2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
0200fd66cd Mock LimitationsManager as well 2018-01-10 10:26:16 +00:00
Alberto Fernández Capel
a81b56556f Add test for SubscriptionViewModelBuilder 2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a use LockManger.runWithLock 2018-01-09 16:37:34 +00:00
James Allen
4235f80b52 Merge pull request #254 from sharelatex/ja-remove-dead-files
Remove some unused files
2018-01-09 14:49:50 +00:00
James Allen
c6b6b95dec Remove some unused files 2018-01-09 14:19:23 +00:00
Nate Stemen
c43aa54bee Merge branch 'ns-fix-package-command-meta' 2018-01-08 08:53:42 -05:00
Nate Stemen
7af615ff6c Merge branch 'ns-no-duplicate-packages' 2018-01-08 08:53:07 -05:00
Nate Stemen
cf4d6c1165 Merge branch 'master' into ns-no-duplicate-packages 2018-01-05 11:46:44 -05:00
Alberto Fernández Capel
6d007bfe74 DRY logic to get subscription from Recurly
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736 Fix subscription page for members of a group
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.

SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
James Allen
626e0a16ef Fix acceptance test when overleaf setting not present 2018-01-04 15:49:31 +00:00
James Allen
e58f6cab47 Merge pull request #248 from sharelatex/ja-disable-import-dialog
Don't show import dialog for projects, just link to v1 editor
2018-01-04 15:22:48 +00:00
James Allen
e2f27becac Merge pull request #249 from sharelatex/ja-enable-history-display-on-create
Enable project history for new projects if enabled in settings
2018-01-04 15:21:19 +00:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
967353d080 Update comment to use button for import dialog for a11y 2018-01-03 17:06:51 +00:00
James Allen
bbfcff30fb Enable project history for new projects if enabled in settings 2018-01-03 16:55:33 +00:00
James Allen
f0d7658bdd Don't show import dialog for projects, just link to v1 editor 2018-01-03 16:46:26 +00:00
Paulo Reis
8b9f3268b1 Make plans page consistent with others, fixing header issues. 2018-01-03 13:54:33 +00:00
Paulo Reis
b73a56f70c Take header height into account in the main page masthead; avoid margin collapsing. 2018-01-03 12:12:45 +00:00
James Allen
0f1b0be231 Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging
Change an erroneous `logger.error` to `logger.log`; Fixes #227
2018-01-03 11:30:46 +00:00
James Allen
7918232757 Merge pull request #240 from sharelatex/pr-v2-styling-fixes
v2 styling fixes
2018-01-03 11:30:39 +00:00
James Allen
ada76e820a Merge pull request #238 from sharelatex/as-ol-emails
v2 themed emails
2018-01-03 11:30:28 +00:00