Commit graph

  • 4d2f0e2111 fix rebase conflict differentreality 2013-08-16 16:09:29 +03:00
  • 69efd2619a fix rebase conflict differentreality 2013-08-16 16:08:38 +03:00
  • 96d14f14de fix rebase conflict differentreality 2013-08-16 16:06:36 +03:00
  • 609b3d45fe check if voting is enabled by organizers differentreality 2013-08-16 13:03:31 +03:00
  • 834362491e star voting system for proposals differentreality 2013-08-16 12:46:49 +03:00
  • 2314d943e1 Merge pull request #36 from averi/master Henne Vogelsang 2013-08-16 03:10:00 -07:00
  • c3a6ff83c7 Improve the documentation. Andrea Veri 2013-08-15 16:51:57 +02:00
  • b70ba985af Merge pull request #28 from differentreality/cfp Henne Vogelsang 2013-08-15 02:31:36 -07:00
  • 5ea8a9438e Merge pull request #30 from differentreality/navbar_name Henne Vogelsang 2013-08-15 02:30:30 -07:00
  • 55799aa018 More documentation Henne Vogelsang 2013-08-14 18:45:21 +02:00
  • f8317a4482 ImageMagik is needed too Henne Vogelsang 2013-08-14 18:33:24 +02:00
  • ca6b63c4e2 Document the installation a bit, run last 3 migrations Henne Vogelsang 2013-08-14 18:18:50 +02:00
  • a13a084f3e fixing stat numbers differentreality 2013-07-30 11:41:39 +03:00
  • ef556f02ca Merge pull request #34 from differentreality/admin_events_list Henne Vogelsang 2013-07-29 04:40:25 -07:00
  • f8a6f9626f Merge pull request #33 from differentreality/home Henne Vogelsang 2013-07-29 04:39:52 -07:00
  • 5602d9d9be Merge pull request #32 from differentreality/venue Henne Vogelsang 2013-07-29 04:39:30 -07:00
  • 0f229f3db0 Merge pull request #31 from differentreality/schedule_show_by_date Henne Vogelsang 2013-07-29 04:38:59 -07:00
  • 6d5edfd301 Merge pull request #29 from differentreality/admin_event_edit Henne Vogelsang 2013-07-29 04:37:23 -07:00
  • b5c002ad77 show public name and email on top navbar differentreality 2013-07-29 08:59:40 +03:00
  • 4f582bc7f9 show first day if today is not within the conference date range differentreality 2013-07-29 08:48:04 +03:00
  • adb04ab82e show current day's schedule differentreality 2013-07-29 02:01:24 +03:00
  • 4a41336bff layout change to single line box for venue name and address differentreality 2013-07-28 22:41:32 +03:00
  • ffadfca7a2 show conference until its last day and order by start date differentreality 2013-07-28 22:37:26 +03:00
  • 1686c61e7c change track from events list differentreality 2013-07-28 22:10:45 +03:00
  • 3b201f951a Hide stats by default differentreality 2013-07-28 21:37:25 +03:00
  • 071cd81029 edit event from admin panel, show actual submitter and update event details differentreality 2013-07-28 21:21:54 +03:00
  • 0590da056e Do not show New submission button if cfp is closed, unless organizer or admin differentreality 2013-07-28 13:11:34 +03:00
  • d7ae2ba29b Allow title edit for confirmed proposal if organizer or admin and do not allow event type change for confirmed/unconfirmed proposals if schedule_changes is not set, unless it is done by an admin or organizer differentreality 2013-07-28 13:03:22 +03:00
  • c91156ae0c Do not allow title change after proposal is confirmed differentreality 2013-07-28 11:49:47 +03:00
  • d9d889eb9f Option for proposal changes differentreality 2013-07-28 11:48:56 +03:00
  • 36c9f20e65 Merge f905bb8f8f into d1252ca2f5 Henne Vogelsang 2013-07-26 05:14:55 -07:00
  • f905bb8f8f added Speaker#full_name to the JSON API Ancor Gonzalez Sosa 2013-07-22 11:54:27 +02:00
  • 0c20151de8 Changing date format in JSON API to match suseconferenceclient expectations Ancor Gonzalez Sosa 2013-07-17 13:10:50 +02:00
  • 7f3c8a65de Only confirmed events in JSON API Ancor Gonzalez Sosa 2013-07-16 18:42:22 +02:00
  • 08637503e5 schedule renders 10x faster now. Caching disabled Ancor Gonzalez Sosa 2013-07-16 18:16:37 +02:00
  • 740a604c01 Adding api/v1/conferences/x/conferences Ancor Gonzalez Sosa 2013-07-16 17:04:48 +02:00
  • 2553bd4e03 Fixes in registration#show after merging Ancor Gonzalez Sosa 2013-07-16 16:15:17 +02:00
  • bae0be338a Use render instead of redirect if registration/create fails Ancor Gonzalez Sosa 2013-07-16 16:03:36 +02:00
  • 243f33ff91 Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended Ancor Gonzalez Sosa 2013-07-16 15:59:00 +02:00
  • 7e930d8d40 Getting rid of plain sql in stats_controller Ancor Gonzalez Sosa 2013-07-16 15:50:32 +02:00
  • 26236424cc Fixing a typo Ancor Gonzalez Sosa 2013-07-16 15:50:13 +02:00
  • 45b95584e0 Merge branch 'statistics' of github.com:differentreality/osem into differentreality-statistics Ancor Gonzalez Sosa 2013-07-16 15:43:22 +02:00
  • e30d1630c7 Merge pull request #25 from ancorgs/feature_xlsx Ancor Gonzalez Sosa 2013-07-16 00:49:22 -07:00
  • 9af4393928 xlsx export for registrations list Ancor Gonzalez Sosa 2013-07-16 09:47:23 +02:00
  • 4eefbc17b4 Merge pull request #23 from miska/master Ancor Gonzalez Sosa 2013-07-15 08:34:08 -07:00
  • 79b44f4eb1 Merge pull request #24 from ancorgs/fix_f53af55a Ancor Gonzalez Sosa 2013-07-15 08:31:01 -07:00
  • b9cd54a256 Fixing a bug introduced in f53af55a74 Ancor Gonzalez Sosa 2013-07-15 16:07:23 +02:00
  • bf1390166a First version of schedule printing style Michal Hrusecky 2013-07-15 12:24:50 +02:00
  • d27b43f82d Apply styles to all media Michal Hrusecky 2013-07-15 12:22:57 +02:00
  • 11f75a16d2 Do not use <br> Michal Hrusecky 2013-07-15 12:22:07 +02:00
  • 094e0bb0d0 fix differentreality 2013-07-15 13:20:28 +03:00
  • 7c834347f9 fixes differentreality 2013-07-15 13:11:18 +03:00
  • 79ba3c5ea6 as string differentreality 2013-07-15 12:29:37 +03:00
  • 8f34baecf6 add nickname and affiliation in registrations list differentreality 2013-07-15 06:45:32 +03:00
  • 7b0c1ac6f5 Show first name last name on the schedule differentreality 2013-07-14 20:59:24 +03:00
  • e4cc6f158f fix new registration, add check if user/person exists but is not registered differentreality 2013-07-14 14:39:40 +03:00
  • 6fc6e924ef show supporter level below name in registrations list (if other than free) differentreality 2013-07-13 10:59:02 +03:00
  • ca8759bc10 visual changes differentreality 2013-07-13 09:57:13 +03:00
  • c68126ab1f define attendees var differentreality 2013-07-12 21:13:17 +03:00
  • 76614b858c fix query for supporters differentreality 2013-07-12 20:57:57 +03:00
  • 6a951f1f21 wording in message differentreality 2013-07-12 20:37:57 +03:00
  • 4fd6512af0 minor fix differentreality 2013-07-12 20:30:49 +03:00
  • a46ca6707b fix differentreality 2013-07-12 20:27:36 +03:00
  • 90bda0f140 fix differentreality 2013-07-12 20:24:08 +03:00
  • 80fe0e234b make attended a button differentreality 2013-07-12 19:11:47 +03:00
  • c7f326765c move attended field left before edit differentreality 2013-07-12 17:43:37 +03:00
  • 4532ad8c0a new registration differentreality 2013-07-12 17:40:27 +03:00
  • 84d30e13f0 And more registrations fixes... Henne Vogelsang 2013-07-12 15:32:41 +02:00
  • 9e92d1f593 More fixes for the regitrations tab Henne Vogelsang 2013-07-12 15:27:46 +02:00
  • 27812216b9 Now make it hackable and work with or without data Henne Vogelsang 2013-07-12 15:21:05 +02:00
  • d96f7d5332 Tabify the statistics page Henne Vogelsang 2013-07-12 14:28:48 +02:00
  • 83b20dfc58 Merge pull request #18 from differentreality/stats Henne Vogelsang 2013-07-12 04:43:23 -07:00
  • 841f02b7db Merge pull request #17 from differentreality/admin_users Henne Vogelsang 2013-07-12 04:15:41 -07:00
  • 19b11a79ff Edit registration for admin differentreality 2013-07-12 11:43:31 +03:00
  • 463430b3e8 Allow delete of registration only to admins (not organizers) differentreality 2013-07-12 11:06:16 +03:00
  • 6879ca28e5 add option to delete registration differentreality 2013-07-12 10:54:59 +03:00
  • f53af55a74 add pagination, re-arrange view differentreality 2013-07-12 10:45:40 +03:00
  • 3ec3944406 create migration for adding field 'attended' in registrations table differentreality 2013-07-12 10:28:08 +03:00
  • 5437cd5226 attended field as true in new registrations created by admin differentreality 2013-07-12 10:24:51 +03:00
  • 949cbd6a6c error messages differentreality 2013-07-12 09:21:38 +03:00
  • f42b7eae57 add nick and affiliation differentreality 2013-07-12 09:10:33 +03:00
  • d2709f0570 admin adds new user/person and registration differentreality 2013-07-12 08:44:20 +03:00
  • e59dbb0208 fix differentreality 2013-07-12 13:27:11 +03:00
  • f39d72bf5d minor differentreality 2013-07-12 12:48:46 +03:00
  • a71a16922c Add admin stats page differentreality 2013-07-12 12:30:31 +03:00
  • 7e43a00098 Merge pull request #16 from ancorgs/master Henne Vogelsang 2013-07-11 05:32:28 -07:00
  • b2fb19c6cc Merge pull request #15 from ancorgs/feature_addpeople Henne Vogelsang 2013-07-11 05:32:17 -07:00
  • b54b098a19 Fixing the json generated by admin/conference/x/events Ancor Gonzalez Sosa 2013-07-11 13:49:50 +02:00
  • 93a8979db1 Fixing a slightly broken table in events list Ancor Gonzalez Sosa 2013-07-11 13:04:08 +02:00
  • 00af4e0aee Merge pull request #13 from differentreality/event_registration Henne Vogelsang 2013-07-11 02:47:32 -07:00
  • 207f2dcdca Merge pull request #14 from ancorgs/feature_addpeople Henne Vogelsang 2013-07-11 02:46:49 -07:00
  • c6956482f0 Speaker can be changed in admin/conference/x/events Ancor Gonzalez Sosa 2013-07-11 09:04:54 +02:00
  • 3192ad9d4c show no of pre-registered people in proposal list differentreality 2013-07-11 08:21:02 +03:00
  • 1bd779b6c1 fix registration model differentreality 2013-07-11 07:47:05 +03:00
  • 9a4571b290 fix space differentreality 2013-07-11 07:45:16 +03:00
  • 750e31c11a add option to pre register to events differentreality 2013-07-11 07:43:52 +03:00
  • cb76a9b7cc Speaker is displayed instead of submitter un public pages Ancor Gonzalez Sosa 2013-07-10 16:55:27 +02:00
  • 3a2bf49f97 Adding and removing people Ancor Gonzalez Sosa 2013-07-10 16:13:53 +02:00
  • 8ea94eb205 Merge pull request #12 from ancorgs/master Henne Vogelsang 2013-07-08 02:33:24 -07:00
  • d95d8f234b json API for suseconferenceclient Ancor Gonzalez Sosa 2013-07-08 10:07:12 +02:00