Merge Request #263
← To merge requests
From
fixed_gov_user_modal
into
master
Fixed gov user modal
Fixed govuser_modal must be merged after siorg branch
Commits (4)
-
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
-
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
-
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
-
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
-
Added 6 new commits:
-
Added 29 new commits:
- a6afdeb5 - Fixed colab tabs
- 6e893217 - Removing mezuro from iptables rules of database
- 3acc3677 - Adding monitor machine
- 2e3bb388 - Bumps version for colab-deps colab and noosfero
- ddd9254f - Add new tab link
- 2e96e9f5 - Merge branch 'add_tab_link' into 'master'
- 6135aa2f - Adding fix for cookbooks
- d4e966c1 - Adding a sample of config environment
- bcb32095 - Fix for preconfig task
- 3c5f9fd6 - Fixed a noosfero design bug
- 3a000162 - Fixed global modification
- 87f7a333 - Fix link to mailinglist
- 70d4f9b5 - Merge branch 'fix_colab_list_link' into 'master'
- adb7fe36 - Adds error highlight to institutions input
- ba4c0a5b - Merge branch 'institution_error_highlight' into 'master'
- 2cdb8b4f - Fix test: regular user now can create institution
- d49b2288 - Fix interation with organization_ratings plugin
- d7737eac - Redirect user when not logged in
- 8badd05d - Merge branch 'organization_ratings_improvements' into 'master'
- 37794dc3 - Add 'SIORG code' field and reorganize some fields on create institution forms
- 4d0beccb - Add translations related to siorg field
- 526cca84 - Validate format of siorg_code and add test
- bf8193c2 - Merge branch 'siorg_field_only' into 'master'
- 4af821e8 - SPB release 5.0a22
- 0c616a39 - Fixes software_catalog cucumber test
- d139ca2b - SPB release 5.0a23
- cab1ca15 - fixed noosfero conflict
- bd921519 - Fixed cancel button to avoid use javascrit action
- c019b407 - Fix create instutution form with colab profile
-
mentioned in commit 3620f232554e03a5221122fbd02cbded39e83d36