Merge Request #3
← To merge requests
From
themes
into
master
Commits (19)
-
Conflicts: index.html.erb
- 8 of 19 commits displayed. Click here to show all
2 participants
-
Milestone changed to 2016.03
-
Added 13 new commits:
- 5b219f8d - Added unit test to profile-data directive and refactor quickComponent helper method
- e386083e - Fix helpers.ts type problems and added conditional to show profile custom-fields table
- b07589aa - Move post comment component to its folder
- c3af8dfc - Allow themes to define its own styles
- 5d1782a3 - Allow themes to override templates
- 815efe22 - Put theme instructions in readme
- 4f0fedbc - Keep the themes folder
- b6916ac9 - Build dist for all themes
- db64e490 - Create noosfero files when build themes
- ec4b3f1d - Move rede-brasil images to theme
- 44488be8 - Merge stream in gulp noosfero task
- 9b488cc7 - Remove the old link to index.html.erb
- a0265570 - Copy theme asset files when build
-
Added 9 new commits:
- 34a8852e - Allow themes to define its own styles
- e1207c66 - Allow themes to override templates
- 8dfabb21 - Put theme instructions in readme
- 91b52f87 - Keep the themes folder
- ef1ab2c5 - Build dist for all themes
- 74c0c1d0 - Create noosfero files when build themes
- 998eed36 - Move rede-brasil images to theme
- 538fcde0 - Merge stream in gulp noosfero task
- 1085e5cf - Merge branch 'themes' of softwarepublico.gov.br:noosfero-themes/angular-theme into themes
-
mentioned in commit 21f901f190286bf54e6e9d8aa48d56dee4fc5f1f
