[Git][noosfero/noosfero][federation] 77 commits: comment_paragraph: change filename of exported comments

Larissa Reis gitlab at mg.gitlab.com
Fri Jul 22 09:03:33 BRT 2016 

Larissa Reis pushed to branch federation at Noosfero / noosfero


Commits:
51dcaa95 by Victor Costa at 2016-06-17T10:24:48-03:00
comment_paragraph: change filename of exported comments

- - - - -
0e7d549b by Caio SBA at 2016-06-20T13:21:38-03:00
Merge branch 'field-of-interest'

- - - - -
18406b23 by Caio SBA at 2016-06-20T14:13:08-03:00
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
e34ffc64 by Caio SBA at 2016-06-28T18:21:35-03:00
Merge branch 'master' of gitlab.com:noosfero/noosfero

- - - - -
fa30ade2 by Caio SBA at 2016-06-28T22:19:29-03:00
Ticket #76: Adding a plugin "recent_activities" which adds a block that list the recent activities of the profile who owns it

- - - - -
38fbfe9d by Braulio Bhavamitra at 2016-06-29T15:09:56-03:00
responsive: Fix profile url

- - - - -
e0416de4 by Braulio Bhavamitra at 2016-06-29T17:46:07-03:00
analytics: identify bots and filter them out by default

- - - - -
e707963e by Bráulio Bhavamitra at 2016-06-29T20:56:50+00:00
Merge branch 'analytics-plugin' into 'master'

analytics: identify bots and filter them out by default

This needs riot.js/serializers/i18n-js/js-routes

See merge request !735
- - - - -
fbdee132 by Hugo Melo at 2016-06-29T18:34:56-03:00
Move requires_email to organization so that enterprise doesn't crash

- - - - -
19372a8e by Tallys Martins at 2016-07-04T14:54:32-03:00
Display layout_template on api

 - Environments and profiles now return the layout template used.

Signed-off-by: Tallys Martins <tallysmartins at gmail.com>

- - - - -
41f4497b by Leandro Nunes dos Santos at 2016-07-04T17:39:08-03:00
CustomFormsPlugin: should not escape javascripts elements

- - - - -
4c3b31a3 by Leandro Nunes dos Santos at 2016-07-04T18:19:18-03:00
CustomFormsPlugin: avoid html safe for nil class

- - - - -
8b7097ab by Leandro Nunes dos Santos at 2016-07-04T18:49:13-03:00
avoid random failure in locale test

- - - - -
9c9ff797 by Caio SBA at 2016-07-04T22:54:27-03:00
Ticket #76: Setting block expiration, fixing crash and adding a disclaimer about privacy

- - - - -
3660383a by Leandro Nunes dos Santos at 2016-07-05T12:48:06-03:00
fix html safe in community administration menu

- - - - -
e36981ca by Leandro Nunes dos Santos at 2016-07-05T13:17:57-03:00
should not escape welcome message html code

- - - - -
26c8903c by Leandro Nunes dos Santos at 2016-07-05T13:24:09-03:00
trust in html code generated for emails

- - - - -
f5e79695 by Leandro Nunes dos Santos at 2016-07-05T13:45:06-03:00
fix wrong html parser

- - - - -
829a7963 by Leandro Nunes dos Santos at 2016-07-05T14:02:26-03:00
fix unit test logic

- - - - -
4615d072 by Leandro Nunes dos Santos at 2016-07-05T14:03:05-03:00
should trust in task html code

- - - - -
0c447053 by Marcos Ronaldo at 2016-07-05T14:30:26-03:00
Organization ratings: show rejected msg to admin

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>

- - - - -
5ff5e42b by Leandro Nunes dos Santos at 2016-07-05T17:38:54-03:00
should not escape html code of gallery pagination

- - - - -
73abf8b8 by Daniela Feitosa at 2016-07-06T14:16:44+00:00
Merge branch 'recent-activities' into 'master'

Recent activities

Adding a plugin "recent_activities" which adds a block that list the recent activities of the profile who owns it:

![76](/uploads/000199ff2aaf4dd40f8f905ce11d884d/76.png)

See merge request !972
- - - - -
4d031bf1 by Daniela Soares Feitosa at 2016-07-06T14:20:52+00:00
recent_activities: displays only action trackers on block

The profile activities returns action trackers and scraps, but the
scraps should not be displayed on recent activities block. Only the
action tracker records

Related to merge request !972

- - - - -
0e247535 by Rodrigo Souto at 2016-07-07T19:13:59-03:00
spaminator: update mailer to rials4 new scheme

- - - - -
9cb92a3a by Rodrigo Souto at 2016-07-07T19:14:22-03:00
spaminator: make a proper link to forgot password

- - - - -
97b4ad83 by Larissa Reis at 2016-07-07T19:18:29-03:00
Merge branch 'spaminator-mailing'

spaminator: update mailer to rails4 new scheme

See merge request !971

- - - - -
12db0abc by Leandro Nunes dos Santos at 2016-07-11T12:48:06-03:00
make ubuntu precise quick-start works

- - - - -
4f262d0c by Larissa Reis at 2016-07-12T18:40:00-03:00
video plugin: Set default thumbnail dimensions to avoid crash with nil value on gallery page

- - - - -
87bd3f7a by Leandro Nunes dos Santos at 2016-07-13T18:01:31-03:00
should not escape html notification for article creation

- - - - -
861182f0 by Daniela Feitosa at 2016-07-13T22:49:07+00:00
Merge branch 'layout_template_on_api' into 'master'

Display layout_template on api

- Environments and profiles now return the layout template used.

@marcosronaldo can you take a look at this? We'll use it on angular theme. 

See merge request !968
- - - - -
0fbb8b5d by Victor Costa at 2016-07-14T09:48:41-03:00
api: add and remove members from profile

- - - - -
5d45f662 by Joenio Costa at 2016-07-14T19:10:19+00:00
Merge branch 'task_after_cancel' into 'master'

Organization_ratings: Show rejected message to admins

Show rejected message to admins on organization_ratings plugin. Only environment admins can see the rejected message.

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>

See merge request !969
- - - - -
ee9a46b6 by Leandro Nunes at 2016-07-14T21:28:08+00:00
Merge branch 'join-community-api' into 'master'

api: add and remove members from profile



See merge request !977
- - - - -
a96fed84 by Leandro Nunes dos Santos at 2016-07-15T15:44:13-03:00
should not escape language html code in site info

- - - - -
442eed8f by Michel Felipe at 2016-07-15T16:51:35-03:00
New environment field exposes

- - - - -
f678092a by Braulio Bhavamitra at 2016-07-16T12:01:33-03:00
concerns: Organize existing concerns in application controller

- - - - -
76e29aed by Braulio Bhavamitra at 2016-07-16T16:55:30-03:00
concerns: move most lib files models concerns

- - - - -
fceeac68 by Braulio Bhavamitra at 2016-07-17T18:31:34-03:00
tests: Remove unecessary test request/response

- - - - -
8b945809 by Marcos Ronaldo at 2016-07-17T19:57:24-03:00
Profile followers feature

Signed-off-by: Alessandro Caetano <alessandro.caetanob at gmail.com>
Signed-off-by: Artur Bersan de Faria <arturbersan at gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
Signed-off-by: Matheus Miranda <matheusmirandalacerda at gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323 at gmail.com>
Signed-off-by: Victor Matias Navarro <victor.matias.navarro at gmail.com>
Signed-off-by: Vitor Barbosa <vitormga15 at gmail.com>

- - - - -
bfaf133d by Larissa Reis at 2016-07-18T13:28:57-03:00
Updates schema

- - - - -
e78974a8 by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes indentation and typo

- - - - -
432cfc1c by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes setting items in profile

Concern needs to be included before first use of setting items

- - - - -
7f3c26b0 by Larissa Reis at 2016-07-18T13:28:57-03:00
Uses a New button with icon for new circle

- - - - -
f2992440 by Larissa Reis at 2016-07-18T13:28:57-03:00
Only shows distinct followers in profile.followers

- - - - -
cfe6f768 by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes followers related controllers to use current profile instead of logged in user

Lists and edits followers and circles in control panel of profile that
is being viewed instead of logged in person. Also unfollow person in
control panel based on current viewed profile instead of current logged
in user.

This is necessary because sometimes an environment admin is editing
someone else's profile and those actions should be performed on that
profile instead of admin's profile.

- - - - -
c5156e92 by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes a failing profile follower test

- - - - -
788d99fe by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes migration to use any role in community when creating community followers

- - - - -
80057103 by Larissa Reis at 2016-07-18T13:28:57-03:00
Fixes migration to create all friendship groups

- - - - -
63f25af1 by Larissa Reis at 2016-07-18T13:28:57-03:00
Creates a circle for each friendship group

- - - - -
e5b81bcf by Gabriel Silva at 2016-07-18T13:28:57-03:00
Filters request type in profile_controller

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
6fa989a8 by Larissa Reis at 2016-07-18T13:30:03-03:00
Merge branch 'noosfero-master_profile_followers' into 'master'

Profile followers feature

Signed-off-by: Alessandro Caetano <alessandro.caetanob at gmail.com>
Signed-off-by: Artur Bersan de Faria <arturbersan at gmail.com>
Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
Signed-off-by: Matheus Miranda <matheusmirandalacerda at gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323 at gmail.com>
Signed-off-by: Victor Matias Navarro <victor.matias.navarro at gmail.com>
Signed-off-by: Vitor Barbosa <vitormga15 at gmail.com>

See merge request !976

- - - - -
d0cc3c8a by Larissa Reis at 2016-07-18T15:04:14-03:00
Fixes unfollowing profile to use POST request

- - - - -
88fd96e9 by Larissa Reis at 2016-07-18T15:29:02-03:00
Fixes foreign key on profile followers migration

- - - - -
15f77ee3 by Larissa Reis at 2016-07-18T15:29:02-03:00
Correctly remove followers from circle when unfriend

- - - - -
bde4a4f8 by Larissa Reis at 2016-07-18T17:40:59-03:00
profile followers: Fixes failing test

We now remove profile_follewers if its circle is deleted

- - - - -
56cc28dc by Leandro Nunes at 2016-07-19T21:14:46+00:00
Merge branch 'filename-comment-paragraph' into 'master'

comment_paragraph: change filename of exported comments



See merge request !966
- - - - -
4ab09e4f by Leandro Nunes dos Santos at 2016-07-20T11:01:10-03:00
should task endpoints be accessed only by logged users

- - - - -
4c3176e0 by Tallys Martins at 2016-07-20T11:34:45-03:00
Adds public fields to Profile API

Signed-off-by: Paulo Tada <paulohtfs at gmail.com>
Signed-off-by: Tallys Martins <tallysmartins at gmail.com>

- - - - -
441955c7 by Victor Costa at 2016-07-20T15:12:44+00:00
Merge branch 'task_management_permission' into 'master'

should task endpoints be accessed only by logged users



See merge request !980
- - - - -
19bc212e by Leandro Nunes at 2016-07-20T15:25:51+00:00
Merge branch 'profile_api_improvements' into 'master'

Adds public fields to Profile API

Signed-off-by: Paulo Tada <paulohtfs at gmail.com>
Signed-off-by: Tallys Martins <tallysmartins at gmail.com>

See merge request !981
- - - - -
5c1cc1c2 by Leandro Nunes dos Santos at 2016-07-20T12:30:24-03:00
refactoring tasks endpoint

- - - - -
cfd24ca5 by Michel Felipe at 2016-07-20T14:05:50-03:00
New expose fields to Environmment entity

- - - - -
f2b2ff07 by Leandro Nunes at 2016-07-20T17:14:59+00:00
Merge branch 'environment-exposes-api' into 'master'

API - Environment entity new fields

Added the fields `:signup_intro`, `:terms_of_use` and `:top_url` (exposed using `:host` alias)  to `Environment` entity:

See merge request !982
- - - - -
ada7cf66 by Victor Navarro at 2016-07-21T09:09:40-03:00
Add feature to close tasks in api

Signed-off-by: Marcos Ronaldo <marcos.rpj2 at gmail.com>
Signed-off-by: Victor Navarro <victor.matias.navarro at gmail.com>
Signed-off-by: Vitor Barbosa <vitornga15 at gmail.com>

- - - - -
b047dfa3 by Victor Costa at 2016-07-21T13:26:30+00:00
Merge branch 'api_task' into 'master'

Add endpoint to close task with status

Signed-off-by: Victor Navarro <victor.matias.navarro at gmail.com>
Signed-off-by: Vitor Barbosa <vitornga15 at gmail.com>

See merge request !939
- - - - -
da591cc0 by Victor Costa at 2016-07-21T12:53:20-03:00
api: list all pending tasks for the current person

- - - - -
8cbb739a by Victor Costa at 2016-07-21T12:53:21-03:00
api: expose task data

- - - - -
5899745a by Leandro Nunes dos Santos at 2016-07-21T12:53:21-03:00
remove merge conflit

- - - - -
1617e755 by Leandro Nunes dos Santos at 2016-07-21T12:55:17-03:00
refactoring tasks api enpoints

- - - - -
247e46d3 by Leandro Nunes dos Santos at 2016-07-21T13:14:41-03:00
refactoring task actions

- - - - -
742a886d by Leandro Nunes dos Santos at 2016-07-21T14:07:34-03:00
fix variable name

- - - - -
ca77aeab by Leandro Nunes dos Santos at 2016-07-21T14:39:37-03:00
should not parse html code of block help content

- - - - -
98f67e15 by Leandro Nunes dos Santos at 2016-07-21T14:59:10-03:00
should not parse html of block help quick link

- - - - -
4bfa4aaa by Victor Costa at 2016-07-21T18:56:55+00:00
Merge branch 'all_pending_tasks_api' into 'master'

api: list all pending tasks for the current person



See merge request !979
- - - - -
53a2c9a9 by Victor Costa at 2016-07-21T18:27:12-03:00
api: expose accept/reject attributes from task

- - - - -
0a7afb0f by Larissa Reis at 2016-07-22T09:00:47-03:00
Merge branch 'master' into federation

- - - - -


30 changed files:

- app/api/entities.rb
- app/api/helpers.rb
- app/api/v1/people.rb
- app/api/v1/tasks.rb
- app/controllers/admin/categories_controller.rb
- app/controllers/application_controller.rb
- app/controllers/box_organizer_controller.rb
- app/concerns/authenticated_system.rb → app/controllers/concerns/authenticated_system.rb
- app/helpers/design_helper.rb → app/controllers/concerns/custom_design.rb
- lib/needs_profile.rb → app/controllers/concerns/needs_profile.rb
- + app/controllers/my_profile/circles_controller.rb
- + app/controllers/my_profile/followers_controller.rb
- app/controllers/my_profile/tasks_controller.rb
- app/controllers/public/account_controller.rb
- app/controllers/public/content_viewer_controller.rb
- app/controllers/public/profile_controller.rb
- app/helpers/action_tracker_helper.rb
- app/helpers/application_helper.rb
- app/helpers/boxes_helper.rb
- app/helpers/forms_helper.rb
- app/helpers/profile_helper.rb
- app/jobs/notify_activity_to_profiles_job.rb
- app/mailers/contact.rb
- app/mailers/environment_mailing.rb
- app/mailers/mailing.rb
- app/mailers/organization_mailing.rb
- app/mailers/pending_task_notifier.rb
- app/mailers/scrap_notifier.rb
- app/mailers/task_mailer.rb
- app/mailers/user_mailer.rb


The diff was not included because it is too large.


View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/fa46a8f5fc858a9410e0f3b20753f5ea9e9710f2...0a7afb0f39bee4f3cdb40562ef6fd4995f295142
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160722/eb524974/attachment-0001.html>

More information about the Noosfero-dev mailing list