15 Jan, 2014
1 commit
-
Conflicts: app/models/person.rb db/schema.rb
14 Jan, 2014
1 commit
-
(ActionItem2950)
09 Jan, 2014
1 commit
-
- Added a field on article new/edit to specify which users can access the article - Added a relationship has_and_belongs_to_many between Article and Person - Created a new table article_privacy_exceptions for has_and_belongs_to_many - Added cucumber tests - Added a new cucumber step to add a user to the exception users list (ActionItem2852) Signed-off-by: Alex de Souza <campelo.al1@gmail.com> Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com> Signed-off-by: Andre Bedran <bedran.fleck@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com>
07 Jan, 2014
2 commits
-
Conflicts: db/schema.rb test/unit/person_test.rb
-
Add plugin view paths at initialization. Calling prepend_view_path on each request is too slow. Do not include theme dir at view path. Themes must use theme_include method to render rhtml files (instead of using render directly). This avoids conflict of files with same name at different themes and reduces the amount of paths in view_paths.
06 Jan, 2014
1 commit
16 Dec, 2013
2 commits
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
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
27 Nov, 2013
1 commit
-
Conflicts: app/controllers/public/content_viewer_controller.rb features/manage_products.feature
25 Nov, 2013
1 commit
-
(ActionItem2748)
22 Nov, 2013
3 commits
20 Nov, 2013
1 commit
16 Nov, 2013
3 commits
-
(ActionItem2903)
-
(ActionItem2901)
12 Nov, 2013
1 commit
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
31 Oct, 2013
1 commit
-
This solves every problem related with Hpticot breaking pages since the parse was happening on the MainBlock too. But this does not changes the fact tha Hpricot is currently dead and we should move on to nokogiri. (ActionItem2873)
18 Oct, 2013
1 commit
17 Oct, 2013
1 commit
-
That commit makes gravatar helper to work on this context.
12 Oct, 2013
1 commit
-
This limit the listing to the 5 most popular communities to avoid making it unbearable to users that create a lot of communities.
27 Sep, 2013
1 commit
-
* The env admin link and the user pannel had the same controlpanel id. * The user icon is now recovered. * The #manage-enterprises icons was croped. Closes ActionItem2817
19 Sep, 2013
4 commits
-
* The first_impl method was already implemented as dispatch_first (which was probably incorporated after this request was done). But I utilized the idea proposed here to use the default value for the hotspot instead of nil. * I changed the hotspot to pass all the parameters passed to the method since it might be useful for the plugins in the future. (ActionItem2666) -
…into merge-requests/313
-
…into merge-requests/295
17 Jul, 2013
1 commit
16 Jul, 2013
1 commit
15 Jul, 2013
1 commit
13 Jul, 2013
1 commit
-
…into merge-requests/283 Conflicts: test/unit/comment_test.rb
12 Jul, 2013
1 commit
-
About the FIXME on the helper, I guess it can't hurt to support css class throught the options parameter.
08 Jul, 2013
2 commits
28 Jun, 2013
1 commit
27 Jun, 2013
1 commit
25 Jun, 2013
1 commit
-
(ActionItem2699)
21 May, 2013
1 commit