28 Jan, 2014
1 commit
27 Jan, 2014
1 commit
-
getterm (and __) was replaced by _ (commit 86ecb14f)
20 Jan, 2014
1 commit
-
Routes with wildcards returns string (do not need to transform from array to string anymore).
15 Jan, 2014
1 commit
09 Jan, 2014
1 commit
-
Conflicts: app/controllers/my_profile/memberships_controller.rb app/helpers/application_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/category.rb app/models/change_password.rb app/models/comment.rb app/models/environment.rb app/models/event.rb app/models/profile.rb app/models/recent_documents_block.rb app/models/region.rb app/models/task.rb app/models/uploaded_file.rb app/views/account/forgot_password.html.erb app/views/events/_events_by_day.html.erb app/views/profile/_person_profile.html.erb app/views/shared/_manage_enterprises.html.erb config/environment.rb config/initializers/plugins.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/category_test.rb test/unit/change_password_test.rb test/unit/cms_helper_test.rb test/unit/comment_test.rb test/unit/content_viewer_helper_test.rb test/unit/event_test.rb test/unit/folder_helper_test.rb test/unit/person_test.rb test/unit/price_detail_test.rb test/unit/profile_helper_test.rb test/unit/recent_documents_block_test.rb test/unit/scrap_test.rb test/unit/user_mailer_test.rb vendor/plugins/action_tracker_has_comments/init.rb vendor/plugins/delayed_job/lib/delayed/worker.rb vendor/plugins/noosfero_caching/init.rb
07 Jan, 2014
1 commit
-
Conflicts: db/schema.rb test/unit/person_test.rb
06 Jan, 2014
1 commit
18 Dec, 2013
1 commit
16 Dec, 2013
2 commits
-
…into merge-requests/425
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
03 Dec, 2013
1 commit
-
AI2824
02 Dec, 2013
1 commit
-
Conflicts: app/models/category.rb app/models/uploaded_file.rb test/functional/memberships_controller_test.rb test/functional/profile_controller_test.rb vendor/plugins/action_tracker_has_comments/init.rb
28 Nov, 2013
2 commits
-
Also: - Removed unused code - Fixed identation (ActionItem2587)
-
Show events by month Event list now only show 10 events when listing events for month (events for a day still listing all events) Add information on indefined place Enhance layout (ActionItem2587) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com> Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
24 Nov, 2013
1 commit
-
(ActionItem2899)
22 Nov, 2013
3 commits
-
(ActionItem2829)
-
Since there are plugins that need to receive the scope clean (that is without filters applied to it) and since the plugin has the power to not apply the filter when conveys it (also rewriting the interface to keep its consistency), I decided to pass the reposability of applying any filter provided by the core to the engines. Nevertheless, if the plugin returns nil (that's the same that it would return if it was disabled) the core will deal with the filters through the default way (that is without any engine).
21 Nov, 2013
2 commits
20 Nov, 2013
1 commit
-
The comments and replies are fetched only after the View all and More links are clicked.
14 Nov, 2013
1 commit
-
Also, moving requestor match logic to a helper instead of inside the change_password model.
21 Oct, 2013
1 commit
-
Also provides hotspot for plugins to add new fields for password recovery (ActionItem2827)
17 Oct, 2013
1 commit
-
That commit makes gravatar helper to work on this context.
07 Oct, 2013
1 commit
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
24 Sep, 2013
1 commit
-
Rails.root is now a Pathname. The best use of it is with the #join method instead of concatenation and such. I therefore am rewriting all this calls to fix/avoid problems.
19 Sep, 2013
1 commit
-
…into merge-requests/316 Conflicts: app/helpers/blog_helper.rb
29 Jul, 2013
1 commit
-
(ActionItem2471)
19 Jul, 2013
1 commit
-
Conflicts: app/helpers/boxes_helper.rb app/models/comment.rb app/views/comment/_comment.rhtml app/views/comment/_comment_form.rhtml app/views/content_viewer/_comment.html.erb app/views/content_viewer/_comment.rhtml app/views/content_viewer/_comment_form.html.erb app/views/content_viewer/_comment_form.rhtml app/views/profile/send_mail.html.erb config/routes.rb debian/control
16 Jul, 2013
3 commits
-
Fixing the js method and also correcting the controller orders to calculate the total count.
-
…into merge-requests/343 Also replacing the load_comments method by a filter that receives a scope. Conflicts: app/controllers/public/content_viewer_controller.rb app/models/comment.rb app/views/content_viewer/view_page.rhtml test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
15 Jul, 2013
1 commit
13 Jul, 2013
2 commits
-
Also renaming dispatch_plugins to fetch_plugins and first_plugin to fetch_first_plugin
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
4 commits
-
About the FIXME on the helper, I guess it can't hurt to support css class throught the options parameter.