Commits

Breadcrumbs

History for

onmaster

User selector

All users

Datepicker

All time

Commit History

Commits on Nov 2, 2016

• fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture

  briri

  committed
  5fcd970

  Copy full SHA for 5fcd970

Commits on Oct 26, 2016

• ran db migrations

  briri

  committed
  434a945

  Copy full SHA for 434a945

• resolving merge conflicts

  briri

  committed
  88937d7

  Copy full SHA for 88937d7

• Added both DB gems for dev/merging compatibility

  

  Jimmy Angelakos

  committed
  1e7b36c

  Copy full SHA for 1e7b36c

Commits on Oct 18, 2016

• Merge branch 'master' of https://github.com/DMPRoadmap/roadmap into postgresql

  

  Jimmy Angelakos

  committed
  991f1a7

  Copy full SHA for 991f1a7

Commits on Oct 13, 2016

• Added wkhtmltopdf binaries to gemfile. Moved wicked_pdf config to an initializer so that it can be custom to the server instance. Updated dead link to DMP Checklist pdf

  briri

  committed
  b4d80a4

  Copy full SHA for b4d80a4

Commits on Oct 4, 2016

• removed all instances of comparing booleans to 1 or 0 for postgres compatability

  xsrust

  committed
  bd292f1

  Copy full SHA for bd292f1

Commits on Sep 28, 2016

• ran bundle update to rebuild Gemfile.lock

  briri

  committed
  406cfe1

  Copy full SHA for 406cfe1

• Fixed bug in yaml files. Updated help page content so that it lists an MIT license

  briri

  committed
  9e821f8

  Copy full SHA for 9e821f8

Commits on Sep 16, 2016

• forced auth on organisations_controller. TODO: re-check parent, children, and templates after AJAX removed

  xsrust

  committed
  2a5dd5a

  Copy full SHA for 2a5dd5a

Commits on Sep 1, 2016

• Updated Gemfile.lock

  briri

  committed
  96e44ca

  Copy full SHA for 96e44ca

• Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes

  briri

  committed
  a7e48fc

  Copy full SHA for a7e48fc

• merged DCC changes into master

  briri

  committed
  170cd43

  Copy full SHA for 170cd43

• removed cancancan and rollify

  xsrust

  committed
  c51c970

  Copy full SHA for c51c970

Commits on Aug 18, 2016

• bugfixes to auth

  xsrust

  committed
  55c8115

  Copy full SHA for 55c8115

Commits on Aug 17, 2016

• Merging current stable development branch into master (DigitalCurationCentre#23)

  Show description for 6dec11c
  briri

  authored
  6dec11c

  Copy full SHA for 6dec11c

Commits on Aug 16, 2016

• fixed merge conflicts in Gemfile and Schema.rb

  briri

  committed
  91b840f

  Copy full SHA for 91b840f

• Reorganized gemfile and commented out unused gems

  briri

  committed
  611f9cb

  Copy full SHA for 611f9cb

Commits on Aug 12, 2016

• fixed merge conflict with schema.rb

  briri

  committed
  83fb27e

  Copy full SHA for 83fb27e

• Updated Gemfile to use Rails 4.2.7, fixed some minor issues with locale initializer (DigitalCurationCentre#21)

  Show description for 5c687e2
  briri

  authored
  5c687e2

  Copy full SHA for 5c687e2

• Updated gemfile to specify >= ruby 2.2.2. Updated Rails to the latest version due to an XSS vulnerability. updated locale initializer to handle migration issue where it was checking default_locatio…

  Show description for 63c131e
  briri

  committed
  63c131e

  Copy full SHA for 63c131e

Commits on Aug 11, 2016

• allow org admin to upload logo through admin UI

  weiweishi

  committed
  d191694

  Copy full SHA for d191694

• Development (DigitalCurationCentre#17)

  Show description for 30433e7
  briri

  authored
  30433e7

  Copy full SHA for 30433e7

• reran bundle install to build Gemfile.lock

  briri

  committed
  0c33e3c

  Copy full SHA for 0c33e3c

Commits on Aug 10, 2016

• Added passenger to gemfile

  briri

  committed
  e8f3c22

  Copy full SHA for e8f3c22

Commits on Aug 9, 2016

• Revert "trying to remove web_console"

  Show description for 7c28fec
  briri

  committed
  7c28fec

  Copy full SHA for 7c28fec

• trying to remove web_console

  briri

  committed
  7a1b714

  Copy full SHA for 7a1b714

• Branding changes (DigitalCurationCentre#14)

  Show description for 890c5ca
  briri

  authored
  890c5ca

  Copy full SHA for 890c5ca

• added initializers that were previsouly ignored by gitignore

  briri

  committed
  8d080a4

  Copy full SHA for 8d080a4

Loading