Permalink
Commits on Oct 17, 2015
  1. fix pip8 warnings

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Oct 17, 2015
  2. Fix typo

    paltman committed Oct 17, 2015
Commits on Oct 16, 2015
  1. Massively upgrade symposion

    * Remove markitup (to be replaced with Ace editor)
    * Use DUA decorators
    * Removed custom signup bits
    * Upgraded dependencies
    * Added migrations
    * Namespaced template locations
    * Removed html5parser/sanitizer (for now) - parsing functionality
    should be moved out entirely to a hooks
    * Replaced ProposalScoreExpression object with a  function that returns
    F() expressions
    paltman committed Oct 16, 2015
Commits on Oct 7, 2015
  1. Update README.rst

    ossanna16 committed Oct 7, 2015
Commits on Oct 1, 2015
  1. Slot: gen name retrun by __str__() when save()

    This name also used for itemize slots on admin screen
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Jul 25, 2015
Commits on Sep 14, 2015
  1. Use pinax-pages instead

    paltman committed Sep 14, 2015
  2. Use django-boxes instead

    paltman committed Sep 14, 2015
  3. Fix some flake8 issues

    paltman committed Sep 14, 2015
Commits on Sep 8, 2015
  1. Merge branch 'i18n-all' of https://github.com/miurahr/symposion into …

    …miurahr-i18n-all
    
    Conflicts:
    	symposion/boxes/models.py
    	symposion/conference/models.py
    	symposion/schedule/models.py
    	symposion/speakers/models.py
    	symposion/sponsorship/admin.py
    	symposion/sponsorship/models.py
    	symposion/teams/models.py
    paltman committed Sep 8, 2015
  2. Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/sy…

    …mposion into miurahr-admin_sponsor_benefit
    
    Conflicts:
    	symposion/sponsorship/admin.py
    	symposion/sponsorship/models.py
    paltman committed Sep 8, 2015
  3. Merge pull request #114 from uranusjr/timezone-field

    Replace django-timezones w/ django-timezone-field
    paltman committed Sep 8, 2015
  4. Merge pull request #100 from miurahr/python3_compatibility

    python3 compatibility
    paltman committed Sep 8, 2015
  5. Merge pull request #97 from pinax/schedule-admin

    add to schedule admin
    paltman committed Sep 8, 2015
  6. Merge branch 'master' into schedule-admin

    Conflicts:
    	symposion/schedule/admin.py
    paltman committed Sep 8, 2015
Commits on Aug 28, 2015
  1. Update README.rst

    ossanna16 committed Aug 28, 2015
Commits on Aug 19, 2015
  1. Update README.rst

    ossanna16 committed Aug 19, 2015
Commits on Aug 6, 2015
  1. Update README.rst

    ossanna16 committed Aug 6, 2015
Commits on Aug 4, 2015
  1. Replace django-timezones w/ django-timezone-field

    django-timezones does not support Python 3. django-timezone-field is
    a revived fork that does.
    
    For some unknown reason django-timezone-field's TimeZoneField does
    not like positional arguments, so I changed to first argument to a
    kwarg "verbose_name".
    uranusjr committed Aug 4, 2015
Commits on Aug 3, 2015
  1. i18n all part

    - forms for labels and helps
    - views for success or warning messages
    - apps and models verbose_names for admin
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Jun 26, 2015
  2. python3 compatibility

    - Things are suggested in python3 porting guide.
    https://docs.djangoproject.com/en/1.8/topics/python3/
    
         1. adding ```from django.utils.encoding import
         python_2_unicode_compatible```
    
         2. ``` __str__``` instead of ```__unicode__```
         https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods
    
         3. Adding ```from __future__ import unicode_literals``` at the top
         of your Python modules
         https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals
    
         4. Removing the `u` prefix before unicode strings;
         https://docs.djangoproject.com/en/1.8/topics/python3/#unicode-literals
    
    - also closed #66
    
    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Jul 18, 2015
  3. Merge pull request #85 from miurahr/export_sponsor_zip

    Enhanced sponsorship: export files
    paltman committed Aug 3, 2015
  4. Merge pull request #95 from miurahr/dist-locale-file

    distribute locale files in source and binary package
    paltman committed Aug 3, 2015
  5. Merge pull request #89 from miurahr/sponsorship-i18n-benefit

    i18n sponsor fields
    paltman committed Aug 3, 2015
  6. Merge pull request #96 from miurahr/l10n-japanese

    add japanese translation
    paltman committed Aug 3, 2015
  7. Merge pull request #103 from miurahr/signup-form-fields-order

    reorder signup fields
    paltman committed Aug 3, 2015
  8. Merge pull request #105 from miurahr/drop-chosen

    drop old unused chosen
    paltman committed Aug 3, 2015
  9. Merge pull request #109 from miurahr/fix_additional_speakers_constraint

    add more addtitional speakers constraints
    paltman committed Aug 3, 2015
  10. Merge pull request #110 from miurahr/slot_name_with_rooms

    slot name includes rooms
    paltman committed Aug 3, 2015
  11. Merge pull request #111 from miurahr/admin_inline_schedules

    Inline schedule edit for admin
    paltman committed Aug 3, 2015
Commits on Aug 1, 2015
  1. slot name includes rooms

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 1, 2015
  2. admin: inline edit day and slotroom

    Signed-off-by: Hiroshi Miura <miurahr@linux.com>
    miurahr committed Aug 1, 2015