differentreality
4d2f0e2111
fix rebase conflict
2013-08-16 16:09:29 +03:00
differentreality
834362491e
star voting system for proposals
2013-08-16 16:06:01 +03:00
differentreality
d9d889eb9f
Option for proposal changes
2013-07-28 11:48:56 +03:00
Ancor Gonzalez Sosa
7f3c8a65de
Only confirmed events in JSON API
2013-07-16 18:42:22 +02:00
Ancor Gonzalez Sosa
bae0be338a
Use render instead of redirect if registration/create fails
2013-07-16 16:03:36 +02:00
Ancor Gonzalez Sosa
243f33ff91
Merge branch 'admin_registrations_attended' of github.com:differentreality/osem into differentreality-admin_registrations_attended
...
Conflicts:
app/controllers/admin/registrations_controller.rb
app/models/registration.rb
2013-07-16 15:59:00 +02:00
Ancor Gonzalez Sosa
9af4393928
xlsx export for registrations list
2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
b9cd54a256
Fixing a bug introduced in f53af55a74
2013-07-15 16:07:23 +02:00
differentreality
7c834347f9
fixes
2013-07-15 13:11:18 +03:00
Henne Vogelsang
83b20dfc58
Merge pull request #18 from differentreality/stats
...
Stats
2013-07-12 04:43:23 -07:00
differentreality
f53af55a74
add pagination, re-arrange view
2013-07-12 13:37:29 +03:00
differentreality
5437cd5226
attended field as true in new registrations created by admin
2013-07-12 13:37:29 +03:00
differentreality
a71a16922c
Add admin stats page
2013-07-12 12:30:31 +03:00
Henne Vogelsang
00af4e0aee
Merge pull request #13 from differentreality/event_registration
...
Event registration
2013-07-11 02:47:32 -07:00
differentreality
1bd779b6c1
fix registration model
2013-07-11 07:47:05 +03:00
differentreality
750e31c11a
add option to pre register to events
2013-07-11 07:43:52 +03:00
Ancor Gonzalez Sosa
cb76a9b7cc
Speaker is displayed instead of submitter un public pages
2013-07-10 16:55:27 +02:00
Ancor Gonzalez Sosa
3a2bf49f97
Adding and removing people
2013-07-10 16:13:53 +02:00
Ancor Gonzalez Sosa
d648ab7cb5
Add 'revision' attribute to Conference, managed by an observer
2013-07-08 10:03:03 +02:00
Henne Vogelsang
94e014ac40
Add video metadata to events
2013-06-26 12:35:25 +02:00
Henne Vogelsang
a11d562dbd
Use gravatars, some schedule layout hacking
2013-06-19 16:06:34 +02:00
Henne Vogelsang
c2e007e2b8
Person.confirmed? isn't private, some schedule fixes
2013-06-19 14:29:14 +02:00
Henne Vogelsang
73013bd3e6
* Add ID and track to the event overview
...
* Get rid of the timezones in the schedule, need to deal with that on output
* Skip auth token verfiy on schedule updates
* Make it possible to withdraw confirmed submissions
* Show if people are not registerd
2013-06-14 13:17:40 +02:00
Henne Vogelsang
a3b6c479e9
Make it possible to uncancel events
2013-05-07 17:05:12 +02:00
Henne Vogelsang
178e584730
Fix confirming of proposals
2013-05-07 17:00:26 +02:00
Matt Barringer
78007a438c
Fix email bug
2013-02-18 20:36:21 +01:00
Matt Barringer
3933e89a9c
Adding social events, which can be used on the registration page
2013-02-16 13:30:53 +01:00
Matt Barringer
df0e75e03a
Fixing a few bugs
2013-02-12 19:17:19 +01:00
Matt Barringer
4b0887e0f3
Add IRC nick to the Person page
2013-02-11 18:10:43 +01:00
Matt Barringer
d7531d6d62
Fixing accept/reject email problem
2013-02-11 17:52:31 +01:00
Matt Barringer
077036d67c
Rename attending_social_events_with_partner
2013-02-06 20:26:41 +01:00
Matt Barringer
a8e2cd4ef9
Fix bug w/ proposal submissions
2013-02-06 20:17:54 +01:00
Matt Barringer
55039e4b31
Don't autogenerate a blank name
2013-02-06 18:45:49 +01:00
Matt Barringer
d6bda2f6dc
Reject supporter codes if they're already used by another email
2013-02-06 07:23:35 +01:00
Matt Barringer
152e8a345d
Working on the backend interface for supporter registrations
2013-02-03 18:12:44 +01:00
Matt Barringer
973913b3bf
Adding more registration options, and starting work on supporter levels
2013-02-02 16:43:47 +01:00
Matt Barringer
57520bb7a9
Add minimum/maximum word lengths to session types
2013-01-31 14:38:58 +01:00
Matt Barringer
64b9764b07
Don't crash on sending registration emails
2013-01-20 13:30:16 +01:00
Matt Barringer
1d7670d74e
Add logo to conference page
2013-01-17 15:56:56 +01:00
Matt Barringer
caa0dec6c4
Fix bug in track list, also send accept/reject mails
2013-01-17 13:56:05 +01:00
Matt Barringer
627e3b7b5f
Better form validation
2013-01-16 08:22:20 +01:00
Matt Barringer
73c81bbf0a
Confirm user emails & fix a bug
2013-01-15 14:36:27 +01:00
Matt Barringer
12b56a436a
Fix new user bug
2013-01-15 13:42:39 +01:00
Matt Barringer
900bcb16d5
Starting to add email sending
2013-01-14 08:49:49 +01:00
Matt Barringer
b801f0dc19
- Restructuring the assets
...
- Worked on the schedule
- Removed some gems
2013-01-11 15:00:54 +01:00
Matt Barringer
3181c1c0d8
Making the user workflow easier
2013-01-08 08:36:21 +01:00
Matt Barringer
6d415d44e3
Add user photos
2013-01-08 07:38:24 +01:00
Matt Barringer
f86232bedf
Added paper_trail, also starting work on the scheduler
2013-01-07 16:45:48 +01:00
Matt Barringer
90b30db9e8
First checkin
2013-01-07 09:04:09 +01:00