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

676 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Patrick Altman
7dc043b9ab Merge pull request #80 from miurahr/sessionrole 
schedule: add session and session role
 2015-06-18 22:56:03 -05:00
Hiroshi Miura
a41fb8bd35 schedule: add session and session role 
port from pycon development

Luke Hatcher committed 6889d05
2013-01-31
add session volunteer staff

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-18 23:37:11 +09:00
Hiroshi Miura
44deb8a536 i18n for more mesages 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 18:15:22 +09:00
Hiroshi Miura
5948aacd93 Internatinalize status label - undecided 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 11:43:02 +09:00
Hiroshi Miura
464d85b36a Display proposal result status in proposal admin change lists 
feedback from pycon development

commit 3401cdd8253d86e166d980a1d1eb5ba2de01932d
Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Thu Jun 6 15:10:57 2013 -0400

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-17 11:43:02 +09:00
Hiroshi Miura
45706074d6 admin: show review result 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 08:07:49 +09:00
Hiroshi Miura
3dd2f14f72 multiple recipients for email 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 08:04:22 +09:00
Hiroshi Miura
edb3336aa7 notify to multiple speakers 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-06-12 01:36:11 +09:00
Hiroshi Miura
039ce4e000 Return unicode from _unicode_ methods 
Import from PyCon improvement.

Author: Dan Poirier <dpoirier@caktusgroup.com>
Date:   Mon Jul 8 15:55:33 2013 -0400

    Return unicode from __unicode__ methods

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-05-25 08:35:55 +09:00
Patrick Altman
7ff4c0b4ef Ignore linting the settings import 2014-12-18 08:19:01 -06:00
Patrick Altman
71e9ca11bd Namespace the apps 2014-12-18 08:19:01 -06:00
Patrick Altman
5f311ca7bd Replace dotted notation FKs with actual objects 2014-12-18 08:19:01 -06:00
Patrick Altman
2ec9449e38 Not necessary 2014-12-18 08:19:01 -06:00
Patrick Altman
d488c1e021 Use timezone.now instead of datetime.now 2014-12-18 08:19:01 -06:00
Patrick Altman
a33e1cfb1f Rename get_query_set to get_queryset 2014-12-18 08:19:01 -06:00
Patrick Altman
b7d1d1a968 Fix the appconf 2014-12-18 08:19:01 -06:00
Patrick Altman
b694901831 Remove migrations 
These migrations were written for South. Now that we have Django 1.7,
we will just use Django migrations once we hit a 1.0 release.
 2014-12-18 08:19:01 -06:00
Patrick Altman
ba1df47d69 Remove templates 
These have all been moved to the starter project,
pinax-project-symposion. The reasoning behind this is they are very
specific to the theme (pinax-theme-bootstrap) that the project uses and
not really all that reusable when packaged with this app.
 2014-12-18 08:19:01 -06:00
Patrick Altman
5d8b092319 Just focus on Django 1.7+ 2014-12-18 08:19:01 -06:00
Patrick Altman
60e7095cac Add .egg-info to gitignore 2014-12-18 08:19:01 -06:00
Patrick Altman
94a8a4bbac Merge pull request #67 from codersquid/newdocs 
A start at updating the documentation
 2014-12-17 12:03:57 -06:00
Sheila Miguez
450bf3f5e4 adds a starting page about the example project 2014-12-16 20:32:09 -06:00
Sheila Miguez
8d415ef1dd updating docs, add content management section 2014-12-16 20:28:21 -06:00
Patrick Altman
aeb784b3cd Add tox file and clean up a lint error 2014-12-15 16:25:00 -06:00