11 May, 2016
1 commit
-
Temporary fix, waiting for original fix to be merged. Original author: Jon Moss Merge Request: https://github.com/rails/rails/pull/24719 Issue: https://github.com/rails/rails/issues/20678 Signed-off-by: Joenio Costa <joenio@colivre.coop.br> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> (cherry picked from commit 3b60e7ca12eaa9492c7cf5ba74153ca243a25417)
10 May, 2016
6 commits
-
(cherry picked from commit 926ec524478b8d51430268cf12c6c0e74a1ffb62)
-
Signed-off-by: Tallys Martins <tallysmartins@gmail.com> (cherry picked from commit ebe4dfbc101afe8c80a4a23422ecd041ccd82ca9)
-
- Environment admins can now choose the recipients that will recieve an email sent throw the admin panel. There are now 3 options: All users(exclusive with other options) Environment Admins(inclusive with opt below) Profile Admins(inclusive with opt above) Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com> Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com> Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com> Signed-off-by: Omar Junior <omarroinuj@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com> (cherry picked from commit 26a6adaf4f4865483807735d76a9f618198ad0df)
-
(cherry picked from commit 26e5b3d6c63c9359dae7d95ac195ac5f5e008789)
-
- Confirmation modal when joining community - Moderation option in community control panel Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit 7949d4e822a87f1fef6fd229ba5bdf7b5233238c)
-
Signed-off-by: Artur Bersan de Faria <artur_bersan@hotmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit e9dec90f842a327a7474f531436fe961c560efec)
09 May, 2016
1 commit
-
This reverts commit 24083e6697fcd3c3faba908d5d42ffa40e7369a2.
05 May, 2016
1 commit
-
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
04 May, 2016
4 commits
-
(cherry picked from commit 06c36ffd7e9d48f97ed49570201029a1c7beabad)
-
(cherry picked from commit 1924d8b622d5c7925e2736e8b7b3c832abb90f49) Conflicts: lib/noosfero/api/entities.rb
-
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit 1bafef867058ffb54590687467041ede3e7832a5) Conflicts: lib/noosfero/api/helpers.rb test/unit/api/helpers_test.rb
-
(cherry picked from commit 048ccd73a65b80b51816a20a568750b50961d048)
02 May, 2016
2 commits
-
Merge branch 'noosfero-chat-db-dependency' into 'stable-1.5' noosfero-chat: avoid psql command if postgresql is not installed See merge request !830 See merge request !886
-
noosfero-chat: avoid psql command if postgresql is not installed See merge request !830
19 Apr, 2016
25 commits
