23 Aug, 2012
1 commit
21 Aug, 2012
1 commit
-
…into merge-requests/181 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/models/person.rb app/views/enterprise_registration/basic_information.rhtml lib/noosfero/plugin.rb public/stylesheets/application.css test/unit/person_test.rb test/unit/profile_test.rb
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
18 Aug, 2012
1 commit
-
Also: - Added migration to remove action_trackers with target nil - Updated db/schema (ActionItem2400)
17 Aug, 2012
11 commits
-
Also replaced "if !" by "unless"
-
…into merge-requests/211
-
…into merge-requests/210
-
…into merge-requests/209
-
(ActionItem2366)
-
…into merge-requests/185
-
…into merge-requests/201
-
…into merge-requests/208
-
…into merge-requests/205
15 Aug, 2012
10 commits
-
Also cleanup and refactor code
-
I did a little refactor in the already existent script to limited_text_area so the part that grows the textarea can be reused elsewhere, e.g. the comment box in the wall. Since I was modifying the limited_text_area function again, I re-did here the fix to the bug in Chrome browsers where the textarea would grow with every key press. So this merge request also fix the ActionItem2288. (ActionItem2405)
-
It was opening with lightbox but the cancel button was a colorbox button (ActionItem2415)
-
Enterprise status should be "active" and "not active", not "enabled" and "disabled"
-
Also move view to template
13 Aug, 2012
1 commit
10 Aug, 2012
1 commit
-
ActionItem2318
09 Aug, 2012
2 commits
-
…into merge-requests/193
-
* Licenses only can be removed with method 'post' * Fixing truncate calls to stop displaying deprecation warnings * Added buttons to add a new license and to go back to admin panel * Added new db/schema (ActionItem2379)
08 Aug, 2012
5 commits
-
…into merge-requests/187 Conflicts: app/models/environment.rb public/stylesheets/application.css test/factories.rb test/fixtures/roles.yml test/unit/article_test.rb
-
(ActionItem2378)
-
(ActionItem2378)
-
The templates are not visible, so new user won't be able to see them Also styling the checkbox "is_template" on profile edition (ActionItem2378)
07 Aug, 2012
6 commits
-
(ActionItem2378)
-
(ActionItem2378)
-
(ActionItem2378)
-
(ActionItem2378)
-
(ActionItem2378)