13 Jul, 2015
4 commits
10 Jul, 2015
2 commits
08 Jul, 2015
3 commits
-
Conflicts: Gemfile
07 Jul, 2015
2 commits
-
Conflicts: test/fixtures/article_followers.yml
06 Jul, 2015
2 commits
-
Conflicts: app/models/article.rb test/functional/tasks_controller_test.rb
04 Jul, 2015
2 commits
03 Jul, 2015
3 commits
-
ready for Serpro's captcha
-
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
01 Jul, 2015
1 commit
29 Jun, 2015
1 commit
-
Move users api mountpoint to people and also deal with permissions issues.
25 Jun, 2015
3 commits
23 Jun, 2015
1 commit
-
Georef e cosmética See merge request !608
20 Jun, 2015
1 commit
-
scopes are defined as class methods on the singleton of the class they were named instead of the class that calls them, so regardless if they are called by Enterprise or Community, they were defined on Organization, so #visible_for_person() always gives us `WHERE "profiles"."type" IN ('Organization', 'Enterprise', 'Community')` This wouldn't be a problem if rails 3.2 didn't merge the WHERE clauses of nested scopes, which causes the previous filtering by type of Enterprise/Community to be thrown away in favor of the broader one. This was fixed in later rails versions but we want to be able to search only for Enterprises or Communities, so I translated the scope to a class method on the parent class Organization, so it can be inherited by the other.
19 Jun, 2015
3 commits
18 Jun, 2015
1 commit
17 Jun, 2015
7 commits
-
Conflicts: app/models/article.rb
-
Always show parent and children when getting a specific category with id
-
Signed-off-by: André Bernardes <andrebsguedes@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
-
Conflicts: Gemfile public/proposal-app public/stylesheets/application.css
16 Jun, 2015
4 commits
-
Conflicts: lib/noosfero/plugin.rb
-
This also removes short_filename as it is now unused
