21 May, 2013
1 commit
10 May, 2013
1 commit
09 May, 2013
3 commits
-
…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
17 Apr, 2013
1 commit
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
15 Apr, 2013
2 commits
-
ActionItem2638
10 Apr, 2013
1 commit
05 Apr, 2013
1 commit
03 Apr, 2013
1 commit
28 Mar, 2013
2 commits
27 Mar, 2013
1 commit
-
* erase code is fun; * better name for "Area 1". Users can understand it now; * inline style for layout sux! Stop doing this! * add block dialog looks nice, with simpler code.
26 Mar, 2013
2 commits
22 Mar, 2013
1 commit
20 Mar, 2013
1 commit
-
This commit, with the participation of Lucas Melo, does: * Make action list from ShoppingCartPluginController Fault-tolerant. * Create a basic logging system and replace debug alerts. * Limit the cart size to protect against cookie limit. * Add more loading style possibilities. * Add a little fault-tolerance to the process of loading the carts items. * Force colorbox to "Shopping checkout" button. * Add L10n to Cart JS interaction.
19 Mar, 2013
1 commit
18 Mar, 2013
2 commits
15 Mar, 2013
2 commits
-
* Correct multiple id generation on catalog/index.rhtml * Better main floating box element selection with a class * Remove txt2html from description. (WTF!?) * catalog.js rewrite. Simpler and working nice. * Move width/position style from JS do CSS. closes ActionItem2621
-
…into merge-requests/253
11 Mar, 2013
3 commits
-
Beauty, useful, readable and code cleanner. ActionItem2613
-
Make colorBox to feet better the block config dialog, removing the unneeded horizontal scroll. Add a better style, and display the cancel button.
01 Mar, 2013
1 commit
27 Feb, 2013
1 commit
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
01 Feb, 2013
1 commit
-
Change a little the image display to repeat the gallery display in the network stream and for a better space usage.
26 Jan, 2013
1 commit
23 Jan, 2013
1 commit
-
ActionItem2556
03 Jan, 2013
1 commit
20 Dec, 2012
3 commits
19 Dec, 2012
1 commit
-
…into merge-requests/246 Conflicts: public/stylesheets/search.css
12 Dec, 2012
1 commit
03 Dec, 2012
2 commits
-
Conflicts: lib/noosfero/plugin/settings.rb test/unit/plugin_settings_test.rb
-
…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb