Merge Request #5
0 up
0 down
← To merge requests
From
noosfero-integration
into
master
×
How to merge
Step 1. Update the repo and checkout the branch we are going to merge
git fetch origin git checkout -b noosfero-integration origin/noosfero-integration
Step 2. Merge the branch and push the changes to GitLab
git checkout master git merge --no-ff noosfero-integration git push origin master
Noosfero integration
This integrates Colab/Noosfero apps in means of CSS/JS. Tasks accomplished whithin this merge:
- Added noosfero proxy as a Django app
- Remake of Colab navbar and footer
Merged by Sergio Oliveira
Source branch has been removed
Commits (121)
-
This was already set by Noosfero
-
c8b1f3b1 Merge branch 'noosfero-integration' of beta.softwarepublico.gov.br:softwarepubli… ... Browse Code »
…co/colab into noosfero-integration Conflicts: colab/proxy/noosfero/views.py
- 8 of 121 commits displayed. Click here to show all
2 participants
Sergio Oliveira
started a discussion on the
outdated diff
last updated by
Charles Oliveira
colab/proxy/noosfero/static/noosfero/fonts/glyphicons-halflings-regular.svg
| ... | ... | @@ -0,0 +1,228 @@ |