Commits on Mar 7, 2015
  1. @daonb
  2. @daonb

    improving persons merge

    daonb committed Mar 7, 2015
Commits on Mar 2, 2015
  1. @MeirKriheli
  2. @MeirKriheli

    Merge pull request #330 from daonb/osubs_v0.7

    Improved Persons
    MeirKriheli committed Mar 2, 2015
Commits on Feb 22, 2015
  1. @daonb

    Merge branch 'osubs_v0.7'

    daonb committed Feb 22, 2015
  2. @daonb
  3. @daonb
  4. @daonb

    avoiding duplicate external info

    daonb committed Feb 22, 2015
Commits on Feb 21, 2015
  1. Merge branch 'master' of https://github.com/lidermanrony/Open-Knesset

    * '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
    committed Feb 21, 2015
  2. translation for last commits

    committed Feb 21, 2015
  3. Merge branch 'master' of https://github.com/iradcn/Open-Knesset

    * 'master' of https://github.com/iradcn/Open-Knesset:
      nonexisting tags can be added to suggested tags table, need translation
    committed Feb 21, 2015
  4. @lidermanrony

    issue #172: an _extremely_ partial remediation. issue should not be c…

    …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
    lidermanrony committed Feb 21, 2015
  5. Merge branch 'support-storing-arbitrary-data-for-facebook-apps' of ht…

    …tps://github.com/OriHoch/Open-Knesset
    
    * 'support-storing-arbitrary-data-for-facebook-apps' of https://github.com/OriHoch/Open-Knesset:
      support storing arbitrary data for facebook apps
    committed Feb 21, 2015
  6. fix the email that i broke :/

    committed Feb 21, 2015
  7. @OriHoch
  8. use yairchu's fix of pyth

    committed Feb 21, 2015
Commits on Feb 20, 2015
  1. add lobbyists auto complete

    committed Feb 20, 2015
  2. Merge branch 'master' of github.com:hasadna/Open-Knesset

    * '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
      ...
    Ofri Raviv committed Feb 20, 2015
Commits on Feb 17, 2015
  1. @daonb
  2. @daonb
Commits on Feb 11, 2015
  1. @daonb
  2. @daonb

    Merge branch 'master' of github.com:daonb/Open-Knesset

    Conflicts:
    	persons/management/commands/import_persons_csv.py
    daonb committed Feb 11, 2015
  3. @daonb
  4. @daonb

    Adding management command import_person_csv

    the new command imports a csv file from an external source and adds its
    info to the Person and related models
    daonb committed Feb 11, 2015
Commits on Feb 10, 2015
  1. @daonb
  2. @daonb
  3. @daonb
  4. @daonb

    Merge remote-tracking branch 'hasadna/master'

    Conflicts:
    	persons/admin.py
    	persons/management/commands/parse_candidates.py
    daonb committed Feb 10, 2015
Commits on Feb 9, 2015
  1. @MeirKriheli
  2. @MeirKriheli
  3. @MeirKriheli