Fork: 0
opidor / dmpopidor
2016-08-10
913a31b
Browse files »
@briley
tweaks to cap deploy.rb
briley committed on 10 Aug 2016
e8f3c22
Browse files »
@briley
Added passenger to gemfile
briley committed on 10 Aug 2016
0ca0a3b
Browse files »
@briley
Added passenger to gemfile
briley committed on 10 Aug 2016
211fa10
Browse files »
@briley
added phusion passenger start/stop to deploy.rb
briley committed on 10 Aug 2016
1affe91
Browse files »
@briley
tweaked deploy script
briley committed on 10 Aug 2016
bc18dde
Browse files »
@briley
Updated config.ru to newer rails style
briley committed on 10 Aug 2016
6859e8a
Browse files »
@xsrust
Merge branch 'master' of https://github.com/DigitalCurationCentre/roadmap
xsrust committed on 10 Aug 2016
ed935d3
Browse files »
@DamodarSojka
fix locales picking
DamodarSojka committed on 10 Aug 2016
f2f5b38
Browse files »
@xsrust
added gemfile, environments, and an initaliser to allow merge
xsrust committed on 10 Aug 2016
d01906f
Browse files »
@DamodarSojka
remove git merge conflicts artifacts
DamodarSojka committed on 10 Aug 2016
d329b96
Browse files »
@DamodarSojka
merge
DamodarSojka committed on 10 Aug 2016
72373c9
Browse files »
@DamodarSojka
merging
DamodarSojka committed on 10 Aug 2016
473a766
Browse files »
@DamodarSojka
conflicts
DamodarSojka committed on 10 Aug 2016
2452d02
Browse files »
@DamodarSojka
fix
DamodarSojka committed on 10 Aug 2016
d4d9113
Browse files »
@xsrust
fixed parentheses bug in api/projects_controller
xsrust committed on 10 Aug 2016
9ba7540
Browse files »
@DamodarSojka
remove typo
DamodarSojka committed on 10 Aug 2016
f50bfe2
Browse files »
@DamodarSojka
test
DamodarSojka authored on 10 Aug 2016 Damodar committed on 10 Aug 2016
6f50b20
Browse files »
@Damodar
dropdown and org language setting
Damodar committed on 10 Aug 2016
40f9048
Browse files »
@DamodarSojka
aliased
DamodarSojka authored on 5 Aug 2016 Damodar committed on 10 Aug 2016
adc897e
Browse files »
@DamodarSojka
migrations and routes tests
DamodarSojka authored on 4 Aug 2016 Damodar committed on 10 Aug 2016
b0ff010
Browse files »
@DamodarSojka
commit
DamodarSojka authored on 28 Jul 2016 Damodar committed on 10 Aug 2016
5081913
Browse files »
@DamodarSojka
test
DamodarSojka committed on 10 Aug 2016
9caa713
Browse files »
@Damodar
dropdown and org language setting
Damodar committed on 10 Aug 2016
49123ac
Browse files »
@xsrust
fixed bug in dmptemplate with magicstrings
xsrust committed on 10 Aug 2016
2016-08-09
ba09fb7
Browse files »
@briley
removed Gemfile.lock from .gitignore
briley committed on 9 Aug 2016
4fb736d
Browse files »
@briley
Revert "removed web_console from gemfile because its causing deployment issues" ...
briley committed on 9 Aug 2016
7c28fec
Browse files »
@briley
Revert "trying to remove web_console" ...
briley committed on 9 Aug 2016
7a1b714
Browse files »
@briley
trying to remove web_console
briley committed on 9 Aug 2016
f8f8316
Browse files »
@briley
removed web_console from gemfile because its causing deployment issues
briley committed on 9 Aug 2016
b434507
Browse files »
@briley
Merge branch 'dmptool' into production
briley committed on 9 Aug 2016