Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e06388b
Merge branch 'master' into develop
andriyun Apr 26, 2021
75c9335
Added better memory settings for SOLR
andriyun Apr 26, 2021
4954255
Merge branch 'master' into develop
andriyun Apr 26, 2021
31bdd15
Apply patch Allow edit Media items from Media Library modal dialog in
juuliabellcom Apr 27, 2021
7265e2e
Updating os2web_meetings reference
stankut Apr 28, 2021
7a6042f
Updating os2web_meeting, os2web_meetings_agman references
stankut May 3, 2021
c578e16
BKDK-401
hjemmesidekongen May 3, 2021
0334ff5
Updated os2web_logging
stankut May 3, 2021
c840fcd
BKDK-423 removing meeting status from meeting page
stankut May 3, 2021
6573ca0
Updating os2web_meetings_agman reference
stankut May 4, 2021
75e50e4
BKDK-402
hjemmesidekongen May 5, 2021
f7096df
BKDK-401 migrated nodes header duplicate
stankut May 5, 2021
d9ae826
Section links are equal heights
hjemmesidekongen May 5, 2021
c50db93
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen May 5, 2021
1a9cc83
BKDK-432 disabling related links on migrated content
stankut May 5, 2021
242cdd0
BKDK-405 Removing news default date value
stankut May 5, 2021
c49c5b1
BKDK-414
hjemmesidekongen May 6, 2021
db6ea5e
BKDK-336 - ckeditor iframe
hjemmesidekongen May 6, 2021
59c9f52
BKDK-414
hjemmesidekongen May 6, 2021
6b6cdc2
BKDK-423, BKDK-435 meeting page display
stankut May 6, 2021
00156ae
BKDK-435
hjemmesidekongen May 6, 2021
17323eb
BKDK-302
hjemmesidekongen May 6, 2021
498f6af
BKDK-408 setting according title empty when migrating
stankut May 11, 2021
22940f3
BKDK-434
hjemmesidekongen May 11, 2021
564b7b0
Update ref. to base theme
hjemmesidekongen May 11, 2021
ff7d1a6
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen May 11, 2021
3a12801
BKDK-302
hjemmesidekongen May 11, 2021
d9ed30f
BKDK-413
hjemmesidekongen May 11, 2021
5b1c792
BKDK-443
hjemmesidekongen May 11, 2021
f87f3ef
BKDK-443
hjemmesidekongen May 11, 2021
43733e0
BKDK-426 adding related links block reference options
stankut May 11, 2021
6519e1e
BKDK-426 adding related links block reference options
stankut May 11, 2021
6a1cfbe
BKDK-408 empty accordion titles
stankut May 11, 2021
7a30ca9
BKDK-391 updating content on migration
stankut May 12, 2021
2a096eb
BKDK-418
hjemmesidekongen May 12, 2021
7645090
Merge branch 'develop' of github.com:OS2web/os2web8 into develop
hjemmesidekongen May 12, 2021
2a66c89
BKDK-418
hjemmesidekongen May 12, 2021
320a3ba
BKDK-411, BKDK-412 meeting download file
stankut May 12, 2021
9c07d8d
Merge branch 'staging' into develop
andriyun May 12, 2021
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
2 changes: 1 addition & 1 deletion .docker/solr/solr.in.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

# Expert: If you want finer control over memory options, specify them directly
# Comment out SOLR_HEAP if you are using this though, that takes precedence
SOLR_JAVA_MEM="-Xms1g -Xmx1g"
SOLR_JAVA_MEM="-Xms512m -Xmx2g"

# Enable verbose GC logging...
# * If this is unset, various default options will be selected depending on which JVM version is in use
Expand Down
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"cweagans/composer-patches": "^1.6.5",
"drupal/access_latest": "^0.0.1",
"drupal/anonymous_subscriptions": "1.x-dev@dev",
"drupal/ckeditor_iframe": "^2.1",
"drupal/coder": "^8.3",
"drupal/console": "^1.0.2",
"drupal/core": "^8.8.0",
Expand Down Expand Up @@ -147,7 +148,8 @@
"Incorrect user lookup on Bulk deleting": "https://git.drupalcode.org/project/user_delete_reassign/-/commit/05076bbedb66f8471d023894a88b980c2ecdf8d5.patch"
},
"drupal/core": {
"Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch"
"Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch",
"Allow edit Media items from Media Library modal dialog in CKEditor" : "https://www.drupal.org/files/issues/2021-04-21/3168868-13_0.patch"
}
}
}
Expand Down
Loading