30 Jun, 2015
7 commits
-
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
16 commits
-
Conflicts: public/stylesheets/tasks.css
-
Adds captcha for api Adds captcha for api See merge request !8
28 Jun, 2015
3 commits
27 Jun, 2015
4 commits
26 Jun, 2015
1 commit
25 Jun, 2015
9 commits
-
This also removes short_filename as it is now unused
-
(ActionItem3149)
-
Conflicts: app/views/cms/_view_items.html.erb config/locales/en.yml
-
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
(ActionItem3217)
-
(ActionItem3197)