Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Development with master #386

Merged
merged 37 commits into from
Nov 4, 2016
Merged

Merge Development with master #386

merged 37 commits into from
Nov 4, 2016

Conversation

vnbang2003
Copy link
Contributor

No description provided.

vnbang2003 and others added 30 commits October 26, 2016 03:14
@vnbang2003 @Praseetha-KR
Added More stat for report page
9b10a4b
@vnbang2003 @Praseetha-KR
Moved div on top
3175ae6
@vnbang2003 @Praseetha-KR
Fixed Pep8 issue for reports views.py
935d247
@Praseetha-KR
Change fonts, Add content_full block
f2deb50
@Praseetha-KR
Redesign home banner, intro & categories sections
d0ef456
@Praseetha-KR
Move button as sass component, btn-theme as base class for home featu…
75b2750 
…res buttons
@Praseetha-KR
Include all sass dirs to compile
1352603
@Praseetha-KR
Fetch latest 6 upcoming workshops for index page
267ca8f
@Praseetha-KR
Add upcoming workshops section + styling
bdd15a3
@Praseetha-KR
Add justifiedGallery lib
f117b27
@Praseetha-KR
Include workshop photo gallery in home page
774c0c1
@Praseetha-KR
Modify worshops card styling
87f8556
@Praseetha-KR
Adds twitter widget
4f8c583
@Praseetha-KR
Adds testimonial section
452e30c
@Praseetha-KR
Update SITE_INFO.footer with dict instead of template string
16b53ad
@Praseetha-KR
Update footer structure
cf7392a
@Praseetha-KR
Split view for testimonial & twitter widget, dark theme for footer + …
f4200e4 
…minor styling fixes
@Praseetha-KR
Page banner class added on all templates with gradient fill
ddb8ef1
@Praseetha-KR
Add organisation partner role section
1c138d2
@Praseetha-KR
Spacing class generator, Replace prose-type with title-type, Replace …
305cac6 
…all occurances of updated classes in templates
@Praseetha-KR
Add blogs section, Move testimonials to above gallery
70db612
@Praseetha-KR
Add all upcoming workshops table in home page
17f9458
@Praseetha-KR
Non authenticated nav items, signup link as button in base navigation
b4757d7
@Praseetha-KR
Formatting of FAQ page
fbdd58e
@Praseetha-KR
Clean up layouting in non-authentcated nav links pages
17099f9
@Praseetha-KR
Update roles section with created icons, Enable partner section
c3a85a7
@Praseetha-KR
Change section bg with theme color
af801ec
@Praseetha-KR
Adds updated css
02756ca
@Praseetha-KR
Adds back removed changes with rebase, Open footer social media urls …
2d6fd14 
…in new tab
@Praseetha-KR
Update css file
fa3196c
vnbang2003 and others added 7 commits October 26, 2016 08:01
@vnbang2003
Merge pull request #380 from pythonindia/design-v2
ab40227 
Design v2 - basic changes
@vnbang2003
Fix #382
f0631b5 
Fix #382
@vnbang2003
Fix #302 added roles and more testimonial in index page
32e852e 
Fix #302 added roles and more testimonial in index page
@vnbang2003
Fix: #383 added partnership page and add changed partnership link in …
d88a2ee 
…home page

Fix: #383  added partnership page and add changed partnership link in
home page
@vnbang2003
Removed wrong name
bde3117 
Removed wrong name
@vnbang2003
Clean up variable name
bd59a78 
Clean up variable name
@vnbang2003
Added contact email in dict
68d807e 
Added contact email in dict
@coveralls
Copy link

coveralls commented Nov 4, 2016 •
edited
Loading

Coverage Status

Coverage increased (+1.9%) to 86.951% when pulling 68d807e on development into a5ee202 on master.

@vnbang2003 vnbang2003 merged commit 4f370a5 into master Nov 4, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vnbang2003 @coveralls @Praseetha-KR