Anton Markelov
a817d2d127
add requested changes, add some logging
2018-06-08 13:09:13 +10:00
Anton Markelov
087acb8ed4
remove collisions on prepareTask stage
2018-06-07 17:29:55 +10:00
Tom Whiston
9da6231ed8
Merge pull request #543 from twhiston/upstream_sql_pin
...
pin sql versions in all docker compose files
2018-05-22 19:44:37 +02:00
tom whiston
97671acff7
pin
2018-05-22 17:25:35 +00:00
Tom Whiston
0182c12750
Merge pull request #542 from vyulabs/fix-creating-new-user
...
Fix creating new user
2018-05-22 12:50:28 +02:00
Denis
53b38a09ae
Fix creating new user
2018-05-16 17:13:58 +05:00
Tom Whiston
7eaa04f9e2
Merge pull request #533 from vyulabs/angular-swal
...
Using SweetAlert over AngularJS factory
2018-05-15 11:36:01 +02:00
Denis
35fbd3ba2a
Fix SweetAlert factory
2018-05-15 14:20:55 +05:00
Denis
173ef6b6fa
Add SweetAlert dep
2018-05-15 14:20:55 +05:00
Denis
287ce7d07e
Add SweetAlert factory
2018-05-15 14:20:55 +05:00
tom whiston
373f3d1e8e
add interface variable to settings
2018-05-14 19:43:33 +00:00
Tom Whiston
7503c81d8e
Merge pull request #537 from vyulabs/fix-js-function-undefiend
...
Fix promise execution, replace then(...).error(...) to then(...).catc…
2018-05-14 01:19:40 +02:00
Denis
8d74b35c4a
Fix promise execution, replace then(...).error(...) to then(...).catch(...)
2018-05-08 16:15:48 +05:00
Tom Whiston
2c3722f752
Merge pull request #534 from twhiston/package_maintainer
...
add maintainer information
2018-05-08 10:12:00 +02:00
Tom Whiston
a512739859
Merge pull request #536 from twhiston/fix_mysql_versions
...
pin mysql to 5.6
2018-05-08 10:11:35 +02:00
tom whiston
b9dca6affd
add maintainer information
2018-05-07 10:11:20 +00:00
tom whiston
7638f2eddd
pin mysql to 5.6
2018-05-07 10:05:49 +00:00
Tom Whiston
2a5344b214
Merge pull request #531 from slickvoodoo/develop
...
Assign users response correctly
2018-04-27 21:14:02 +02:00
slickvoodoo
db5408ad84
Assign user response correctly
...
Fix #529
2018-04-26 09:59:01 -05:00
tom whiston
c5505545c4
fix release deps
2018-04-19 18:15:31 +00:00
Tom Whiston
9a20b17320
Merge pull request #524 from twhiston/api_tests
...
use dredd for api testing
2018-04-19 19:34:54 +02:00
tom whiston
cccc00d113
use dredd for api testing
...
add ci context docker deployment
update api docs
add some small fixes
2018-04-18 18:03:15 +00:00
tom whiston
be6190c472
increase linter timeout
2018-04-18 12:32:44 +00:00
Tom Whiston
f7568da911
Merge pull request #514 from twhiston/gometalinter
...
gometalinter
2018-04-18 14:28:33 +02:00
Tom Whiston
8d15b08179
Merge pull request #518 from twhiston/systemd
...
systemd example
2018-04-18 12:54:41 +02:00
Tom Whiston
5baefb0640
Merge pull request #520 from twhiston/test_deploy
...
fine tune release process
2018-04-18 12:53:41 +02:00
tom whiston
fd4db93bd4
fine tune release process
2018-04-09 20:08:52 +00:00
tom whiston
76334a57b7
update goreleaser
2018-04-09 13:46:02 +00:00
tom whiston
de7f201fb6
daemon reload
2018-04-09 13:40:17 +00:00
Tom Whiston
2543490112
Merge pull request #519 from ChristianAdamski/patch-1
...
Quote missing in proxy dockerfile
2018-04-09 15:28:38 +02:00
Christian Adamski
69c1d3e429
Quote missing in proxy dockerfile
...
Ending quote missing on author email-address
2018-04-09 15:16:11 +02:00
Tom Whiston
3e1c5acbbf
Merge pull request #517 from twhiston/openshift_deploy
...
openshift template
2018-04-08 22:45:22 +02:00
tom whiston
cca5d8fbcf
systemd example
2018-04-06 20:14:50 +00:00
tom whiston
95e5813ad9
openshift template
2018-04-06 19:22:16 +00:00
Tom Whiston
9931f15cd5
Merge branch 'develop' into gometalinter
2018-04-06 12:27:53 +02:00
Tom Whiston
1a9ae22382
prod deploy only on tags as circle ci filters are logical OR not AND
2018-04-06 07:58:10 +00:00
Tom Whiston
fe2612dfff
Merge pull request #516 from twhiston/image_builds
...
circleci workflows and docker image build and push
2018-04-06 09:45:09 +02:00
tom whiston
ad4c74fb92
circleci workflows and docker image build and push
2018-04-05 22:40:49 +00:00
tom whiston
17fa7bb407
add gometalinter to tools and run it in circle.
...
extract some error checking and logging in places where linting needed or errors not checked
2018-04-05 21:24:19 +00:00
Tom Whiston
123a4ea7f1
Merge pull request #509 from zarianec/develop
...
Fixed SweetAlert confirmation popup
2018-04-03 10:32:19 +02:00
Tom Whiston
8b41b19871
Merge pull request #515 from UnitedTraders/506-local-install
...
add local installation of fe tools, add relative paths to that tools
2018-04-02 11:04:16 +02:00
Anton Markelov
f24a10917f
add local installation of fe tools, add relative paths to that tools
...
move nodemon to devdependencies, remove manual installation of pug, less and nodemon
small windows-related fixes
move less and pug to devdependencies
replace echo to space for windows
2018-03-30 20:21:27 +10:00
Artiom Stoianov
8ba64afdc8
Convert spaces to tabs
2018-03-29 14:05:55 +03:00
tom whiston
551584223f
update circle config to account for cache issue
2018-03-27 13:21:07 +00:00
Tom Whiston
b03f72ffc6
Merge pull request #511 from twhiston/fix_circle_cache_issue
...
update circle config to account for cache issue
2018-03-27 15:19:03 +02:00
tom whiston
291d11eda4
update circle config to account for cache issue
2018-03-27 12:55:47 +00:00
Tom Whiston
dbaa7081fe
Merge pull request #490 from twhiston/deployment
...
Deployment folder and new docker images
2018-03-27 14:23:35 +02:00
Tom Whiston
b24b22bab5
Merge pull request #508 from twhiston/cfg_file_error_scope
...
bugfix for error scopes in config checking
2018-03-27 14:23:16 +02:00
Artiom Stoianov
c8e94d6746
Style fixes
2018-03-27 09:06:39 +03:00
Artiom Stoianov
a605c54583
Fixed SweetAlert confirmation popup
2018-03-27 08:38:48 +03:00
