16 Dec, 2013
1 commit
-
…into merge-requests/387 Conflicts: app/helpers/application_helper.rb public/designs/themes/base/style.css
14 Oct, 2013
1 commit
-
ActionItem2691
07 Oct, 2013
1 commit
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
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
1 commit
-
…into merge-requests/295
29 Jul, 2013
1 commit
-
(ActionItem2742)
17 Jul, 2013
3 commits
-
g wrong happens with comment creation Conflicts: public/javascripts/comment_form.js
16 Jul, 2013
3 commits
-
…into merge-requests/325
-
Fixing the js method and also correcting the controller orders to calculate the total count.
08 Jul, 2013
3 commits
01 Jul, 2013
1 commit
28 Jun, 2013
3 commits
27 Jun, 2013
1 commit
31 May, 2013
1 commit
-
ActionItem2682
29 May, 2013
1 commit
-
closes ActionItem2519
15 May, 2013
1 commit
10 May, 2013
1 commit
-
- Syntax error on chat - Reviewed INSTALL.chat - Added function to update the list of users online on main window (ActionItem2667)
09 May, 2013
1 commit
-
…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
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
1 commit
11 Apr, 2013
1 commit
10 Apr, 2013
1 commit
26 Mar, 2013
1 commit
22 Mar, 2013
1 commit
-
ActionItem1030
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.
15 Mar, 2013
1 commit
-
* 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
12 Mar, 2013
1 commit
11 Mar, 2013
1 commit
-
Make colorBox to feet better the block config dialog, removing the unneeded horizontal scroll. Add a better style, and display the cancel button.
22 Feb, 2013
1 commit
20 Feb, 2013
1 commit
12 Dec, 2012
1 commit
23 Oct, 2012
1 commit
-
…into merge-requests/231
21 Oct, 2012
1 commit
-
"Add a block" button "Edit" buttons on blocks Also replaced radio_button_tag and label_tag by labelled_radio_button