Commit to master (!9) · Merge requests · Everett, Brad / ANR_Home

Merged Bixby, Benjamin requested to merge commitToMaster into master 8 years ago

Jan 24, 2017
- events fix and conflicts on other widgets · 2739ee11
  Benjamin Bixby authored 8 years ago
  
  2739ee11
- new page files · 826a3506
  Benjamin Bixby authored 8 years ago
  
  826a3506
- fix event listing · 62b1611f
  Benjamin Bixby authored 8 years ago
  
  62b1611f
- resolve merge conflicts · b114a95e
  Benjamin Bixby authored 8 years ago
  
  b114a95e
- merge master into widgets, resolve conflict · fcb1c8b6
  Benjamin Bixby authored 8 years ago
  
  fcb1c8b6
- updates to widget styles and detail styles · b4ef43c5
  Benjamin Bixby authored 8 years ago
  
  b4ef43c5
- Merge branch 'Widgets' of gitlab.msu.edu:everettb/ANR_Home into Widgets · 1e354826
  Brad authored 8 years ago
  
  # Conflicts: # shared/vtl/widgets/common template/place-listing.vtl
  1e354826
- show address and email if available · 218a7169
  Brad authored 8 years ago
  
  218a7169
- add map functionality to widget · 60a2589f
  Brad authored 8 years ago
  
  60a2589f
Jan 23, 2017
- add new style to events widget · e1cb681d
  Benjamin Bixby authored 8 years ago
  
  e1cb681d
- resolved merge conflict w master · 34e85480
  Benjamin Bixby authored 8 years ago
  
  34e85480
- add body class for listing styles · f90be504
  Benjamin Bixby authored 8 years ago
  
  kayci template nit picks wrike ticket
  f90be504
- add temporary check for live site implementation · cde71dfb
  Benjamin Bixby authored 8 years ago
  
  cde71dfb
- update places layout widget · 5107f0ea
  Benjamin Bixby authored 8 years ago
  
  5107f0ea
Jan 19, 2017
- places listing variable fix · 3467e63c
  Benjamin Bixby authored 8 years ago
  
  3467e63c
- fix places listing · 02df1c92
  Benjamin Bixby authored 8 years ago
  
  02df1c92
- update place listing style · 35b8fa04
  Benjamin Bixby authored 8 years ago
  
  35b8fa04
- Merge branch 'master' into perFolderSites · de1a17c8
  Benjamin Bixby authored 8 years ago
  
  de1a17c8
- remove unused templates · 8c9d9db8
  Benjamin Bixby authored 8 years ago
  
  8c9d9db8
- place listing widget initial commit · e7e032f3
  Brad authored 8 years ago
  
  e7e032f3
- fix header for child site with no banner image · e8510d59
  Benjamin Bixby authored 8 years ago
  
  e8510d59
- per folder sites update variables and conditionals · 4569390a
  Benjamin Bixby authored 8 years ago
  
  4569390a
Jan 18, 2017
- series widget initial commit · 9f50e289
  Brad authored 8 years ago
  
  9f50e289
Dec 15, 2016
- fix typo in variable · 268c630c
  Brad authored 8 years ago
  
  268c630c
- Add "Series" to the content pull · 4bc9b331
  Brad authored 8 years ago
  
  4bc9b331
Dec 13, 2016

remove system host from content pull · cd3e5e2b
Brad authored 8 years ago

cd3e5e2b

in some of the filters Article was listed twice (ex ... · 616b4743

Brad authored 8 years ago

in some of the filters Article was listed twice (ex  $!{featuredPersonArticleArticleRel}$!{featuredPersonArticleArticleID} instead of  $!{featuredPersonArticleRel}$!{featuredPersonArticleID} )

616b4743

Dec 08, 2016
- Merge branch 'master' of gitlab.msu.edu:everettb/ANR_Home into Widgets · 289347d3
  Brad authored 8 years ago
  
  289347d3
- Merge branch 'commonv2' of gitlab.msu.edu:everettb/ANR_Home into Widgets · bcc80cf9
  Brad authored 8 years ago
  
  bcc80cf9
Nov 15, 2016
- initial commit · b6d802c7
  Brad authored 8 years ago
  
  b6d802c7
Oct 11, 2016
- domain var already set in header include. on the doctype_html5.vtl · 19035cf1
  Brad authored 8 years ago
  
  19035cf1

Commit to master

Merge request reports

Activity