Omar Junior / Noosfero

10 Sep, 2012

3 commits

d0aadb3e Merge branch 'master' into custom-forms Browse Dir »

Rodrigo Souto
2012-09-10 16:56:40 -0300
c0c8151c Including a helper for jquery datetime fields Browse Dir »

Rodrigo Souto
2012-09-10 16:53:14 -0300
4398fe05 Generalizing partial_for_class to for tasks too Browse Dir »

Rodrigo Souto
2012-09-10 16:52:47 -0300

05 Sep, 2012

2 commits

f4012a36 Merge branch 'stable' Browse Dir »

Antonio Terceiro
2012-09-05 16:13:20 -0300

74537cad Fixes an error in the tasks view ... Browse Dir »

  Fixes an error I found in the tasks view while I was investigating
  another bug.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>

2012-09-05 09:37:19 -0300

04 Sep, 2012

1 commit

f25bd3ac Add functions to check multiple and map search conditions Browse Dir »

Braulio Bhavamitra
2012-09-04 19:19:04 +0000

21 Aug, 2012

1 commit

d323bd53 Merge commit 'refs/merge-requests/181' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…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

2012-08-21 15:06:48 -0300

19 Aug, 2012

1 commit

a1ac0fb5 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Daniela Feitosa
2012-08-19 23:49:20 -0300

17 Aug, 2012

5 commits

e2e6ea01 Only inputs relevant to price are listed on product\'s search Browse Dir »

Daniela Feitosa
2012-08-17 19:50:31 -0300
3e995f55 Merge commit 'refs/merge-requests/209' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/209
```
Daniela Feitosa
2012-08-17 16:47:56 -0300
f2284832 Only list inputs relevant to price on price composition ... Browse Dir »
```
(ActionItem2366)
```
Daniela Feitosa
2012-08-17 19:07:41 +0000
c8ffa4d5 Merge commit 'refs/merge-requests/201' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/201
```
Daniela Feitosa
2012-08-17 17:42:31 +0000
706f2ff6 Merge commit 'refs/merge-requests/208' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/208
```
Daniela Feitosa
2012-08-17 15:59:24 +0000

15 Aug, 2012

5 commits

503c6fd9 Don't replace address when there is no postal code ... Browse Dir »
```
Also cleanup and refactor code
```
Braulio Bhavamitra
2012-08-15 16:31:22 +0000

65fdd587 Makes the comment box in wall grow ... Browse Dir »

  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)

2012-08-15 09:22:31 -0300

98c68e5f Improve usability on profile edit location Browse Dir »

Braulio Bhavamitra
2012-08-15 00:46:48 -0300
1af7590f Fix use of production cost in product search Browse Dir »

Braulio Bhavamitra
2012-08-15 00:45:31 -0300
7bd5c3f5 Fix use of google static map api v3 ... Browse Dir »
```
Also move view to template
```
Braulio Bhavamitra
2012-08-15 00:45:04 -0300

09 Aug, 2012

2 commits

c31733ce Merge commit 'refs/merge-requests/193' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/193
```
Daniela Feitosa
2012-08-09 02:24:12 -0300

c87d05b5 Small changes on licenses ... Browse Dir »

   * 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)

2012-08-09 00:16:26 -0300

08 Aug, 2012

4 commits

3e98d8f0 Merge commit 'refs/merge-requests/187' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…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
```
Daniela Feitosa
2012-08-08 16:15:14 -0300
f791bd46 Removed whitespaces Browse Dir »

Daniela Feitosa
2012-08-08 14:42:56 -0300
f8de6d1b Changing screen to edit templates ... Browse Dir »
```
(ActionItem2378)
```
Daniela Feitosa
2012-08-08 13:12:54 -0300

2b429040 Removed link from templates option ... Browse Dir »

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)

2012-08-08 10:02:22 -0300

07 Aug, 2012

3 commits

8657a206 [multiple-templates] Checkbox on profile to mark it as a template ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:32 -0300
0b85c950 [multiple-templates] Listing available templates on profile creation ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:32 -0300
00dacfc2 [multiple-templates] Manage templates views and controllers ... Browse Dir »
```
(ActionItem2378)
```
Rodrigo Souto
2012-08-07 22:51:32 -0300

06 Aug, 2012

1 commit

2a875d50 Removes "What's new" tab from Community's homepage ... Browse Dir »
```
  "What's new" tab have a duplicate content from the Wall tab.
  This patch just removes the tab from the Community's index page.
```
Larissa Reis
2012-08-06 16:36:00 -0300

05 Aug, 2012

1 commit

0d563e00 Merge commit 'refs/merge-requests/184' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/184
```
Daniela Feitosa
2012-08-05 22:38:50 -0300

03 Aug, 2012

1 commit

8c2f7656 Grouping activities of images upload ... Browse Dir »
```
Also, removed comments from images on profile, because now the gallery
is the target of activity

(ActionItem1826)
```
Daniela Feitosa
2012-08-03 11:44:42 -0300

31 Jul, 2012

1 commit

fe4f32cf Replaced lightbox to colorbox on New conten link ... Browse Dir »
```
(ActionItem2382)
```
Daniela Feitosa
2012-07-31 18:09:43 -0300

24 Jul, 2012

1 commit

8e0ac476 Subscribe users to be notified about new comments on article ... Browse Dir »
```
(ActionItem2375)
```
Joenio Costa
2012-07-24 00:47:39 +0000

22 Jul, 2012

1 commit

30428e4c Replacing meta by span on text_editor_sidebar ... Browse Dir »
```
The meta tags were being included on <head>

(ActionItem2371)
```
Daniela Feitosa
2012-07-22 13:18:17 -0300

20 Jul, 2012

2 commits

6ea3f89e Fix jQuery selectors for jQuery 1.5 Browse Dir »

Antonio Terceiro
2012-07-20 15:14:38 -0300
78a0bcf5 Merge branch 'master' into AI2371 ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
```
Antonio Terceiro
2012-07-20 15:02:12 -0300

19 Jul, 2012

3 commits

e87c9d99 Fixing tests ... Browse Dir »
```
Also removed not used monkey patch
Removed comments on CSS file
```
Daniela Feitosa
2012-07-19 12:19:57 -0300

75524307 Merging AI1826 with master ... Browse Dir »

Conflicts:
	app/models/article.rb
	app/models/profile.rb
	app/models/uploaded_file.rb
	public/javascripts/application.js
	public/stylesheets/application.css
	test/unit/article_test.rb
	test/unit/category_finder_test.rb
	test/unit/enterprise_test.rb

2012-07-19 09:19:22 -0300

ba6034cc Fixes on AI1826 ... Browse Dir »
```
Added back add_member_in_community activity
Fixed creation of notifications for communities
```
Daniela Feitosa
2012-07-19 09:06:14 -0300

18 Jul, 2012

2 commits

4897e7c7 [licenses] Minor fixes ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 13:48:36 -0300
49ee3a7a [licenses] Adding license in the content view page ... Browse Dir »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:25:24 -0300