Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • da82edf26d Enhanced sponsorship features Hiroshi Miura 2015-06-21 11:11:04 +09:00
  • 1d43ca5a66 add japanese translation Hiroshi Miura 2015-06-18 10:05:31 +09:00
  • 91ae3de6df Merge pull request #75 from miurahr/proposal_status Patrick Altman 2015-06-18 23:04:29 -05:00
  • c97711d9b7 Merge pull request #77 from miurahr/i18n-more Patrick Altman 2015-06-18 23:01:20 -05:00
  • 702ddf9a2d Merge pull request #78 from miurahr/unicode Patrick Altman 2015-06-18 23:00:50 -05:00
  • 86669ee3d5 Merge pull request #79 from miurahr/show-review-result Patrick Altman 2015-06-18 23:00:27 -05:00
  • 2aa805a01d Merge pull request #81 from miurahr/multiple-speakers Patrick Altman 2015-06-18 22:59:36 -05:00
  • 7dc043b9ab Merge pull request #80 from miurahr/sessionrole Patrick Altman 2015-06-18 22:56:03 -05:00
  • a41fb8bd35 schedule: add session and session role Hiroshi Miura 2015-06-15 18:55:54 +09:00
  • 44deb8a536 i18n for more mesages Hiroshi Miura 2015-06-12 01:39:29 +09:00
  • 5948aacd93 Internatinalize status label - undecided Hiroshi Miura 2015-06-17 10:43:44 +09:00
  • 464d85b36a Display proposal result status in proposal admin change lists Hiroshi Miura 2015-06-17 08:30:41 +09:00
  • 45706074d6 admin: show review result Hiroshi Miura 2015-06-12 08:07:49 +09:00
  • 3dd2f14f72 multiple recipients for email Hiroshi Miura 2015-06-12 08:04:22 +09:00
  • edb3336aa7 notify to multiple speakers Hiroshi Miura 2015-06-12 01:36:11 +09:00
  • 039ce4e000 Return unicode from _unicode_ methods Hiroshi Miura 2015-05-25 08:35:55 +09:00
  • 7ff4c0b4ef Ignore linting the settings import Patrick Altman 2014-12-18 08:18:48 -06:00
  • 71e9ca11bd Namespace the apps Patrick Altman 2014-12-18 08:17:58 -06:00
  • 5f311ca7bd Replace dotted notation FKs with actual objects Patrick Altman 2014-12-18 08:17:35 -06:00
  • 2ec9449e38 Not necessary Patrick Altman 2014-12-18 08:16:07 -06:00
  • d488c1e021 Use timezone.now instead of datetime.now Patrick Altman 2014-12-18 08:15:47 -06:00
  • a33e1cfb1f Rename get_query_set to get_queryset Patrick Altman 2014-12-18 08:15:07 -06:00
  • b7d1d1a968 Fix the appconf Patrick Altman 2014-12-18 08:14:32 -06:00
  • b694901831 Remove migrations Patrick Altman 2014-12-18 08:14:17 -06:00
  • ba1df47d69 Remove templates Patrick Altman 2014-12-18 08:13:10 -06:00
  • 5d8b092319 Just focus on Django 1.7+ Patrick Altman 2014-12-18 08:09:26 -06:00
  • 60e7095cac Add .egg-info to gitignore Patrick Altman 2014-12-18 08:08:56 -06:00
  • 94a8a4bbac Merge pull request #67 from codersquid/newdocs Patrick Altman 2014-12-17 12:03:57 -06:00
  • 450bf3f5e4 adds a starting page about the example project Sheila Miguez 2014-12-16 20:32:09 -06:00
  • 8d415ef1dd updating docs, add content management section Sheila Miguez 2014-08-27 16:14:41 -05:00
  • aeb784b3cd Add tox file and clean up a lint error Patrick Altman 2014-12-15 16:25:00 -06:00
  • 894e7b1b2e Upgrade requirements Patrick Altman 2014-12-15 16:20:05 -06:00
  • 6d0e5bc508 Merge branch 'pyohio-master' Patrick Altman 2014-12-15 16:08:12 -06:00
  • f3614fcf52 Merge branch 'master' of https://github.com/pyohio/symposion into pyohio-master Patrick Altman 2014-12-15 16:07:37 -06:00
  • 5c57512b04 Merge branch 'KyivPy-master' Patrick Altman 2014-12-15 15:29:43 -06:00
  • 5e4a6e4407 Use sha1 instead of sha256 for compatibility Patrick Altman 2014-12-15 15:29:17 -06:00
  • 2f89311d42 Merge branch 'master' of https://github.com/KyivPy/symposion into KyivPy-master Patrick Altman 2014-12-15 15:26:57 -06:00
  • 9721593cc0 Merge branch 'mbrochh-django1.6-compatibility' Patrick Altman 2014-12-15 15:16:28 -06:00
  • cb4b0fac38 Merge branch 'django1.6-compatibility' of https://github.com/mbrochh/symposion into mbrochh-django1.6-compatibility Patrick Altman 2014-12-15 15:15:46 -06:00
  • f4c4009c4d Merge pull request #64 from codersquid/json_placeholders Sheila Miguez 2014-09-28 12:55:49 -05:00
  • 2c97ec7106 adds placeholder values for future model changes to ProposalBase" Sheila Miguez 2014-09-28 12:52:41 -05:00
  • 0fb224cbf6 Merge pull request #62 from codersquid/json_endpoint Sheila Miguez 2014-09-28 10:45:35 -05:00
  • 40a55c24c7 flake8 fix Sheila Miguez 2014-09-21 21:26:19 -05:00
  • 2b91a7296c added cancelled element to json, used taavis start/end props Sheila Miguez 2014-09-21 21:25:18 -05:00
  • 0ebcc2f124 flake8 fixes Sheila Miguez 2014-09-21 21:11:12 -05:00
  • 51709c6eaf adds a schedule json endpoint. based on @taavi's PR #45 with some changes from the @pyohio/pyohio repo Sheila Miguez 2014-09-20 20:20:04 -05:00
  • c4db94b7e5 Adds a schedule_json view which provides a /schedule/conference.json endpoint, of the kind that Carl uses for producing conference videos. Taavi Burns 2013-09-29 17:02:01 -04:00
  • a4c4e6953c Merge pull request #63 from codersquid/flake8scheduleform Sheila Miguez 2014-09-27 12:27:15 -05:00
  • ee1f4d92a5 flake8 fixes for the schedule edit form. imports were missing. added a TODO for the atomic call, which is not supported in django 1.4 Sheila Miguez 2014-09-27 12:10:24 -05:00
  • 2f6930ae11 Fixes #12; 500 error when re/un assigning slot presentations David Ray 2014-08-11 16:33:23 -04:00
  • c17a4cbda1 Merge pull request #49 from pyohio/pyohio-sponsorship-redirect Patrick Altman 2014-07-31 23:37:34 -05:00
  • 3029878925 Merge pull request #51 from pyohio/pyohio-schedule-builder Patrick Altman 2014-07-31 23:37:01 -05:00
  • 819616ce0c Merge pull request #50 from pyohio/pyohio-messages-proposal-submit Patrick Altman 2014-07-31 23:34:54 -05:00
  • a6cd048f43 added source English PO Brian Rosner 2014-07-31 14:54:10 -06:00
  • 745d16df0b Merge pull request #58 from chromano/master Patrick Altman 2014-07-31 09:55:01 -05:00
  • f557337433 Increase code complexity in travis configuration Carlos Henrique Romano 2014-07-31 08:57:45 -03:00
  • 08939f1f3e Remove unused code Carlos Henrique Romano 2014-07-30 15:57:45 -03:00
  • 6d5c24e635 Merge pull request #56 from chromano/master Patrick Altman 2014-07-30 16:16:03 -05:00
  • 0486af4bba Remove unused code Carlos Henrique Romano 2014-07-30 15:57:45 -03:00
  • 36ab6d599f Fix flake8 warnings Carlos Henrique Romano 2014-07-30 15:19:26 -03:00
  • 96596dc5dd Update and rename README.md to README.rst Patrick Altman 2014-07-16 20:33:55 -04:00
  • 47621e54af Create .travis.yml Patrick Altman 2014-07-12 21:31:18 -04:00
  • 108407f1fd Update year in copyright Patrick Altman 2014-07-10 14:18:00 -06:00
  • fb26371362 Updated year in licence Volodymyr Hotsyk 2014-07-05 16:49:01 +03:00
  • fc4b1c4542 Updated urls to 1.6 Volodymyr Hotsyk 2014-07-05 16:46:01 +03:00
  • 3ad6d4cfef Update sha_constructor to hashlib.sha256 Volodymyr Hotsyk 2014-07-05 16:21:49 +03:00
  • 7596729ec1 Update to Django=1.6 Volodymyr Hotsyk 2014-07-05 16:11:43 +03:00
  • 5b853f9300 Fixes #11 David Ray 2014-06-19 23:55:15 -04:00
  • bf4b682e8a Bugfix: Cannot unassign presentation on schedule/edit view Martin Brochhaus 2014-05-18 15:50:51 +08:00
  • 17256038c7 fix typos David Ray 2014-03-04 08:47:19 -05:00
  • 18077539a9 add schedule docs David Ray 2014-03-03 14:10:28 -05:00
  • b7ecf8984c add tests for build schedule form David Ray 2014-03-03 13:48:24 -05:00
  • 650ddd2bcc resolve merge conf David Ray 2014-03-03 13:47:46 -05:00
  • 7b35bcae72 adding back in ws David Ray 2014-03-03 08:38:47 -05:00
  • 64a39b8706 resolve merge conflict David Ray 2014-02-28 12:17:48 -05:00
  • c5aad692ff Show message when user does not have permission to access proposal submission page Rebecca Lovewell 2014-02-25 21:36:32 -05:00
  • 1861ad2926 Redirect to dashboard if there are no benefits to edit. Rebecca Lovewell 2014-02-11 11:26:56 -05:00
  • 6b9fb3a49d Merge pull request #10 from pyohio/6-schedule-builder David Ray 2014-03-04 14:23:12 -05:00
  • 0e4dcef2a0 fix typos David Ray 2014-03-04 08:47:19 -05:00
  • 55ad74ab12 add schedule docs David Ray 2014-03-03 14:10:28 -05:00
  • 0ce5e36c24 add tests for build schedule form David Ray 2014-03-03 13:48:24 -05:00
  • 62289cad36 make private methods more robust David Ray 2014-03-03 13:47:46 -05:00
  • 6102c4e5e4 adding back in ws David Ray 2014-03-03 08:38:47 -05:00
  • 5f27b01452 remove unecessary check David Ray 2014-02-28 12:17:48 -05:00
  • 4d1e9cf78e work on #6, needs tests David Ray 2014-02-28 10:55:54 -05:00
  • 2f75033dc5 update dep David Ray 2014-02-26 13:56:19 -05:00
  • b80cdfdb29 Merge pull request #9 from pyohio/proposal-submit-messages David Ray 2014-02-26 11:05:53 -05:00
  • 6de322216d Show message when user does not have permission to access proposal submission page Rebecca Lovewell 2014-02-25 21:36:32 -05:00
  • 3711ddf24e Merge pull request #8 from pyohio/sponsorship-redirect Rebecca 2014-02-11 11:47:22 -05:00
  • bc3dfd6c4c Redirect to dashboard if there are no benefits to edit. Rebecca Lovewell 2014-02-11 11:26:56 -05:00
  • 9833a6a27c Loosen django-forms-bootstrap requirement Rebecca Lovewell 2014-02-11 09:24:03 -05:00
  • 5024e5e1f4 Merge pull request #7 from pyohio/update-requirements Rebecca 2014-02-03 07:32:09 -08:00
  • 8d5461d05d Loosen Django requirement Rebecca Lovewell 2014-01-31 17:31:32 -05:00
  • e92dee1e0e Update easy-thumbnails from 1.2 -> 1.4 Rebecca Lovewell 2014-01-31 17:30:32 -05:00
  • 8e85290107 Update django-taggit from 0.9.3 -> 0.11.2 Rebecca Lovewell 2014-01-31 17:30:05 -05:00
  • 6d4e7b1eb1 Update django-sitetree from 0.9.4 -> 1.0.0 Rebecca Lovewell 2014-01-31 17:29:36 -05:00
  • 8b7b097314 Update django-reversion from 1.7 -> 1.8 Rebecca Lovewell 2014-01-31 17:28:54 -05:00
  • 6ab7e498ec Upgrade django-markitup from 1.0.0 -> 2.1 Rebecca Lovewell 2014-01-31 17:27:58 -05:00
  • cf09df2204 Merge branch 'pyflakes' David Ray 2014-01-16 10:49:06 -05:00
  • c654c5aabb restore settings import as django-appconf relies on it being there David Ray 2014-01-16 10:48:39 -05:00