Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
700 commits 2 branches 0 tags 57 MiB
Commit graph

700 commits

This branch
This branch
All branches
Author SHA1 Message Date
Patrick Altman
d23363621b Merge branch 'miurahr-i18n-all' 2015-09-08 15:07:36 -05:00
Patrick Altman
67433cacb4 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
 2015-09-08 15:07:24 -05:00
Patrick Altman
eff643e1bb Merge branch 'miurahr-admin_sponsor_benefit' 2015-09-08 15:03:15 -05:00
Patrick Altman
509e275706 Merge branch 'admin_sponsor_benefit' of https://github.com/miurahr/symposion into miurahr-admin_sponsor_benefit 
Conflicts:
	symposion/sponsorship/admin.py
	symposion/sponsorship/models.py
 2015-09-08 15:03:06 -05:00
Patrick Altman
ff07405ff0 Merge pull request #114 from uranusjr/timezone-field 
Replace django-timezones w/ django-timezone-field
 2015-09-08 14:56:38 -05:00
Patrick Altman
ffd428d497 Merge pull request #100 from miurahr/python3_compatibility 
python3 compatibility
 2015-09-08 14:55:49 -05:00
Patrick Altman
5a71fc5922 Merge pull request #97 from pinax/schedule-admin 
add to schedule admin
 2015-09-08 14:54:02 -05:00
Patrick Altman
8a95b0861c Merge branch 'master' into schedule-admin 
Conflicts:
	symposion/schedule/admin.py
 2015-09-08 14:51:49 -05:00
Anna Ossowski
b5cf9f1541 Update README.rst 2015-08-28 14:41:11 +02:00
Anna Ossowski
5c4b92cf5a Update README.rst 2015-08-19 17:42:58 +02:00
Anna Ossowski
e0482190be Update README.rst 2015-08-06 18:20:46 +02:00
Tzu-ping Chung
1b51ef2ad8 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".
 2015-08-04 13:47:35 +08:00
Hiroshi Miura
3207621058 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>
 2015-08-03 23:37:33 +09:00
Hiroshi Miura
a95825ede8 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>
 2015-08-03 23:32:25 +09:00
Patrick Altman
f7caf14357 Merge pull request #85 from miurahr/export_sponsor_zip 
Enhanced sponsorship: export files
 2015-08-03 08:01:44 -05:00
Patrick Altman
cf4168ca6a Merge pull request #87 from miurahr/sponsorship-display-url 
display_url
 2015-08-03 08:00:14 -05:00
Patrick Altman
41dc93198d Merge pull request #88 from miurahr/sponsorship-admin-contacts 
admin contact
 2015-08-03 07:59:44 -05:00
Patrick Altman
356bc7f7f4 Merge pull request #95 from miurahr/dist-locale-file 
distribute locale files in source and binary package
 2015-08-03 07:59:25 -05:00
Patrick Altman
c161f55c43 Merge pull request #89 from miurahr/sponsorship-i18n-benefit 
i18n sponsor fields
 2015-08-03 07:59:09 -05:00
Patrick Altman
2fcd773238 Merge pull request #96 from miurahr/l10n-japanese 
add japanese translation
 2015-08-03 07:58:53 -05:00
Patrick Altman
20dc0ca737 Merge pull request #103 from miurahr/signup-form-fields-order 
reorder signup fields
 2015-08-03 07:56:52 -05:00
Patrick Altman
e632d84d22 Merge pull request #105 from miurahr/drop-chosen 
drop old unused chosen
 2015-08-03 07:54:19 -05:00
Patrick Altman
249eae067b Merge pull request #109 from miurahr/fix_additional_speakers_constraint 
add more addtitional speakers constraints
 2015-08-03 07:48:34 -05:00
Patrick Altman
135a79a97b Merge pull request #110 from miurahr/slot_name_with_rooms 
slot name includes rooms
 2015-08-03 07:44:57 -05:00
Patrick Altman
dbe9074212 Merge pull request #111 from miurahr/admin_inline_schedules 
Inline schedule edit for admin
 2015-08-03 07:44:17 -05:00
Hiroshi Miura
acd5e9595a slot name includes rooms 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-08-01 13:06:43 +09:00
Hiroshi Miura
32e8c27df9 admin: inline edit day and slotroom 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-08-01 13:03:55 +09:00
Hiroshi Miura
55814a57b3 admin: inline edit section 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-08-01 13:00:22 +09:00
Hiroshi Miura
b3e7b1be8c add more addtitional speakers constraints 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-31 09:25:46 +09:00
Hiroshi Miura
c22bcf9cf4 fix OrderedDict import error in Py2.6 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-20 12:03:54 +09:00
Hiroshi Miura
fa66316f8a form key ordering: detect django version 
- Django 1.6 and before use SortedDict instead of OrderedDict
  It detect version and return proper dict for key ordering.
- field deletion is done by reorder funcion.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-20 11:54:30 +09:00
Hiroshi Miura
6f3115aee8 reorder signup fields 
current implementation is not work on Django 1.7+
anymore. This modification activate feature
in Django 1.7+ and drop support for Django 1.6 and before.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-19 14:33:13 +09:00
Sheila Miguez
7cff2d8b1d add to schedule admin 2015-07-15 16:43:44 -05:00
Hiroshi Miura
0fa4801941 drop old unused chosen 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-11 16:02:35 +09:00
Hiroshi Miura
d174008149 sponsor benefit type richitext, simple and option 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-11 11:28:57 +09:00
Hiroshi Miura
0d7df4db00 sponsor benfit is complete? 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-11 11:28:52 +09:00
Hiroshi Miura
8bc696a2dc sponsorship benefit relation administration 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-07-11 11:27:12 +09:00
Hiroshi Miura
a9efef01d0 distribute locale files 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-26 09:22:36 +09:00
Hiroshi Miura
b50974263c i18n sponsor fields 
Feedback from PyConJP development

```
commit 5973e32ebdc231b209b5c058664e8b2b4a1dbc54
Author: MURAOKA Yusuke <yusuke@jbking.org>
Date:   Mon Mar 31 15:35:40 2014 +0900

    introduce Benefit.content_type which is used to display localized
    text
```

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 15:44:23 +09:00
Hiroshi Miura
3653cf3c69 admin contact 
Feedback from pycon development

```
    commit eb3261c12c910ec562e016f10431cc48747baef8
    Author: Dan Poirier <dpoirier@caktusgroup.com>
    Date:   Wed Aug 21 11:51:20 2013 -0400

            Enhanced sponsor admin page

```

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 15:42:19 +09:00
Hiroshi Miura
c43b84fe94 display_url 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 15:16:22 +09:00
Hiroshi Miura
999c458c1b add test 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 14:39:18 +09:00
Hiroshi Miura
fbf356b335 add export sponsor data zip command 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 14:39:18 +09:00
Hiroshi Miura
da82edf26d Enhanced sponsorship features 
It is a part of feedback from PyConJP development.
Here picks a sponsorship benefit management enhancement.

* sponsor zip download
* export sponsor data as csv

```
commit eb3261c12c910ec562e016f10431cc48747baef8
Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Wed Aug 21 11:51:20 2013 -0400

    Enhanced sponsor admin page

    For #67:

    * admin list sorted by name
    * not limited to 100 per page
    * a sortable visual indicator for each sponsorship benefit
      (completed, missing, not applicable)
    * also the sponsorship level, admin contact name, and an active
      or not indication
    * the ones we have today: print logo, web logo, print
      description, web description and the ad.
    * an action pick list like “email” and check mark the sponsors
    * I want to email based on the assets that are missing.
    * in subject and body, replace %%NAME%% by sponsor name
```

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 14:39:18 +09:00
Hiroshi Miura
1d43ca5a66 add japanese translation 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-21 12:51:36 +09:00
Patrick Altman
91ae3de6df Merge pull request #75 from miurahr/proposal_status 
Display proposal result status in proposal admin change lists
 2015-06-18 23:04:29 -05:00
Patrick Altman
c97711d9b7 Merge pull request #77 from miurahr/i18n-more 
internationalize some messages
 2015-06-18 23:01:20 -05:00
Patrick Altman
702ddf9a2d Merge pull request #78 from miurahr/unicode 
Return unicode from _unicode_ methods
 2015-06-18 23:00:50 -05:00
Patrick Altman
86669ee3d5 Merge pull request #79 from miurahr/show-review-result 
admin: show review result
 2015-06-18 23:00:27 -05:00
Patrick Altman
2aa805a01d Merge pull request #81 from miurahr/multiple-speakers 
Multiple speakers
 2015-06-18 22:59:36 -05:00