22 Jul, 2014
33 commits
-
Conflicts: app/views/layouts/_javascript.html.erb public/javascripts/jquery.typewatch.js
-
Conflicts: app/models/profile.rb
-
Conflicts: app/views/layouts/_javascript.html.erb
-
Conflicts: public/stylesheets/application.css
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
(ActionItem3075)
-
* Move welcome page a separate action under the HomeController instead of cranking it under the signup. * May show welcome page to both signup (with or without confirmation). (ActionItem3075)
-
Also removing string.js lib since it's now unecessary.
21 Jul, 2014
2 commits
-
Ai3206 profile categories bug Fixing bug: http://noosfero.org/Development/ActionItem3206 See merge request !253
18 Jul, 2014
5 commits