Commit graph

21 commits

Author SHA1 Message Date
Ancor Gonzalez Sosa
2553bd4e03 Fixes in registration#show after merging 2013-07-16 16:15:17 +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
differentreality
094e0bb0d0 fix 2013-07-15 13:20:28 +03:00
differentreality
7c834347f9 fixes 2013-07-15 13:11:18 +03:00
differentreality
79ba3c5ea6 as string 2013-07-15 12:29:37 +03:00
differentreality
e4cc6f158f fix new registration, add check if user/person exists but is not registered 2013-07-14 14:39:40 +03:00
differentreality
6fc6e924ef show supporter level below name in registrations list (if other than free) 2013-07-13 10:59:02 +03:00
differentreality
4fd6512af0 minor fix 2013-07-12 20:30:49 +03:00
differentreality
a46ca6707b fix 2013-07-12 20:27:36 +03:00
differentreality
90bda0f140 fix 2013-07-12 20:24:08 +03:00
differentreality
80fe0e234b make attended a button 2013-07-12 19:31:01 +03:00
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
differentreality
19b11a79ff Edit registration for admin 2013-07-12 13:37:30 +03:00
differentreality
6879ca28e5 add option to delete registration 2013-07-12 13:37:29 +03:00
differentreality
f53af55a74 add pagination, re-arrange view 2013-07-12 13:37:29 +03:00
differentreality
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
Henne Vogelsang
3022e8b8e6 Minor features/fixes
* Fix admin sub menus
* Show email address in people#index
* Add User Area link in navbar
* Smaller textareas on proposal#new so you don't have to scroll
* Counting of registrations, users and people
* Use datatables for users and people
* Show event type on admin/events#show
2013-05-07 14:46:33 +02:00
Matt Barringer
077036d67c Rename attending_social_events_with_partner 2013-02-06 20:26:41 +01:00
Matt Barringer
90b30db9e8 First checkin 2013-01-07 09:04:09 +01:00