Skip to content

Commit

Permalink
Merge branch 'rob/release-sprint-2022-11-14-to-2022-11-21-plus-core-u…
Browse files Browse the repository at this point in the history
…pdate-7.92' into rob/release-sprint-2022-11-14-to-2022-11-21-2
  • Loading branch information
Rob Davis committed Jan 9, 2023
2 parents a1b2045 + efaca5b commit ac962ce
Show file tree
Hide file tree
Showing 1,560 changed files with 104,616 additions and 1,586 deletions.
22 changes: 21 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,30 @@ scratchpads_twitter.ini
nohup.out
docker-compose.dev.yml

# machine generated css and js
# machine generated css and jssites/all/libraries/vendor
sites/default/files/advagg_css/
sites/default/files/advagg_js/
sites/default/files/css/

# files and assets
sites/default/files

# this library had to have code modified to be compatible with php 7.2
# and therefore attempting to manage its git repp
# within the main scratchpads repo raised the question about where
# to store that modification. give that the modification is
# related to scratchpads' production server environment,
# the answer to that question is to store the change in
# scratchpads' repo. Moreover the original developer may not
# necessarily want to access a push up to their repo of this
# backwards compatible change to obsolete php version.
# Therefore with that decision to store in Scratchpads, that means
# disabling the project's own git (i.e. as a submodule), so the files
# will be removed and not tracked
sites/all/libraries/vendor/**/.git
# ^^^ not sure if this works
#
# discussion here:
# https://stackoverflow.com/questions/22685170/ignore-git-folder-in-sub-folder


4 changes: 2 additions & 2 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ DirectoryIndex index.php index.html index.htm
# Enable expirations.
ExpiresActive On
# Cache all files for one month after access (A).
ExpiresDefault A2628000
# Cache all files for 2 weeks after access (A).
ExpiresDefault A1209600
<FilesMatch \.php$>
# Do not allow PHP scripts to be cached unless they explicitly send cache
Expand Down
1 change: 1 addition & 0 deletions composer
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"require": {
"knplabs/github-api": "^1.7",
"michelf/php-markdown": "^1.8",
"php-http/guzzle6-adapter": "^1.1"
"php-http/guzzle6-adapter": "^1.1",
"jbroutier/iucn-api-client": "^1.0"
},
"license": "GPL-2.0"
}
Loading

0 comments on commit ac962ce

Please sign in to comment.