NoosferoGov / noosfero

15 Aug, 2014

7 commits

097fe2a7 Merge branch 'rails3_chat' into rails3_stable Browse Code »

Victor Costa
2014-08-15 12:13:49 -0300
cec25930 Merge branch 'rails3' into rails3_stable ... Browse Code »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300
a2d483ba Small fixes in chat ui Browse Code »

Victor Costa
2014-08-15 11:55:46 -0300
35bf1408 Upgrade strophe.js to 1.1.3 Browse Code »

Victor Costa
2014-08-15 09:32:54 -0300
1ead5508 Fix bosh service url Browse Code »

Victor Costa
2014-08-15 09:15:48 -0300
e6855182 Merge branch 'AI3240-fix_join_and_leave' into 'master' ... Browse Code »
```
Ai3240 fix join and leave

See merge request !272
```
Antonio Terceiro
2014-08-15 12:09:57 +0000
6ce76a6e Merge branch 'AI3218_article_block_bug' into 'master' ... Browse Code »
```
Ai3218 article block bug

Fixing ArticleBlock blog's pagination bug: http://noosfero.org/Development/ActionItem3218

See merge request !301
```
Antonio Terceiro
2014-08-15 12:08:31 +0000

14 Aug, 2014

6 commits

a626564b Small fixes on chat layout Browse Code »

Victor Costa
2014-08-14 19:48:38 -0300
1a5e1b36 Add style to links in chat history Browse Code »

Victor Costa
2014-08-14 18:25:28 -0300
733f701e Remove userdata polling when chat is enabled Browse Code »

Victor Costa
2014-08-14 18:02:18 -0300
08b9e2b9 Small fixes for chat Browse Code »

Victor Costa
2014-08-14 17:06:11 -0300
3b3e0243 Remove paginate from ArticleBlock blog's presentation ... Browse Code »
```
(ActionItem3218)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
```
Arthur Esposte
2014-08-14 16:46:37 -0300
01c3bad8 Use xmpp_chat to render new chat layout Browse Code »

Victor Costa
2014-08-14 09:47:36 -0300

13 Aug, 2014

22 commits

e4d17fb9 Fix friends counter in chat Browse Code »

Victor Costa
2014-08-13 19:34:39 -0300
ebb85ad4 Remove unused chat files and fix chat button Browse Code »

Victor Costa
2014-08-13 19:18:27 -0300
3fab4790 New chat layout Browse Code »

Victor Costa
2014-08-13 19:04:52 -0300
05d99f0e Gemfile: de-duplicate rake ... Browse Code »
```
newer versions of bundler will bitch about that.
```
Antonio Terceiro
2014-08-13 18:11:37 -0300
ac6fc84e debian/control: simplify Ruby dependency Browse Code »

Antonio Terceiro
2014-08-13 18:04:19 -0300
7ee6ad9a debian/control: new depndency Browse Code »

Antonio Terceiro
2014-08-13 18:03:17 -0300
d623f651 quick-start debian: always run apt-get update Browse Code »

Antonio Terceiro
2014-08-13 18:01:08 -0300
0d1b486d Merge remote-tracking branch 'origin/rails3' Browse Code »

Antonio Terceiro
2014-08-13 17:58:14 -0300
bb128631 versioned_article: remove extra </div> Browse Code »

Antonio Terceiro
2014-08-13 16:54:18 -0300
13f3dd76 Merge branch 'AI3250-fix_comment_form_captcha' into 'master' ... Browse Code »
```
Ai3250 fix comment form captcha

http://noosfero.org/Development/ActionItem3250

See merge request !280
```
Antonio Terceiro
2014-08-13 19:20:14 +0000
d2e9a99b Merge branch 'AI3189-fix_versions_back_button' into 'master' ... Browse Code »
```
Ai3189 fix versions back button

https://noosfero.org/Development/ActionItem3189

See merge request !266
```
Antonio Terceiro
2014-08-13 19:19:47 +0000
72a59859 Merge branch 'AI3223-fix_article_versions' into 'master' ... Browse Code »
```
Ai3223 fix article versions

http://noosfero.org/Development/ActionItem3223

See merge request !265
```
Antonio Terceiro
2014-08-13 18:54:45 +0000
c25f9a54 Merge branch 'AI3263' into 'master' ... Browse Code »
```
Ai3263: Fixed reordering of forms submissions

See merge request !294
```
Antonio Terceiro
2014-08-13 18:41:56 +0000
3512ab2f Fixed the reorder of form submissions ... Browse Code »
```
- storing the author_name when logged users submit a form
- migration to insert =author_name= on existent submissions

(ActionItem3263)
```
Daniela Feitosa
2014-08-13 14:45:32 -0300
94c1d5ec Merge branch 'AI3262-custom_form_plugin_bug' into 'master' ... Browse Code »
```
Ai3262 custom form plugin bug

Fixing custom_forms plugin's rails 3 bug -> http://noosfero.org/Development/ActionItem3262

See merge request !293
```
Antonio Terceiro
2014-08-13 14:46:09 +0000
35e061b3 Merge branch 'attr_accessible' into 'master' ... Browse Code »
```
Attr accessible

Quick fix to use the instructions of: http://noosfero.org/Development/InstallData

See merge request !291
```
Antonio Terceiro
2014-08-13 14:44:35 +0000

203c5675 Merge branch 'new_highlight' into 'master' ... Browse Code »

New highlight

First commit for "#3243: HighlightsBlock edit mode is not creating image fields"
http://noosfero.org/Development/ActionItem3243

Second commit for "#3260: Remove a highlight item from the list"
http://noosfero.org/Development/ActionItem3260

See merge request !290

2014-08-13 14:41:56 +0000

1aa6a909 db/schema.rb: update Browse Code »

Antonio Terceiro
2014-08-13 11:21:49 -0300
e713f2dd Merge branch 'AI3259-rss_feed_article_bug' into 'master' ... Browse Code »
```
Ai3259 rss feed article bug

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

See merge request !289
```
Antonio Terceiro
2014-08-13 13:55:21 +0000
baf5980c Merge branch 'AI3258-location_block_bug' into 'master' ... Browse Code »
```
Ai3258 location block bug

Fixing rails 3 bug -> https://noosfero.org/Development/ActionItem3258

See merge request !288
```
Antonio Terceiro
2014-08-13 13:38:47 +0000
ecf8655a Merge branch 'AI3256-feature_product_block_bug' into 'master' ... Browse Code »
```
Ai3256 feature product block bug

Fixing rails 3 bug -> https://noosfero.org/Development/ActionItem3256

See merge request !286
```
Antonio Terceiro
2014-08-13 13:37:57 +0000
ea7132de Merge branch 'AI3251_edit_header_footer' into 'master' ... Browse Code »
```
Ai3251 edit header footer

AI 3251 fix edit header footer
http://noosfero.org/Development/ActionItem3251

See merge request !276
```
Antonio Terceiro
2014-08-13 13:25:15 +0000

12 Aug, 2014

5 commits

ebb86d65 Merge branch 'master' into rails3 Browse Code »

Victor Costa
2014-08-12 13:13:39 -0300
4887d77f Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Code »

Victor Costa
2014-08-12 09:45:42 -0300
a995a51a Merge branch 'AI2915-category_color' into rails3_stable ... Browse Code »
```
Conflicts:
	app/helpers/application_helper.rb
```
Victor Costa
2014-08-12 09:45:04 -0300
2247304b community_track: add color to track name Browse Code »

Victor Costa
2014-08-12 09:44:07 -0300
53e85962 community_track: added background color to track card Browse Code »

Victor Costa
2014-08-12 09:44:07 -0300