James Allen
|
0602fed6e5
|
Merge branch 'master' into as-import-v1
|
2017-12-04 10:02:21 +00:00 |
|
James Allen
|
b51ee7ea7e
|
Point track-changes-web-module back at master
|
2017-12-04 09:22:47 +00:00 |
|
Henry Oswald
|
b38cf9ef6e
|
Merge pull request #189 from sharelatex/ho-fine-uploader
moment and fineuploader are loaded separately in editor, not packaged up
|
2017-12-02 13:41:01 +00:00 |
|
Henry Oswald
|
aaa908187d
|
added layout.pug back in
|
2017-12-02 13:38:23 +00:00 |
|
James Allen
|
a9ca54b98a
|
Generate docker-compose.yml before any docker-compose command
|
2017-12-02 13:02:37 +00:00 |
|
Henry Oswald
|
c020e4e6bd
|
moment and fineuploader are loaded seperately in editor, not packaged up
|
2017-12-02 12:29:06 +00:00 |
|
James Allen
|
5e3f192eda
|
Merge pull request #187 from sharelatex/sk-version-fineuploader
Version the fineuploader library
|
2017-12-01 13:34:31 +00:00 |
|
James Allen
|
381761127e
|
Replace previous fineuploader path with old version
|
2017-12-01 13:26:31 +00:00 |
|
Shane Kilkelly
|
3ee6f5d4be
|
Update fineuploader on project page
|
2017-12-01 11:27:06 +00:00 |
|
Shane Kilkelly
|
2ea3caf08b
|
Properly version the fineuploader library
|
2017-12-01 11:22:41 +00:00 |
|
James Allen
|
e895a495d6
|
Move make clean step to before compile
|
2017-12-01 10:49:00 +00:00 |
|
James Allen
|
e9733514af
|
Fail on failing module acceptance tests
|
2017-12-01 10:07:09 +00:00 |
|
James Allen
|
65e44d4770
|
Clean up old docker-shared.yml before running tests
|
2017-12-01 09:31:22 +00:00 |
|
James Allen
|
fa2a3574db
|
Look for Makefile, not makefile
|
2017-12-01 09:01:36 +00:00 |
|
James Allen
|
040546b1d3
|
Move -q flag to correct place
|
2017-12-01 08:49:10 +00:00 |
|
James Allen
|
e62ec77161
|
Merge pull request #180 from sharelatex/ja-quiet-npm
Run npm with -q flag for less verbose test output
|
2017-12-01 08:32:46 +00:00 |
|
James Allen
|
c433ac7e2d
|
Merge pull request #183 from sharelatex/hof-module-acceptance-files
acceptance test changes for module test
|
2017-12-01 08:32:14 +00:00 |
|
Alasdair Smith
|
52ad852814
|
Add check for OL host to prevent failure on legacy SL
|
2017-11-30 15:14:47 +00:00 |
|
Alasdair Smith
|
4769090dcd
|
Merge pull request #184 from sharelatex/as-ignore-modules
Update modules gitignore to ignore everything except specific modules
|
2017-11-30 13:44:20 +00:00 |
|
Alasdair Smith
|
a5cdcea9c7
|
Update modules gitignore to ignore everything except specific modules
|
2017-11-30 13:32:23 +00:00 |
|
Hayden Faulds
|
e916fc906a
|
add mkdirp dev dependency
|
2017-11-30 13:15:39 +00:00 |
|
Hayden Faulds
|
78709d819e
|
generate test acceptance files volume for modules
|
2017-11-30 13:15:23 +00:00 |
|
James Allen
|
b2a3e06717
|
Find / replace mistake
|
2017-11-30 11:20:25 +00:00 |
|
James Allen
|
870e87ebe1
|
Run npm with -q flag for less verbose test output
|
2017-11-30 11:00:28 +00:00 |
|
Alasdair Smith
|
f232899f3f
|
Show warning symbol on second step
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
6eae1d59ea
|
Use asyncForm directive to trigger import
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
3aaf6559c8
|
Add image of v2 editor
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
265e659999
|
Add multiple steps
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
958e4cad9b
|
Fix wrong controller
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
b68d6411ee
|
Basic styles for import modal
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
0e11668a61
|
Change v1 project link to button which opens import modal
|
2017-11-30 10:16:15 +00:00 |
|
Alasdair Smith
|
cbba7c38df
|
Add basic v1 import modal template & controller
|
2017-11-30 10:16:15 +00:00 |
|
James Allen
|
488e6d7c5d
|
Merge pull request #158 from sharelatex/ja-dockerise-tests
Dockerize unit and acceptance tests using docker-compose
|
2017-11-30 10:09:07 +00:00 |
|
Alasdair Smith
|
dba0ab003c
|
Merge pull request #166 from sharelatex/as-autocompile-rollout-20
Increase autocompile rollout to 20%
|
2017-11-30 10:08:55 +00:00 |
|
James Allen
|
d958d8c140
|
Merge pull request #179 from sharelatex/ns-startsWith-fix
removing `startsWith` calls
|
2017-11-30 09:09:15 +00:00 |
|
Nate Stemen
|
c2bb8b9f89
|
removing calls
|
2017-11-29 13:30:53 -05:00 |
|
Nate Stemen
|
74ba7402de
|
Merge branch 'ns-file-completer'
|
2017-11-29 09:20:09 -05:00 |
|
James Allen
|
bb74f8318a
|
Support make clean install usage
|
2017-11-29 14:16:29 +00:00 |
|
James Allen
|
50b3045548
|
Tidy up docker-compose and makefile
|
2017-11-29 13:49:36 +00:00 |
|
Shane Kilkelly
|
c203a8d80a
|
Merge branch 'sk-use-recurly-hosted-details-page'
|
2017-11-29 09:45:54 +00:00 |
|
Shane Kilkelly
|
8b5115ff03
|
Merge branch 'sk-update-fineuploader'
|
2017-11-29 09:41:14 +00:00 |
|
Nate Stemen
|
26df9bca05
|
Merge pull request #136 from sharelatex/ns-autocomplete-bugs
fixing popup and code folding issues
|
2017-11-28 10:28:54 -05:00 |
|
Nate Stemen
|
2a50a18d23
|
Merge branch 'ns-package-aware-autocomplete'
|
2017-11-28 10:24:37 -05:00 |
|
Nate Stemen
|
8ef48925c1
|
Merge pull request #71 from sharelatex/ns-package-completer
fixing package completer
|
2017-11-28 08:56:49 -05:00 |
|
Shane Kilkelly
|
cc9986cefd
|
Remove the obsolete update-billing-details page
|
2017-11-28 11:52:14 +00:00 |
|
Shane Kilkelly
|
22c163c60a
|
Move the recurly-billing-details link up to main subscription page
|
2017-11-28 11:40:48 +00:00 |
|
Alasdair Smith
|
bbaacb4db4
|
Increase autocompile rollout to 20%
|
2017-11-28 10:52:46 +00:00 |
|
Alasdair Smith
|
d082e8eab2
|
Merge pull request #165 from sharelatex/ja-move-unit-tests
Move test/UnitTests -> unit/test
|
2017-11-28 09:51:19 +00:00 |
|
Alasdair Smith
|
c5f459a531
|
Merge pull request #159 from sharelatex/as-show-v1-owner
Show v1 project owner's name in project list
|
2017-11-28 09:51:04 +00:00 |
|
James Allen
|
3e90103d9c
|
No need to bind to 0.0.0.0 when running in same container
|
2017-11-27 17:10:58 +00:00 |
|