57 Commits

Author SHA1 Message Date
beedbaba4f composer update 2022-07-22 10:57:09 +01:00
701f32ef99 switched to gitlab for oc module
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-18 16:46:45 +01:00
672657ffa2 updated gno and oc
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-18 16:39:26 +01:00
db13ee41fa updated gno and oc
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-12 09:02:00 +01:00
860b03860a updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-12 08:20:15 +01:00
f5a9efdd95 updated custom modules
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-10 14:30:30 +01:00
8cb93ed094 changed theme branc back to main
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-06 08:33:54 +01:00
518541e2fc updated modules, set theme to "ok" branch
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-05 13:59:38 +01:00
103a47ef21 updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-05 12:05:25 +01:00
e760b2ef28 updated the two modules
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-05 11:59:17 +01:00
bb9f603173 updated gno, theme, and drupal
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-23 10:23:37 +01:00
1c67a1b320 updated opencase
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 14:11:59 +01:00
a296460487 updated gno config
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 13:36:57 +01:00
94efeab605 updated oc (added website link field) + gno config
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 13:32:40 +01:00
abbe3f6602 updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 11:43:16 +01:00
0687172f9e updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 11:28:02 +01:00
27a4ff7f83 updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-20 10:44:46 +01:00
7098bd6765 updated gno
Some checks failed
continuous-integration/drone/push Build is failing
2022-06-20 10:42:28 +01:00
74de94b50d updated gno
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2022-06-20 10:34:10 +01:00
5870a0b47c updated opencase after exporting config
Some checks failed
continuous-integration/drone/push Build is failing
2022-06-20 10:28:45 +01:00
69572713a4 composer update & drone config
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is failing
Drone now deploys to dev after a push to the master branch, as opposed to the dev branch.
2022-06-20 10:16:20 +01:00
c03aee9c6b updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-06 13:08:59 +01:00
17a6cc9da8 Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-06-06 12:03:09 +01:00
2fa2281eb7 updated gno module 2022-06-06 12:02:09 +01:00
2515cc1a39 updated gno module config 2022-06-02 16:21:22 +01:00
6ba2cdbcfa composer update 2022-06-02 14:25:58 +01:00
0acf715e4c composer update 2022-05-27 09:31:27 +01:00
88c8670425 Merge branch 'master' of ssh://git.autonomic.zone:2222/autonomic-cooperative/goodnightout_composer 2022-05-27 09:29:24 +01:00
26821f42e2 added core-dev 2022-05-27 09:28:42 +01:00
7d40d30e10 compser update
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-19 10:50:43 +01:00
ce2811baca Merge branch 'master' into dev 2022-05-19 10:50:10 +01:00
cabbbb82fb Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-19 08:39:12 +01:00
f535dc6da1 composer update
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-19 08:31:34 +01:00
aae8d31f56 Merge branch 'master' into dev 2022-05-19 08:31:05 +01:00
948d54781d composer update
Some checks failed
continuous-integration/drone/push Build is failing
2022-05-19 08:26:57 +01:00
af2522b9ea Merge branch 'master' into dev
Some checks failed
continuous-integration/drone/push Build is failing
2022-05-18 19:10:27 +01:00
1717b830af displaying date on activities, tidied activity fields
Some checks failed
continuous-integration/drone/push Build is failing
also removed swiftmailer as it didn't help with html email alerts
2022-05-16 19:33:13 +01:00
1aba044044 updated custom modules
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-10 09:36:09 +01:00
3f5c12ffce Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-10 09:29:06 +01:00
c4ecc4b3b4 Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-09 17:45:22 +01:00
9f80d29e38 composer update
All checks were successful
continuous-integration/drone/push Build is passing
2022-05-09 17:28:14 +01:00
08ad04310b Merge branch 'master' into dev 2022-05-09 17:26:11 +01:00
3ed6456adb Readded trainings extra field config that had gone missing 2022-05-07 11:11:40 +01:00
dbcab12ab0 Reports • Cannot sort columns 2022-05-07 10:43:02 +01:00
7965957000 Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-25 16:31:19 +01:00
59cce7ee7d updated gno
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-25 16:21:06 +01:00
dfee129e21 added permission for gno_admin to configure trainer rate
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-25 14:29:42 +01:00
aea40ae998 Added generic events view
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-25 13:04:17 +01:00
5889984cd8 Merge branch 'master' into dev
Some checks failed
continuous-integration/drone/push Build is failing
2022-04-25 12:45:54 +01:00
ad356e805f Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-04-03 19:49:51 +01:00
dc03e23dc0 Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-31 14:29:50 +01:00
b3e4e5658f Merge branch 'master' into dev
All checks were successful
continuous-integration/drone/push Build is passing
2022-03-31 14:14:56 +01:00
58bffec3c1 really using dev branch of goodnightout_opencase
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is passing
2022-03-31 13:48:44 +01:00
45358946b6 changed drone.yml to trigger from dev branch
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is failing
2022-03-31 13:42:27 +01:00
22383e4673 using dev branch of goodnight_opencase 2022-03-31 13:37:44 +01:00
507730709e Merge branch 'master' of ssh://git.autonomic.zone:2222/autonomic-cooperative/goodnightout_composer into dev 2022-03-31 13:36:11 +01:00
4cfb22d710 updated drupal 2022-03-31 13:33:36 +01:00
3 changed files with 6687 additions and 4695 deletions

View File

@ -15,7 +15,6 @@ steps:
- git pull - git pull
- composer install - composer install
- /var/www/gno/vendor/bin/drush updb - /var/www/gno/vendor/bin/drush updb
- /var/www/gno/vendor/bin/drush config:import --source=../config
- /var/www/gno/vendor/bin/drush config:import --source=modules/contrib/goodnightout_opencase/config/optional -y - /var/www/gno/vendor/bin/drush config:import --source=modules/contrib/goodnightout_opencase/config/optional -y
- name: notify on failure - name: notify on failure
image: plugins/slack image: plugins/slack
@ -33,4 +32,4 @@ steps:
trigger: trigger:
branch: branch:
- dev - master

View File

@ -19,23 +19,24 @@
},{ },{
"type": "vcs", "type": "vcs",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git" "url": "ssh://git@gitlab.com/opencase1/opencase.git"
},{ },{
"type": "vcs", "type": "vcs",
"url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/bartik_gno.git" "url": "ssh://git@gitlab.com/opencase1/bartik_gno.git"
} }
], ],
"require": { "require": {
"autonomic/bartik_gno": "dev-main",
"autonomic/goodnightout_opencase": "dev-master", "autonomic/goodnightout_opencase": "dev-master",
"autonomic/opencase": "dev-master", "autonomic/opencase": "dev-master",
"autonomic/bartik_gno": "dev-main",
"composer/installers": "^1.2", "composer/installers": "^1.2",
"drupal/admin_toolbar": "^3.1", "drupal/admin_toolbar": "^3.1",
"drupal/base_field_override_ui": "^1.0", "drupal/base_field_override_ui": "^1.0",
"drupal/better_exposed_filters": "^5.0", "drupal/better_exposed_filters": "^5.0",
"drupal/content_as_config": "^1.0", "drupal/content_as_config": "^1.0",
"drupal/core-composer-scaffold": "^9", "drupal/core-composer-scaffold": "^9",
"drupal/core-dev": "^9.3",
"drupal/core-project-message": "^9", "drupal/core-project-message": "^9",
"drupal/core-recommended": "^9", "drupal/core-recommended": "^9",
"drupal/csv_serialization": "^2.0", "drupal/csv_serialization": "^2.0",
@ -51,6 +52,7 @@
"drupal/hide_revision_field": "^2.2", "drupal/hide_revision_field": "^2.2",
"drupal/mailsystem": "^4.3", "drupal/mailsystem": "^4.3",
"drupal/password_strength": "^2.0@beta", "drupal/password_strength": "^2.0@beta",
"drupal/redirect_after_login": "^2.7",
"drupal/restui": "^1.20", "drupal/restui": "^1.20",
"drupal/route_condition": "^2.0", "drupal/route_condition": "^2.0",
"drupal/search_api": "^1.21", "drupal/search_api": "^1.21",
@ -60,12 +62,14 @@
"drupal/views_aggregator": "^2.0", "drupal/views_aggregator": "^2.0",
"drupal/views_autosubmit": "^1.4", "drupal/views_autosubmit": "^1.4",
"drupal/views_data_export": "^1.1", "drupal/views_data_export": "^1.1",
"drupal/views_natural_sort": "^2.0@alpha",
"drupal/views_summarize": "1.1.x-dev", "drupal/views_summarize": "1.1.x-dev",
"drush/drush": "*" "drush/drush": "*"
}, },
"require-dev": { "require-dev": {
"drupal/console": "^1.9", "drupal/console": "^1.9",
"drupal/devel": "^4.1", "drupal/devel": "^4.1",
"phpspec/prophecy-phpunit": "^2",
"phpunit/phpunit": "^9.5" "phpunit/phpunit": "^9.5"
}, },
"conflict": { "conflict": {

11369
composer.lock generated

File diff suppressed because it is too large Load Diff