Charles Oliveira / noosfero

30 Sep, 2015

1 commit

d66aa24c merging with master Browse Dir »

Leandro Santos
2015-09-30 20:12:05 -0300

24 Sep, 2015

1 commit

c99dd6da Add new consumption plugins ... Browse Dir »

This patch adds 3 new consumption plugins:
  * orders_cycle
  * suppliers
  * volunteers

These plugins are not properly tested yet but they are necessary for the
orders and delivery plugins (that are properly tested) to work corretctly.

2015-09-24 19:19:08 -0300

22 Sep, 2015

1 commit

06bf7862 merging with master Browse Dir »

Leandro Santos
2015-09-22 16:12:48 -0300

11 Sep, 2015

1 commit

e22434f3 Merge branch 'master' into redemoinho-improvements Browse Dir »

Rodrigo Souto
2015-09-11 15:36:49 -0300

08 Sep, 2015

1 commit

57b5f5bf Merge branch 'master' into api Browse Dir »

Antonio Terceiro
2015-09-08 11:43:55 -0300

05 Sep, 2015

1 commit

8f571a5e Split members page in admins and non-admins ... Browse Dir »

  - Order members by name
  - Removed white spaces
  - Changed strings to be translated
  - Renamed div id and test
  - Adjust ul tag members
  - Fixed plugin dependency

Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>

2015-09-05 12:28:06 +0000

04 Sep, 2015

1 commit

db0d70fc Merge branch 'master' into api Browse Dir »

Antonio Terceiro
2015-09-04 16:05:04 -0300

19 Aug, 2015

1 commit

121912b3 Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir »

Conflicts:
	Gemfile
	app/models/profile.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
	plugins/shopping_cart/po/de/shopping_cart.po
	plugins/shopping_cart/po/es/shopping_cart.po
	plugins/shopping_cart/po/fr/shopping_cart.po
	plugins/shopping_cart/po/hy/shopping_cart.po
	plugins/shopping_cart/po/pt/shopping_cart.po
	plugins/shopping_cart/po/ru/shopping_cart.po
	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
	plugins/shopping_cart/views/cart.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb

2015-08-19 13:05:49 -0300

13 Aug, 2015

1 commit

eb070c85 fixing conflit with master Browse Dir »

Leandro Santos
2015-08-13 17:44:13 -0300

10 Aug, 2015

2 commits

5d003955 Use standard method for RSS-feed icon ... Browse Dir »
```
Move icon to the icon theme structure (awesome also have an icon for
this)
```
dtygel
2015-08-10 19:27:46 -0300
ac306a5b Add download icon Browse Dir »

dtygel
2015-08-10 16:56:59 -0300

09 Aug, 2015

1 commit

2f07775b Merge branch 'responsive' into 'master' ... Browse Dir »
```
Responsive



See merge request !607
```
Braulio Bhavamitra
2015-08-09 23:26:45 +0000

28 Jul, 2015

1 commit

3ccdd527 Merge branch 'master' into api Browse Dir »

Antonio Terceiro
2015-07-28 11:38:41 -0300

25 Jul, 2015

1 commit

f508e4e8 merging with serpro context Browse Dir »

Leandro Santos
2015-07-25 09:00:59 -0300

23 Jul, 2015

4 commits

70a7683f search: realign search box and search button ... Browse Dir »
```
I know this is ridiculous, but will we have to rewrite all the HTML at some
point anyway ...
```
Antonio Terceiro
2015-07-23 16:39:00 -0300
793315ae Merge branch 'master' of https://gitlab.com/noosfero/noosfero into responsive Browse Dir »

Braulio Bhavamitra
2015-07-23 16:09:41 -0300
6c55ce14 Remove letfover selectordie files Browse Dir »

Antonio Terceiro
2015-07-23 11:05:49 -0300

5063822a Drop selectordie ... Browse Dir »

- first it breaks selenium tests because it hides the original select
  and replaces it with its own thing.

- second, IMO is is too much overhead to add a style that (again IMO) is
  not even that better than the default select widget in Firefox.

2015-07-23 10:22:47 -0300

16 Jul, 2015

1 commit

8e515c3e responsive: fix problems with bootstrap's border-box Browse Dir »

Braulio Bhavamitra
2015-07-16 11:45:29 -0300

08 Jul, 2015

2 commits

df9cc0e2 Merge branch 'api' into production ... Browse Dir »
```
Conflicts:
	Gemfile
```
Evandro Junior
2015-07-08 19:05:52 -0300
2b942cdf merge with noosfero api branch Browse Dir »

Ábner Silva de Oliveira
2015-07-08 17:06:37 -0300

03 Jul, 2015

1 commit

ea468c0e Merge branch 'block-admin-mail' into production ... Browse Dir »
```
Conflicts:
	app/models/event.rb
	app/models/profile.rb
	po/fr/noosfero.po
```
Victor Costa
2015-07-03 10:45:54 -0300

01 Jul, 2015

1 commit

06f96ca8 fix conflit with add_members_community Browse Dir »

Leandro Santos
2015-07-01 18:10:44 -0300

30 Jun, 2015

4 commits

3d9ba6b1 Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-30 11:34:19 -0300
6905648c Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-30 11:32:42 -0300
786d3c66 Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	app/views/tasks/processed.html.erb
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-30 10:52:31 -0300
e9c22c7f Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-30 10:35:35 -0300

29 Jun, 2015

6 commits

4d97466d Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-29 17:25:05 -0300
013cb185 Improve processed tasks view Browse Dir »

Victor Costa
2015-06-29 17:24:30 -0300
4012f329 Merge branch 'processed_tasks' into production Browse Dir »

Victor Costa
2015-06-29 17:09:36 -0300
05361395 Improve processed tasks view Browse Dir »

Victor Costa
2015-06-29 17:09:23 -0300
4ac8b06a Merge branch 'processed_tasks' into production ... Browse Dir »
```
Conflicts:
	public/stylesheets/tasks.css
```
Victor Costa
2015-06-29 16:45:17 -0300
e21366f1 Improve listing of processed tasks Browse Dir »

Victor Costa
2015-06-29 16:42:56 -0300

25 Jun, 2015

1 commit

d3b8064f Merge branch 'master' into api Browse Dir »

Rodrigo Souto
2015-06-25 11:31:15 -0300

17 Jun, 2015

5 commits

5ddb93d8 Improved event display layout ... Browse Dir »

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

5ee24034 Refactoring article content visualization ... Browse Dir »

  - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

61955a0f responsive: update plugin, base-responsive and add noosfero-responsive Browse Dir »

Braulio Bhavamitra
2015-06-17 13:32:34 -0300
01a73fbc Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	Gemfile
	public/proposal-app
	public/stylesheets/application.css
```
Victor Costa
2015-06-17 11:01:44 -0300
2df11dd7 Improve layout of email templates list Browse Dir »

Victor Costa
2015-06-17 10:48:36 -0300

16 Jun, 2015

1 commit

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300