Software Publico / Noosfero

21 Jan, 2014

2 commits

e59c8ae2 product-categories-block: not visible when products are disabled on the environment Browse Code »

Rodrigo Souto
2014-01-21 19:34:30 +0000

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Code »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

17 Jan, 2014

5 commits

fd59bb99 Update translations Browse Code »

Rodrigo Souto
2014-01-17 16:51:33 -0300
f00b5831 community-track: fix typo on hits Browse Code »

Rodrigo Souto
2014-01-17 16:51:08 -0300
4ad91064 Merge branch 'stable' ... Browse Code »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000
6f8f36f0 cms-helper-tests: fix bug due to blog without profile Browse Code »

Rodrigo Souto
2014-01-17 18:04:31 +0000
b1bcaade Merge branch 'next' Browse Code »

Joenio Costa
2014-01-17 09:56:15 -0300

16 Jan, 2014

12 commits

370d0e1f Merge remote-tracking branch 'aurium/display-md' ... Browse Code »
```
Conflicts:
	HACKING
```
Rodrigo Souto
2014-01-16 18:48:23 -0300
0a187954 Merge branch 'master' of https://gitlab.com/noosfero/noosfero Browse Code »

Rodrigo Souto
2014-01-16 18:20:31 -0300
99612dd1 publish-article-features: fix strange test that breaks when all tests are ran Browse Code »

Rodrigo Souto
2014-01-16 20:01:37 +0000
faf5765a search-enterprises-features: remove background that is trashing other scenarios Browse Code »

Rodrigo Souto
2014-01-16 20:00:04 +0000
512bd542 features-paths: add profile path Browse Code »

Rodrigo Souto
2014-01-16 18:23:09 +0000
5f156c9e new-content-features: fill address field which is not filled without js Browse Code »

Rodrigo Souto
2014-01-16 18:22:23 +0000
757bfb50 Merge branch 'AI2844' Browse Code »

Daniela Feitosa
2014-01-16 17:35:52 +0000
0a577775 join_button: added class to style join button ... Browse Code »
```
(ActionItem2844)
```
Daniela Feitosa
2014-01-16 17:25:24 +0000
d7c27610 link-list-block-view: fix default target value Browse Code »

Rodrigo Souto
2014-01-16 17:14:27 +0000
496d5a24 join_button: removing footer content from model ... Browse Code »
```
- leaving code to be displayed on views (MVC)

(ActionItem2844)
```
Daniela Feitosa
2014-01-16 16:50:52 +0000
a4267385 Merge branch 'track-fixes' Browse Code »

Rodrigo Souto
2014-01-16 16:06:09 +0000
2de692cd Merge remote branch 'unb-gama/AI2844-join_button' into AI2844 Browse Code »

Daniela Feitosa
2014-01-16 02:27:37 +0000

15 Jan, 2014

15 commits

fa207812 Adding css class "title" back to 'editing block' window ... Browse Code »
```
(ActionItem2923)
```
Joenio Costa
2014-01-15 22:26:30 -0300
4cb862a0 Merge remote-tracking branch 'participa/AI2923-block_name_in_edit_mode' into next Browse Code »

Joenio Costa
2014-01-15 22:17:14 -0300
5187f433 Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes ... Browse Code »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-01-15 16:44:17 -0300
e5d9ef3a Merge branch 'AI2852' Browse Code »

Daniela Feitosa
2014-01-15 16:53:41 +0000
a96ba9e6 access_level: optimizing the search for members ... Browse Code »
```
- Also fixed db/schema
(ActionItem2852)
```
Daniela Feitosa
2014-01-15 16:48:04 +0000
2d698f0b Fix jquery xss issue Browse Code »

Victor Costa
2014-01-15 15:06:44 +0000
6e9b3b36 Fix xss issue at body_classes Browse Code »

Victor Costa
2014-01-15 15:06:34 +0000
063cbe47 We need a test that proves the performance improving ... Browse Code »
```
(ActionItem2931)
```
Joenio Costa
2014-01-15 11:25:12 -0300
abdeef43 Merge remote-tracking branch 'participa/AI2937-folder_display_content' into folder-display-content ... Browse Code »
```
Conflicts:
	plugins/display_content/lib/display_content_block.rb
	plugins/display_content/test/unit/display_content_block_test.rb
```
Rodrigo Souto
2014-01-15 11:10:31 -0300
91db1c99 Merge branch 'master' of https://gitlab.com/noosfero/noosfero Browse Code »

Rodrigo Souto
2014-01-15 13:40:22 +0000
fa2713e7 plugin-spammable: reloading extension on each request on development mode Browse Code »

Rodrigo Souto
2014-01-15 13:40:02 +0000
d1609c73 Merge remote branch 'unb-gama/AI2852-article_access_level' into AI2852 ... Browse Code »
```
Conflicts:
	app/models/person.rb
	db/schema.rb
```
Daniela Feitosa
2014-01-15 12:44:00 +0000
62c9d33b Merge remote-tracking branch 'participa/AI2931-comment_group_fixes' into AI2931-comment_group_fixes Browse Code »

Joenio Costa
2014-01-15 09:43:47 -0300
527a4b0d Moved logic from controller to model ... Browse Code »
```
- Also included new db/schema
- Removed unused partial

(ActionItem2513)
```
Daniela Feitosa
2014-01-15 05:54:40 +0000

b3fb1448 forum_use_terms: add user term to forums ... Browse Code »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

14 Jan, 2014

6 commits

48a01d20 Adding the test that reproduces the bug ... Browse Code »
```
(ActionItem2934)
```
Joenio Costa
2014-01-14 21:10:45 -0300
161785bd Merge branch 'master' of https://gitlab.com/noosfero/noosfero Browse Code »

Rodrigo Souto
2014-01-14 11:35:13 -0300
290c4b8e application-helper: allow theme_include to receive options ... Browse Code »
```
(ActionItem2950)
```
Rodrigo Souto
2014-01-14 11:34:25 -0300
75ebbf5b Bumping version 0.45.2 Browse Code »

Rodrigo Souto
2014-01-14 13:25:21 +0000
d70ac498 Merge branch 'AI2918' of /mnt/ebs/repositories/danielafeitosa/noosfero into stable Browse Code »

Rodrigo Souto
2014-01-14 13:21:44 +0000
ce8f3025 Merge remote-tracking branch 'participa/AI2934-pg_search_profile_fix' into AI293… ... Browse Code »
```
…4-pg_search_profile_fix
```
Joenio Costa
2014-01-14 09:25:36 -0300