* 'master' of https://github.com/lidermanrony/Open-Knesset: issue #172: an _extremely_ partial remediation. issue should not be considered as solved. this only solves the issue for votes page and the from_date and to_date filels. long term solution should be somehow reusing the same filter code in the API and in the views
…onsidered as solved. this only solves the issue for votes page and the from_date and to_date filels. long term solution should be somehow reusing the same filter code in the API and in the views
* 'master' of github.com:hasadna/Open-Knesset: (71 commits) Implement BaseNonModelResource to fix member-bills api Fix broken test for URI scheme without the protocol Update MK's embed doc according to Benny's recent change Update bootstrap-rtl version persons_cleanup bugfixes small bugs do a better job of connecting candidates to mks improve person merging and cleanup improve person's merge Switch addtoany to allow https Switch google cse to https Fix wrong location of piwik code Update piwik analytics Fix the MK tooltip to modify only text elements Fatten our Person, adding external information #315 Adding 'merge persons' action in admin fixing person tests support running the local dev server on https Accessability changes Better contrast for link and alerts colors Removing a silly filter ...