10 May, 2016
2 commits
-
Whenever calling page_trail it was pushin a new array inside the existing one while the desired behaviour is to merge them.
-
moved all `params` references to `trial` method, also `trial` method moved to a plugin helper
18 Apr, 2016
2 commits
-
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
-
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Victor Costa <vfcosta@gmail.com>
19 Nov, 2015
1 commit
-
Include some profile controller paths to show breadcrumbs block Currently, pages from profile and event actions don't display breadcrumbs. This merge creates path links on profile and event actions page with profile index as ancestor, so breadcrumbs block will work on these pages. See merge request !728
12 Nov, 2015
1 commit
13 Oct, 2015
1 commit
-
Signed-off-by: Victor Costa <vfcosta@gmail.com> Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br> Conflicts: app/controllers/my_profile/profile_design_controller.rb app/helpers/boxes_helper.rb app/helpers/layout_helper.rb app/views/layouts/_javascript.html.erb public/stylesheets/application.css test/functional/environment_design_controller_test.rb test/functional/profile_design_controller_test.rb
19 Mar, 2015
1 commit
-
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> See merge request !489
15 Jan, 2015
1 commit
-
I have deduplicated every message in plugin code that was already in the core. Going forward, plugins should use c_() is they want to reuse the message from the core. If they want to force their own translation, they should probably use _('plugin_name|The message') to avoid overriding translations from the core.
24 Feb, 2014
1 commit
18 Dec, 2013
2 commits
-
Conflicts: test/unit/profile_test.rb
16 Dec, 2013
2 commits
10 Dec, 2013
1 commit
02 Dec, 2013
2 commits
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
2 commits
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
26 Nov, 2013
2 commits
22 Nov, 2013
1 commit
-
(ActionItem2887)
14 Nov, 2013
1 commit
-
This reverts commit 4b392f22fb7d07a8d90095f028bfe184a2f58966. This is not necessary since a to_json is already happening on top level.
11 Nov, 2013
1 commit
08 Nov, 2013
3 commits
-
This check, crashes the migration which will include the attribute o Task. Until someone discover how to avoid that, the fail-safe is commented.
05 Nov, 2013
1 commit
-
Conflicts: script/quick-start test/unit/application_helper_test.rb test/unit/environment_statistics_block_test.rb test/unit/environment_test.rb
04 Nov, 2013
1 commit
31 Oct, 2013
1 commit
30 Oct, 2013
1 commit
24 Oct, 2013
3 commits
-
* Avoiding module inclusion on models that doesn't have a spam attribute. * Avoiding named_scope filters on models that doesn't have named_scope.
21 Oct, 2013
1 commit
-
Also provides hotspot for plugins to add new fields for password recovery (ActionItem2827)
18 Oct, 2013
1 commit
-
* Creates a smart api to define categories of fields. * Inclusion of sensitive and heavy fields categorization * Possibility for creation of custom fields (ActionItem2832)
09 Oct, 2013
1 commit
-
Also moving profile extension to make count use distinct by default to ActiveRecord::Calculations module.
07 Oct, 2013
1 commit
-
Conflicts: app/views/cms/view.rhtml test/functional/profile_controller_test.rb