Charles Oliveira / noosfero

13 Apr, 2015

4 commits

14f2a5e8 Fix merge with api Browse Dir »

Victor Costa
2015-04-13 14:47:11 -0300
8a6d7d69 Merge branch 'api' into stable ... Browse Dir »
```
Conflicts:
	config.ru
	lib/noosfero/plugin.rb
```
Victor Costa
2015-04-13 14:36:36 -0300
9c4dd907 Merge branch 'next' into stable ... Browse Dir »
```
Conflicts:
	app/helpers/layout_helper.rb
	app/views/layouts/_javascript.html.erb
```
Victor Costa
2015-04-13 14:02:20 -0300
37c45c16 fix conflit with next Browse Dir »

Leandro Santos
2015-04-13 09:19:47 -0300

10 Apr, 2015

1 commit

d31ddc20 schema.rb: update Browse Dir »

Braulio Bhavamitra
2015-04-10 09:59:53 -0300

09 Apr, 2015

3 commits

7dba8f99 fixing conflit Browse Dir »

Leandro Santos
2015-04-09 08:19:02 -0300
a08cccb5 renaming setting to settings Browse Dir »

Leandro Santos
2015-04-09 08:12:21 -0300
68e50a17 fixing conflit with next Browse Dir »

Leandro Santos
2015-04-09 07:00:53 -0300

08 Apr, 2015

3 commits

c11cfb6d Merge branch 'next' into stable Browse Dir »

Leandro Santos
2015-04-08 21:55:05 -0300
54d9eb37 Add settings field for comments. Now it will be possible to use acts_as_having_fields for comments Browse Dir »

Leandro Santos
2015-04-08 21:51:05 -0300
beb6bfa0 fix-yaml-migration: use find_each to reduce memory consumption Browse Dir »

Rodrigo Souto
2015-04-08 12:10:12 -0300

24 Mar, 2015

3 commits

7fa02316 api: renaming private token migration Browse Dir »

Leandro Santos
2015-03-24 21:09:55 -0300
6bc2576f adding authentication and entity mananegement Browse Dir »

Leandro Santos
2015-03-24 20:53:02 -0300
8047cb18 adding private token information to users Browse Dir »

Leandro Santos
2015-03-24 20:53:02 -0300

19 Mar, 2015

1 commit

3e5d8c76 Merge branch 'serpro-context' into stable ... Browse Dir »
```
Conflicts:
	app/models/profile.rb
	app/views/profile_editor/edit.html.erb
```
Victor Costa
2015-03-19 17:52:01 -0300

16 Mar, 2015

1 commit

be674ec9 Merge branch 'softwarepublico/noosfero-secret_comunity' into next ... Browse Dir »
```
See merge request !481
```
Antonio Terceiro
2015-03-16 16:26:55 -0300

27 Feb, 2015

3 commits

0acacf51 Merge branch 'master' into stable Browse Dir »

Leandro Santos
2015-02-27 11:31:41 -0300
c5b5a296 db/schema.rb: update Browse Dir »

Antonio Terceiro
2015-02-27 11:06:34 -0300
f5ff10a3 Update version of acts-as-taggable-on ... Browse Dir »
```
See merge request !421

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2015-02-27 11:06:12 -0300

26 Feb, 2015

2 commits

0d3ca253 fix conflit with master Browse Dir »

Leandro Santos
2015-02-26 10:38:14 -0300

49716023 Add Secret type to communities' privacy options ... Browse Dir »

- created 'secret' attribute for profiles
- redefined scope for secret communities

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-02-26 12:53:07 +0000

25 Feb, 2015

3 commits

b0d14e87 Revert "db/schema.rb: update" ... Browse Dir »
```
This reverts commit 025643a62df719a6cfe63f5927d45585d655a1da.
```
Antonio Terceiro
2015-02-25 18:17:52 -0300
025643a6 db/schema.rb: update Browse Dir »

Antonio Terceiro
2015-02-25 12:29:39 -0300
34c7a7d2 mergin with master Browse Dir »

Leandro Santos
2015-02-25 12:07:23 -0300

24 Feb, 2015

3 commits

11dfb86b Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Dir »

Rodrigo Souto
2015-02-24 12:46:29 -0300
d442dac2 chat: add chat_messages to schema Browse Dir »

Rodrigo Souto
2015-02-24 12:44:14 -0300
0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

23 Feb, 2015

1 commit

106d00bf Update db/schema.rb Browse Dir »

Braulio Bhavamitra
2015-02-23 20:46:58 -0300

22 Feb, 2015

2 commits

e7b637f7 Merge branch 'normalize-email' into 'master' ... Browse Dir »
```
Normalize email before save

Users were saving emails in uppercase

See merge request !413
```
Braulio Bhavamitra
2015-02-22 23:21:49 +0000
aca12460 Merge branch 'ai3139' into 'master' ... Browse Dir »
```
Register last login date

See merge request !465
```
Braulio Bhavamitra
2015-02-22 23:07:11 +0000

13 Feb, 2015

1 commit

94d0d92d Merge branch 'chat' of https://gitlab.com/diguliu/noosfero ... Browse Dir »
```
See merge request !454
```
Antonio Terceiro
2015-02-13 11:56:59 -0200

11 Feb, 2015

2 commits

fa1683af db/schema.rb: update Browse Dir »

Antonio Terceiro
2015-02-11 15:29:17 -0200
f8fab09f Use true instead of 't' in SQL where clauses Browse Dir »

Braulio Bhavamitra
2015-02-11 08:16:29 -0300

10 Feb, 2015

3 commits

cf1e8aa6 Resolve missed code conflicts Browse Dir »

Braulio Bhavamitra
2015-02-10 21:07:19 -0300
becf0ab7 Register last login date ... Browse Dir »
```
(ActionItem3139)
```
Braulio Bhavamitra
2015-02-10 15:33:13 -0300
00b69cdc Merge branch 'ai2809' into 'master' ... Browse Dir »
```
Use materialized path for parents lookup

http://noosfero.org/Development/ActionItem2809

See merge request !7
```
Braulio Bhavamitra
2015-02-10 18:21:43 +0000

06 Feb, 2015

1 commit

d29ca9e2 Merge branch 'master' into chat ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2015-02-06 11:17:02 -0300

04 Feb, 2015

1 commit

60262a33 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/controllers/public/search_controller.rb
	app/models/profile.rb
	app/views/cms/edit.html.erb
	public/stylesheets/application.css

2015-02-04 13:02:40 -0300

03 Feb, 2015

2 commits

80bac445 Merge branch 'master-with-chat' into master-with-chat2 Browse Dir »

Rodrigo Souto
2015-02-03 18:18:41 -0300
d2029dc6 Merge branch 'invitation' into stoa ... Browse Dir »
```
Conflicts:
	db/schema.rb
```
Rodrigo Souto
2015-02-03 18:11:15 -0300