01 Jul, 2015
5 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb app/views/tasks/processed.html.erb test/functional/tasks_controller_test.rb
30 Jun, 2015
11 commits
-
Conflicts: app/controllers/my_profile/tasks_controller.rb
-
Conflicts: app/controllers/my_profile/tasks_controller.rb public/stylesheets/tasks.css
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
-
Conflicts: app/views/tasks/processed.html.erb public/stylesheets/tasks.css
29 Jun, 2015
8 commits
-
Conflicts: public/stylesheets/tasks.css
27 Jun, 2015
1 commit
25 Jun, 2015
6 commits
-
This also removes short_filename as it is now unused
-
(ActionItem3149)
-
Conflicts: app/views/cms/_view_items.html.erb config/locales/en.yml
-
(ActionItem3217)
23 Jun, 2015
1 commit
-
This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.
19 Jun, 2015
1 commit
18 Jun, 2015
6 commits
17 Jun, 2015
1 commit