21 Jul, 2014
4 commits
18 Jul, 2014
2 commits
17 Jul, 2014
10 commits
-
Conflicts: app/models/environment.rb
-
Conflicts: app/models/environment.rb app/views/features/index.rhtml
-
Conflicts: app/models/environment.rb
-
Conflicts: app/models/environment.rb
-
Conflicts: app/models/environment.rb app/views/features/index.rhtml
16 Jul, 2014
1 commit
14 Jul, 2014
2 commits
10 Jul, 2014
4 commits
-
Conflicts: public/stylesheets/application.css
09 Jul, 2014
2 commits
08 Jul, 2014
3 commits
07 Jul, 2014
9 commits
-
This no longer works on new jquery ui and needs some ugly solutions to replace.
-
Conflicts: app/views/content_viewer/_article_toolbar.rhtml
-
Conflicts: app/views/content_viewer/_article_toolbar.rhtml
04 Jul, 2014
3 commits