| 2016-07-22 |
Merged conflicts
Brian Riley
committed
on 22 Jul 2016
|
|---|---|
| 2016-07-19 |
language table, dropdown, additional locales
DamodarSojka
committed
on 19 Jul 2016
|
| 2016-06-28 |
Fixed typo in token_permissions in db/seeds.rb. Started cleanup of tests
briley
committed
on 28 Jun 2016
|
| 2016-06-27 |
Rebased development branch and corrected merge conflicts
briley
committed
on 27 Jun 2016
|
|
|
|
| 2016-06-23 |
|
| 2016-06-09 |
Added better data to seeds file. Tested upgrade to bootstrap 3.2 but reverted back
briley
committed
on 9 Jun 2016
|
| 2016-06-07 |
Updated seeds.rb to first check to see if record exists before inserting. Added a 4.0 hack to load the new config/secrets.yml file instead of config/initializers/secret_token.rb, this new secrets.yml will auto-load when we are on 4.1
briley
committed
on 7 Jun 2016
|
| 2016-06-03 |
DMPonline4 - RAILS 4.0 (#4)
...
Marta Ribeiro
authored
on 3 Jun 2016
Brian Riley
committed
on 3 Jun 2016
|