Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Md dev #1240

Merged
merged 50 commits into from
Sep 20, 2024
Merged

Md dev #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a84abab
badges: vocab added
protitude Jul 22, 2024
e66211d
config: adding user badges to profile
protitude Jul 22, 2024
850d028
access: 3.0.x-dev 85079dc => dev-d8-2178 49f3fd0
protitude Jul 22, 2024
2b56560
inline_entity_form: 2.0.0-rc10 => 3.0.0-rc19
protitude Jul 23, 2024
84e5c9e
access: dev-d8-2178 49f3fd0 => dev-d8-2178 770e43c
protitude Jul 23, 2024
8092b05
config: user badges widget d8-2178
protitude Jul 23, 2024
3be004e
svg_image: module added
protitude Jul 25, 2024
7ce3c40
config: taxonomy badges add images d8-2178
protitude Jul 25, 2024
e625158
access: dev-d8-2178 770e43c => dev-d8-2178 3cd6d17
protitude Jul 25, 2024
62a941d
config: cssn_directory view add badges
protitude Jul 26, 2024
30345ff
access: dev-d8-2178 3cd6d17 => dev-d8-2178 9af48ec
protitude Jul 26, 2024
8908edd
asp-them: dev-main 9f7f9ed => dev-d8-2178 492e580
protitude Jul 26, 2024
263160d
config: enable badges module - cssn_directory badge tweaks d8-2178
protitude Jul 26, 2024
621980c
access: dev-d8-2178 9af48ec => dev-d8-2178 4be64bc
protitude Jul 26, 2024
415955e
access: dev-d8-2178 4be64bc => dev-d8-2178 11f609c
protitude Aug 8, 2024
adb9608
Merge branch 'md-dev' into md-2178
a-pasquale Aug 9, 2024
c62e393
access: dev-d8-2178 11f609c => dev-d8-2178 7715bd3
protitude Aug 15, 2024
56c549a
Merge branch 'md-2178' of github.com:necyberteam/cyberteam_drupal int…
protitude Aug 15, 2024
9586ce1
config: badge user field/taxonomy d8-2178
protitude Aug 15, 2024
3633fde
access: dev-d8-2178 7715bd3 => dev-d8-2178 3bece88
protitude Aug 18, 2024
be358ec
set domain
protitude Aug 18, 2024
45db639
access: dev-d8-2178 3bece88 => dev-d8-2178 74e8c67
protitude Aug 22, 2024
471a0b8
access: dev-d8-2178 74e8c67 => dev-d8-2178 c3f6ac9
protitude Aug 22, 2024
c3a6ba7
config: ag card view switch to distinct d8-2190
protitude Aug 22, 2024
76c8257
Run cron for testing
a-pasquale Aug 29, 2024
4b205f3
Merge branch 'md-dev' into md-2178
a-pasquale Aug 29, 2024
62026ae
config: affinity_group view
protitude Sep 10, 2024
0b1b0a1
Merge branch 'md-2178' of github.com:necyberteam/cyberteam_drupal int…
protitude Sep 10, 2024
a05841e
config: hide badges on /user page d8-2178
protitude Sep 10, 2024
f83e2df
access: dev-d8-2178 651af91 => dev-d8-2178 622006f
protitude Sep 10, 2024
a38f7f7
update access module
a-pasquale Sep 12, 2024
e24f5f7
cssn_directory: d8-2178
protitude Sep 12, 2024
b7ad7bf
accesS: dev-d8-2178 622006f => dev-d8-2178 8a52b6d
protitude Sep 12, 2024
4550643
asp-theme: dev-d8-2178 492e580 => dev-d8-2178 d051e73
protitude Sep 12, 2024
83e362b
access: dev-d8-2178 8a52b6d => dev-d8-2178 5bf93a7
protitude Sep 12, 2024
a8fdd3f
asp-theme: dev-d8-2178 d051e73 => dev-d8-2178 e60bf55
protitude Sep 12, 2024
675bf4b
Merge pull request #1231 from necyberteam/md-2190
a-pasquale Sep 16, 2024
79f1c4e
access: dev-d8-2178 5bf93a7 => dev-d8-2178 3794c27
protitude Sep 19, 2024
f1a34d3
config: askci username field added to users
protitude Sep 19, 2024
6f5438b
access: dev-d8-2178 3794c27 => dev-d8-2178 c96ca17
protitude Sep 19, 2024
bdefd8f
asp-theme: dev-d8-2178 e60bf55 => dev-d8-2178 5d94673
protitude Sep 19, 2024
150710f
asp-theme: dev-d8-2178 5d94673 => dev-d8-2178 c8bc3e6
protitude Sep 19, 2024
9243c67
asp-theme: dev-d8-2178 c8bc3e6 => dev-d8-2178 cd9de5a
protitude Sep 19, 2024
24d84a2
asp-theme: dev-d8-2178 cd9de5a => dev-d8-2178 0ff4ab2
protitude Sep 19, 2024
882719c
Merge branch 'md-dev' into md-2178
a-pasquale Sep 20, 2024
05074c9
Update access module
a-pasquale Sep 20, 2024
d8d9a69
Update acces module and theme
a-pasquale Sep 20, 2024
bfe6604
Fix Affinity Group tests
a-pasquale Sep 20, 2024
1410f40
Fix Affinity Group test
a-pasquale Sep 20, 2024
c30507a
Merge pull request #1221 from necyberteam/md-2178
a-pasquale Sep 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions blt/md/md-2178
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
amp_cyberinfrastructure_org
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
"drupal/easy_breadcrumb": "^2.0",
"drupal/email_change_verification": "^1.0@beta",
"drupal/facets": "^2.0",
"drupal/feeds": "3.x-dev@dev",
"drupal/field_group": "^3.2",
"drupal/field_permissions": "^1.1",
"drupal/fieldblock": "^2.0@alpha",
Expand All @@ -107,7 +108,7 @@
"drupal/honeypot": "^2.0",
"drupal/image_captcha": "^2.0",
"drupal/imce": "^3.0",
"drupal/inline_entity_form": "^2.0@RC",
"drupal/inline_entity_form": "^3.0@RC",
"drupal/jsonapi_views": "^1.1",
"drupal/label_help": "^2.0@beta",
"drupal/layout_builder_styles": "^2.0",
Expand Down Expand Up @@ -152,6 +153,7 @@
"drupal/spamspan": "^3.1",
"drupal/stable": "^2.0",
"drupal/superfish": "^1.4",
"drupal/svg_image": "^3.0",
"drupal/symfony_mailer": "^1.3",
"drupal/taxonomy_manager": "^2.0",
"drupal/taxonomy_term_depth": "^2.4",
Expand Down
197 changes: 128 additions & 69 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading