Merge Request #16
← To merge requests
From
display-content-block
into
master
Commits (2)
-
Reassigned to @mfdeveloper
-
Added 34 new commits:
- cd6f200a - Initial commit for login-block
- 99531814 - Merge remote-tracking branch 'origin/master' into login-block
- 4f1c6294 - Login block component - initial implementation
- e1903c92 - Refactored test methods names
- bdbea3cd - Fixed user since html in login block
- b420f699 - Removed console log
- 49c1ee26 - Merging with master
- 479a013a - Merge remote-tracking branch 'origin/master' into login-block
- f68015db - Fixed merge request issues
- 5161636a - Merge branch 'login-block' into 'master'
- 9a88aab0 - using link list as top menu
- a4fb50e2 - Test behavior of comment component when article doesn't accept comments
- 5cb6e8a3 - Improve gulp build
- 0fdd5d98 - picture for people block participa-consulta-theme
- 1f4da208 - People block style
- 5727b1d8 - Fix build of ckeditor
- 4e270e6c - Fix gulp conf
- 246f026b - Do not show discussion header in regular articles
- b4421c0d - Fix warning in body states classes service
- 39a5fc2d - Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme
- 58a458df - people block style for participa consulta
- 8dde2ffd - using inheritance of classes for box
- 9cf0c6e6 - statistics block style for participa consulta theme
- ab10b960 - align center header content for participa consulta theme
- 00f7087d - Merge branch 'master' of softwarepublico.gov.br:noosfero-themes/angular-theme
- 7921e436 - Fix article cms test
- a7f0a708 - Use block endpoint to get block content
- eb097fe2 - Add test for block service
- 0f9e6899 - Use api_content to get articles for discussion block
- bdd5ee03 - Merge branch 'block-service' into 'master'
- 33b085bf - Add tests for article content hotspot in comment paragraph
- 076a7f18 - Accept grep parameter when running karma
- 29d769ad - Add tests for discussion editor in comment paragraph
- 451be0ef - Display content block initial version
-
mentioned in commit 628d8b3b057d5f461624e8affb7433c9ce3dedee