Charles Oliveira / noosfero

29 Jul, 2014

4 commits

e562726f Merge branch 'rails3' into rails3_stable ... Browse Code »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-07-29 18:18:06 -0300
7fdbafc3 Fix chat.js with new jquery-ui tab api ... Browse Code »
```
Now it works but is not fully functional yet
```
Victor Costa
2014-07-29 18:15:03 -0300
a08e4ad6 Removes dependency of SystemTimer from ruby-bosh ... Browse Code »
```
Check later if a newer gem (like xmpp4r) is more suitable than ruby-bosh.
```
Victor Costa
2014-07-29 18:14:57 -0300
9d491b79 Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-07-29 10:13:53 -0300

28 Jul, 2014

16 commits

32f88e65 Remove Evil™ manipulation of constants Browse Code »

Antonio Terceiro
2014-07-28 19:12:41 -0300
174636fa Merge branch 'plugin-tests' into 'master' ... Browse Code »
```
improve plugin test execution

See merge request !271
```
Rodrigo Souto
2014-07-28 20:44:31 +0000
1c24b76d Merge branch 'AI3236-html_links_bug' into 'master' ... Browse Code »
```
Ai3236 html links bug

Fixing: https://noosfero.org/Development/ActionItem3236

See merge request !268
```
Antonio Terceiro
2014-07-28 20:35:09 +0000

dda93504 Improve plugin test runs ... Browse Code »

- process plugins in alphabeticall order, so when watching the console
  output, one can know at which point of the execution we are.
- run all tests of a given type (unit, functional etc) for a single
  plugin together. On my machine this brings the total run time from
  ~34min down to ~20min.

2014-07-28 17:31:05 -0300

63fa33ce Fix cucumber step definitions Browse Code »

Victor Costa
2014-07-28 17:18:45 -0300
4ad1745d Fixing article parents html links in cms view ... Browse Code »
```
(ActionItem3236)
```
Arthur Esposte
2014-07-28 17:03:31 -0300
3f3ad2de Fix css of login box when in a profile page Browse Code »

Victor Costa
2014-07-28 15:41:07 -0300
959b51a1 Merge branch 'AI3237-slideshow_block_bug' into 'master' ... Browse Code »
```
Ai3237 slideshow block bug

Fixing rails3 bug: http://noosfero.org/Development/ActionItem3237

See merge request !269
```
Antonio Terceiro
2014-07-28 18:13:50 +0000
b89c9cca Merge branch 'AI3226-image_upload_bug' into 'master' ... Browse Code »
```
Ai3226 image upload bug

Fixing bug rails 3 -> http://noosfero.org/Development/ActionItem3226

See merge request !263
```
Antonio Terceiro
2014-07-28 18:00:45 +0000
f3cd985b Merge branch 'AI3228_spreading_article' into 'master' ... Browse Code »
```
Ai3228 spreading article

AI 3228 fix spreading article.

http://noosfero.org/Development/ActionItem3228

See merge request !267
```
Antonio Terceiro
2014-07-28 17:53:33 +0000
ea685a17 fix missing validation on spreading article Browse Code »

David Silva
2014-07-28 17:30:38 +0000
6228c23b Merge remote-tracking branch 'origin/rails3' Browse Code »

Antonio Terceiro
2014-07-28 12:30:19 -0300
808ba9fe Merge branch 'AI3215-remove_friend_bug' into 'master' ... Browse Code »
```
Ai3215 remove friend bug

Fixing Rails3 bug: http://noosfero.org/Development/ActionItem3215

See merge request !264
```
Antonio Terceiro
2014-07-28 15:28:19 +0000
e70703a1 Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Code »

Victor Costa
2014-07-28 09:41:33 -0300
0153bc3a Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-28 09:40:30 -0300
195b8404 Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-07-28 09:30:24 -0300

27 Jul, 2014

2 commits

cea9db41 Adding attr_accessible for slideshow block attributes ... Browse Code »
```
(ActionItem3237)
```
Arthur Esposte
2014-07-27 15:51:27 -0300
bc1632a9 Fixed filtering of roles on memberships page ... Browse Code »
```
(ActionItem3235)
```
Daniela Feitosa
2014-07-27 00:19:04 -0300

25 Jul, 2014

9 commits

d5905fc4 Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-07-25 18:43:06 -0300
41c859e7 Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Code »

Leandro Santos
2014-07-25 12:05:55 -0300
e1f5af1a Merge branch 'rails3_AI3033-serpro_integration' of gitlab.com:participa/noosfero… ... Browse Code »
```
… into rails3_AI3033-serpro_integration
```
Leandro Santos
2014-07-25 12:04:49 -0300
1d3a66bc adding jenkins hook Browse Code »

Leandro Santos
2014-07-25 12:04:31 -0300
fdd9382e Merge branch 'rails3_AI3033-serpro_integration' into rails3_stable Browse Code »

Victor Costa
2014-07-25 11:48:46 -0300
5ae29fcf serpro_integration: set default to false Browse Code »

Victor Costa
2014-07-25 11:48:23 -0300
b7d01463 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-25 10:55:26 -0300
b3c54259 relevant_content: fix mass assignment on edition Browse Code »

Victor Costa
2014-07-25 10:55:17 -0300
89dd42c3 Merge branch 'rails3_ckeditor' into rails3_stable Browse Code »

Victor Costa
2014-07-25 10:28:33 -0300

24 Jul, 2014

9 commits

01b4ab03 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-24 17:03:10 -0300
180142e9 Fix plugin routes with profile Browse Code »

Victor Costa
2014-07-24 17:02:27 -0300
22fb6356 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-24 16:30:43 -0300
deb07e92 Merge branch 'https-support' of https://gitlab.com/joenio/noosfero into noosfero-https-support Browse Code »

Joenio Costa
2014-07-24 16:22:58 -0300

db2bd738 Fix encoding for columns serialized with YAML ... Browse Code »

See a good explanation about the problem in '4. YAML serialized columns':
http://blog.rayapps.com/2013/03/11/7-things-that-can-go-wrong-with-ruby-19-string-encodings/

2014-07-24 16:00:36 -0300

acc730a4 Merge branch 'rails3' into rails3_stable Browse Code »

Victor Costa
2014-07-24 11:29:57 -0300
45d9194b Fix visualization of forum posts Browse Code »

Victor Costa
2014-07-24 11:28:55 -0300
c25021c1 Merge branch 'AI3204-bug_person_block' into 'master' ... Browse Code »
```
Ai3204 bug person block

Fixing https://noosfero.org/Development/ActionItem3204

See merge request !262
```
Rodrigo Souto
2014-07-24 13:50:06 +0000
391b7c0f AI3204: Fixing People block plugin bug Browse Code »

Arthur Esposte
2014-07-24 13:27:28 +0000