Skip to content
This repository has been archived by the owner on Dec 23, 2017. It is now read-only.

Feature/filings tab #350

Merged
merged 54 commits into from
Jul 22, 2015

Conversation

jmcarp
Copy link
Contributor

@jmcarp jmcarp commented Jul 22, 2015

Fix more merge conflicts.

jmcarp added 30 commits July 9, 2015 15:02
Marco Segreto and others added 24 commits July 20, 2015 14:48
This fixes the filter panel on mobile by creating a new component
element. It does not fix the template organization problem. This
was done to make the merge conflict in fecgov#337 easier as it's less code
that will be modified.
Use Jinja blocks for flexible generic filters.
Also changing the column headers from "Total contributed" to "Total received"
Still more work to do, but this is a start.
…FEC-web-app into feature/committee-schedule-b
LindsayYoung added a commit that referenced this pull request Jul 22, 2015
@LindsayYoung LindsayYoung merged commit 8042786 into fecgov:feature/filings-tab Jul 22, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants