gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
171 commits 15 branches 2 tags 50 MiB
Commit graph

142 commits

Author SHA1 Message Date
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
7e930d8d40 Getting rid of plain sql in stats_controller 2013-07-16 15:50:32 +02:00
Ancor Gonzalez Sosa
26236424cc Fixing a typo 2013-07-16 15:50:13 +02:00
Ancor Gonzalez Sosa
45b95584e0 Merge branch 'statistics' of github.com:differentreality/osem into differentreality-statistics 2013-07-16 15:43:22 +02:00
Ancor Gonzalez Sosa
e30d1630c7 Merge pull request #25 from ancorgs/feature_xlsx 
xlsx export for registrations list
 2013-07-16 00:49:22 -07:00
Ancor Gonzalez Sosa
9af4393928 xlsx export for registrations list 2013-07-16 09:47:23 +02:00
Ancor Gonzalez Sosa
4eefbc17b4 Merge pull request #23 from miska/master 
Printable schedule
 2013-07-15 08:34:08 -07:00
Ancor Gonzalez Sosa
b9cd54a256 Fixing a bug introduced in f53af55a74 2013-07-15 16:07:23 +02:00
Michal Hrusecky
bf1390166a First version of schedule printing style 2013-07-15 12:24:50 +02:00
Michal Hrusecky
d27b43f82d Apply styles to all media 
There are some media dependent parts of styles already and anyway, it's better
to have at least some style to begin with.
 2013-07-15 12:22:57 +02:00
Michal Hrusecky
11f75a16d2 Do not use <br> 
Using styles instead of hardcoded <br> tags.
 2013-07-15 12:22:07 +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
8f34baecf6 add nickname and affiliation in registrations list 2013-07-15 06:45:32 +03:00
differentreality
7b0c1ac6f5 Show first name last name on the schedule 2013-07-14 20:59:24 +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
ca8759bc10 visual changes 2013-07-13 09:57:13 +03:00
differentreality
c68126ab1f define attendees var 2013-07-12 21:13:17 +03:00
differentreality
76614b858c fix query for supporters 2013-07-12 20:57:57 +03:00
differentreality
6a951f1f21 wording in message 2013-07-12 20:37:57 +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
c7f326765c move attended field left before edit 2013-07-12 19:30:51 +03:00
differentreality
4532ad8c0a new registration 2013-07-12 19:29:48 +03:00
Henne Vogelsang
84d30e13f0 And more registrations fixes... 2013-07-12 15:32:41 +02:00
Henne Vogelsang
9e92d1f593 More fixes for the regitrations tab 2013-07-12 15:27:46 +02:00
Henne Vogelsang
27812216b9 Now make it hackable and work with or without data 2013-07-12 15:21:05 +02:00
Henne Vogelsang
d96f7d5332 Tabify the statistics page 2013-07-12 14:28:48 +02:00
Henne Vogelsang
83b20dfc58 Merge pull request #18 from differentreality/stats 
Stats
 2013-07-12 04:43:23 -07:00
differentreality
19b11a79ff Edit registration for admin 2013-07-12 13:37:30 +03:00
differentreality
463430b3e8 Allow delete of registration only to admins (not organizers) 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
5437cd5226 attended field as true in new registrations created by admin 2013-07-12 13:37:29 +03:00
differentreality
949cbd6a6c error messages 2013-07-12 13:31:42 +03:00
differentreality
f42b7eae57 add nick and affiliation 2013-07-12 13:31:42 +03:00
differentreality
d2709f0570 admin adds new user/person and registration 2013-07-12 13:31:41 +03:00
differentreality
e59dbb0208 fix 2013-07-12 13:27:11 +03:00
differentreality
f39d72bf5d minor 2013-07-12 12:48:46 +03:00
differentreality
a71a16922c Add admin stats page 2013-07-12 12:30:31 +03:00
Henne Vogelsang
7e43a00098 Merge pull request #16 from ancorgs/master 
Fixing the json generated by admin/conference/x/events
 2013-07-11 05:32:28 -07:00
Henne Vogelsang
b2fb19c6cc Merge pull request #15 from ancorgs/feature_addpeople 
Fixing a slightly broken table in events list
 2013-07-11 05:32:17 -07:00
Ancor Gonzalez Sosa
b54b098a19 Fixing the json generated by admin/conference/x/events 2013-07-11 13:49:50 +02:00
Ancor Gonzalez Sosa
93a8979db1 Fixing a slightly broken table in events list 2013-07-11 13:04:08 +02:00
Henne Vogelsang
00af4e0aee Merge pull request #13 from differentreality/event_registration 
Event registration
 2013-07-11 02:47:32 -07:00