09 Dec, 2011
1 commit
-
Conflicts: debian/changelog test/unit/dates_helper_test.rb
06 Dec, 2011
1 commit
-
…nto merge-requests/64
27 Nov, 2011
1 commit
-
Conflicts: app/controllers/admin_controller.rb app/controllers/application.rb app/controllers/public/account_controller.rb app/controllers/public/content_viewer_controller.rb lib/noosfero/i18n.rb test/functional/account_controller_test.rb test/functional/admin_controller_test.rb test/unit/contact_test.rb test/unit/profile_test.rb
22 Nov, 2011
2 commits
-
This reverts commit 26e7f6658d9d47584be570c1715a032111306316.
-
Conflicts: public/stylesheets/application.css
17 Nov, 2011
1 commit
14 Nov, 2011
1 commit
-
(ActionItem2070)
01 Nov, 2011
1 commit
-
(ActionItem2104)
26 Oct, 2011
1 commit
25 Oct, 2011
1 commit
-
Included new named_scopes for browsing contents: * more_recent * more_comments * more_views A named_scope to filter only text articles * text_articles Included new browse_contents_menu on base theme (ActionItem2069)
18 Oct, 2011
1 commit
11 Oct, 2011
1 commit
-
Libs added * jquery-validation * colorbox * recaptcha (ActionItem2074)
10 Oct, 2011
3 commits
-
* Refactoring profile management to use tokeninput * Also, adding support of tokeninput to the core * Adding attributes validated and cnpj to enterprise * Environment option to define enterprise as validated by defaul * Making profile namedscopes consider subclasses too * Adapting enterprise icon and identification to meet Bsc expectations * Adapting profile info actions to meet Bsc expectations * Adapting control panel buttons to meet Bsc expectations * Adapting core product to meed Bsc expectations * Adding and fixing plugin hotspots (ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
-
(ActionItem2075)
07 Oct, 2011
1 commit
30 Sep, 2011
1 commit
27 Sep, 2011
3 commits
-
Without this, single line breaks withing a paragraph get translated to a HTML <br/>, which is completely annoying *and* counter-intuitive in comparison with most markup languages like Textile.
-
* extract textile to HTML conversion in its own method, which sanitizes the generated HTML before returning it. * use textile for both the body and the lead. * add tests to make sure the textile markup is not being broken. -
Since TinyMCE already overrides this validation, the only effect of these validations in the TextArticle class is severely breaking TextileArticle markup.
17 Aug, 2011
3 commits
-
(ActionItem2054)
-
…nto merge-requests/24
-
(ActionItem2051)
16 Aug, 2011
1 commit
-
This reverts commit 6409d6cc8e989f473f17b882d05367c4b9153528, reversing changes made to 313f8a54d53a4fdfa651f02197813026e1660e3b. Conflicts: features/step_definitions/noosfero_steps.rb test/unit/category_finder_test.rb There are some problems with solr (ActionItem1958)
13 Aug, 2011
2 commits
-
(ActionItem2027)
-
Conflicts: app/controllers/my_profile/cms_controller.rb test/functional/cms_controller_test.rb
10 Aug, 2011
2 commits
-
…nto merge-requests/30
-
…nto merge-requests/28
09 Aug, 2011
2 commits
-
…nto merge-requests/25
-
…nto merge-requests/20
08 Aug, 2011
1 commit
-
(ActionItem2056)
28 Jul, 2011
1 commit
-
- Also, removing some re-definition of Environment model at old migrations that causes error when trying to save Environment instances (ActionItem2051)
26 Jul, 2011
4 commits
-
- fix a litle bug in a cucumber step to create articles - adding 'guest' user via sample data scripts (ActionItem2054)
14 Jul, 2011
1 commit
-
…ero into merge-requests/22
13 Jul, 2011
2 commits
-
…nto merge-requests/21
-
added content_type text/html on mailer and HTML tags on message including environment contact_email on from and sender email on reply_to
12 Jul, 2011
1 commit
-
(ActionItem2048)