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

727 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anna Ossowski
90768e786f Update README.rst 2016-02-26 23:33:32 +01:00
Patrick Altman
3b635d9cb7 Merge pull request #120 from appropriatetech/master 
Python3 compatibility
 2016-02-20 17:06:57 -06:00
Patrick Altman
27cb1cf776 Merge pull request #118 from pydata/loosen-django-requirement 
Loosen Django package requirement.
 2016-02-20 17:06:27 -06:00
Patrick Altman
a1cbcdddd5 Add back in parsing the content override into html 2016-02-20 17:06:09 -06:00
Patrick Altman
6e83588f31 Merge pull request #119 from pydata/fix-duplicate-slot-save-method 
Remove duplicate Slot.save method.
 2016-02-20 17:05:29 -06:00
Patrick Altman
6bee00dff7 Merge pull request #122 from pydata/sponsor-listing-text-is-none 
Make sponsor description default empty string.
 2016-02-20 17:04:32 -06:00
Patrick Altman
73a087c801 Merge pull request #123 from pydata/unpublished-schedule 
Don't show unpublished schedule info to non-staff.
 2016-02-20 17:03:26 -06:00
Martey Dodoo
6b41b5c477 Don't show unpublished schedule info to non-staff. 
Add checks to schedule_list, schedule_list_csv, and
schedule_presentation_detail views to verify that either schedule is
published or that current user is staff before displaying information.

See c7592bc33e.
 2016-02-20 08:39:12 -05:00
Anna Ossowski
47b65ac330 Update README.rst 2016-02-01 20:45:16 +01:00
Martey Dodoo
a487f78f7e Make sponsor description default empty string. 
Set sponsor listing text to an empty string instead of None. If a
sponsor doesn't have a benefit named "Sponsor Description", this will
prevent the text "None" from displaying in the Django template.
 2016-01-25 15:17:23 -05:00
Anna Ossowski
4f59d7a9a1 Update README.rst 2016-01-21 01:16:12 +01:00
Mjumbe Wawatu Ukweli
47c28439d9 Python3 compatibility 
Update the StringIO import in symposion.sponsorship.views
 2016-01-12 20:39:55 -05:00
Martey Dodoo
ddc3553656 Remove duplicate Slot.save method. 
Remove "save" method in Slot model since #107 added another "save"
method. This fixes the automated test failures in Travis CI.
 2015-12-31 12:35:22 -05:00
Patrick Altman
46a10b9e3a Merge pull request #107 from miurahr/gen_str_name_when_save 
slot: generate __unicode__ name when save()
 2015-12-28 10:50:32 -06:00
Patrick Altman
de23056b51 Merge pull request #115 from miurahr/pip8 
fix pip8 warnings
 2015-12-28 10:50:06 -06:00
Martey Dodoo
5b9f4fb71e Loosen Django package requirement. 
Loosen Django requirement to allow versions greater or equal to 1.8.5,
instead of mandating 1.8.5. This makes it easier to use newer releases
of Django (e.g. the bugfix and security releases 1.8.6 or 1.8.7) with
symposion.
 2015-12-12 15:34:58 -05:00
Anna Ossowski
75f9739c5c Update README.rst 2015-10-27 20:16:28 +01:00
Patrick Altman
f997e0761a Merge pull request #116 from hivernales/fix-sponsorbenefit-str 
Fix SponsorBenefit __str__
 2015-10-26 08:02:57 -05:00
Didier Raboud
b50a42f243 Fix SponsorBenefit __str__ by using self.benefit.type instead of self.benefit_type 2015-10-26 12:40:22 +01:00
Hiroshi Miura
d68e310089 fix pip8 warnings 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2015-10-17 10:57:18 +09:00
Patrick Altman
031ee3807e Fix typo 2015-10-16 19:54:11 -05:00
Patrick Altman
11f697d137 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
 2015-10-16 12:37:35 -05:00
Anna Ossowski
8b4282a48e Update README.rst 2015-10-07 12:17:36 +02:00
Hiroshi Miura
c040257547 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>
 2015-10-01 16:57:26 +09:00
Patrick Altman
a3c89ece12 Use pinax-pages instead 2015-09-13 21:43:02 -05:00
Patrick Altman
ba0bb84ad7 Use django-boxes instead 2015-09-13 21:40:28 -05:00
Patrick Altman
6dd80f9ddb Fix some flake8 issues 2015-09-13 21:34:40 -05:00
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