Charles Oliveira / noosfero

26 Jan, 2015

19 commits

db70e092 Merge branch 'AI3205-comment-paragraph' into stable ... Browse Code »
```
Conflicts:
	plugins/comment_paragraph/public/style.css
```
Victor Costa
2015-01-26 16:48:07 -0300
aa2c4349 comment_paragraph: apply macro only for content viewer controller Browse Code »

Victor Costa
2015-01-26 16:45:26 -0300
45813640 comment_paragraph: fix range selection Browse Code »

Victor Costa
2015-01-26 16:40:27 -0300
8c0c822f Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

Victor Costa
2015-01-26 15:35:52 -0300
dca72624 comment_paragraph: fix range selection Browse Code »

Victor Costa
2015-01-26 15:35:28 -0300
2c842799 Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

Victor Costa
2015-01-26 14:41:23 -0300
7fd79948 comment_paragraph: move comment_extra inside comment_paragraph_plugin_profile fo… ... Browse Code »
```
…lder to avoid conflicts
```
Victor Costa
2015-01-26 14:40:46 -0300
c3c8412d Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

Victor Costa
2015-01-26 14:34:37 -0300
cef08172 comment_paragraph: move comment_extra inside comment_paragraph_plugin_profile fo… ... Browse Code »
```
…lder to avoid conflicts
```
Victor Costa
2015-01-26 14:33:13 -0300
85d14d02 Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

Victor Costa
2015-01-26 13:43:49 -0300
c698f7e9 comment_paragraph: fix range selection Browse Code »

Victor Costa
2015-01-26 13:43:33 -0300
c90eca3c Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

Victor Costa
2015-01-26 13:28:05 -0300
ec7ce559 comment_paragraph: fix migration Browse Code »

Victor Costa
2015-01-26 13:27:50 -0300

26af7f72 Merge branch 'AI3205-comment-paragraph' into stable ... Browse Code »

Conflicts:
	plugins/comment_paragraph/lib/ext/article.rb
	plugins/comment_paragraph/public/comment_paragraph_macro.js
	plugins/comment_paragraph/public/style.css
	plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb

2015-01-26 13:00:37 -0300

65df7c9a comment_paragraph: remove macro button Browse Code »

Victor Costa
2015-01-26 12:28:15 -0300
4522d102 comment_paragraph: improve range selection Browse Code »

Victor Costa
2015-01-26 12:18:05 -0300
23145cad Merge branch 'I324-display_private_article_to_all_community_members' into stable Browse Code »

Victor Costa
2015-01-26 10:51:14 -0300
60e007c1 Always display options for private visibility Browse Code »

Victor Costa
2015-01-26 10:50:50 -0300
1294cc9c Fix merge with AI3160-fullscreen_for_article Browse Code »

Victor Costa
2015-01-26 10:16:19 -0300

23 Jan, 2015

2 commits

1f1e5210 comment_paragraph: option to apply to all text articles Browse Code »

Victor Costa
2015-01-23 17:46:43 -0300
bcd0d440 comment_paragraph: refactoring Browse Code »

Victor Costa
2015-01-23 15:24:24 -0300

22 Jan, 2015

4 commits

4aebcbf8 comment_paragraph: improve layout and usability Browse Code »

Victor Costa
2015-01-22 14:30:01 -0300
7fd8b02b Merge branch 'AI3220_proposals' into stable Browse Code »

Victor Costa
2015-01-22 14:29:38 -0300
9a44d833 proposals_discussion: fix css Browse Code »

Victor Costa
2015-01-22 11:31:15 -0300

4babb0b1 comment_paragraph: improve layout and usability ... Browse Code »

Conflicts:

	plugins/comment_paragraph/public/comment_paragraph_macro.js
	plugins/comment_paragraph/public/style.css
	plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb

2015-01-22 10:41:35 -0300

21 Jan, 2015

3 commits

e8f8ec18 comment_paragraph: improve layout and usability ... Browse Code »
```
Conflicts:

	plugins/comment_paragraph/views/comment_paragraph_plugin_profile/_comment_paragraph.html.erb
```
Victor Costa
2015-01-21 18:25:06 -0300
3d04994e Merge branch 'site_tour' into stable Browse Code »

Victor Costa
2015-01-21 11:12:16 -0300
fc36fae9 site_tour: enable auto positioning Browse Code »

Victor Costa
2015-01-21 11:11:43 -0300

20 Jan, 2015

9 commits

a47c9449 Merge branch 'site_tour' into stable ... Browse Code »

Conflicts:
	plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb
	plugins/site_tour/views/tour_actions.html.erb

2015-01-20 16:17:52 -0300

0056aa48 site_tour: fix step sequence for groups Browse Code »

Victor Costa
2015-01-20 16:14:17 -0300
b0a81e82 site_tour: set triggers for groups Browse Code »

Victor Costa
2015-01-20 16:13:54 -0300
377edbac Merge branch 'site_tour' into stable ... Browse Code »
```
Conflicts:
	plugins/site_tour/public/main.js
	plugins/site_tour/views/tour_actions.html.erb
```
Victor Costa
2015-01-20 14:16:24 -0300
07b9482c site_tour: set triggers for groups Browse Code »

Victor Costa
2015-01-20 14:15:58 -0300
5a3e0732 Merge branch 'site_tour' into stable Browse Code »

Victor Costa
2015-01-20 14:04:46 -0300
e343a145 site_tour: set triggers for groups Browse Code »

Victor Costa
2015-01-20 14:04:28 -0300
8afc3c46 Merge branch 'site_tour' into stable Browse Code »

Victor Costa
2015-01-20 08:33:22 -0300
73d17ca1 site_tour: set cookie expiration date Browse Code »

Victor Costa
2015-01-20 08:32:53 -0300

19 Jan, 2015

3 commits

04127a02 Change base class for plugin admin controllers Browse Code »

Victor Costa
2015-01-19 17:36:59 -0300
c9c78807 Merge branch 'fix_plugin_admin' into stable Browse Code »

Victor Costa
2015-01-19 17:32:59 -0300
e47daca2 Use default base class for plugin admin controllers Browse Code »

Victor Costa
2015-01-19 17:30:24 -0300