Commit graph

54 commits

Author SHA1 Message Date
differentreality
071cd81029 edit event from admin panel, show actual submitter and update event details 2013-07-28 21:21:54 +03:00
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
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
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
ca8759bc10 visual changes 2013-07-13 09:57:13 +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
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
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
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
Ancor Gonzalez Sosa
93a8979db1 Fixing a slightly broken table in events list 2013-07-11 13:04:08 +02:00
Ancor Gonzalez Sosa
c6956482f0 Speaker can be changed in admin/conference/x/events 2013-07-11 09:04:54 +02:00
Ancor Gonzalez Sosa
3a2bf49f97 Adding and removing people 2013-07-10 16:13:53 +02:00
Henne Vogelsang
83b10447f4 Merge pull request #9 from differentreality/admin_events
Add stats about submissions
2013-07-01 03:28:00 -07:00
Stella Rouzi
030272b28e Add stats about submissions 2013-06-30 10:30:25 +00:00
Henne Vogelsang
252e1fe544 Completely rework the navigation
Get rid of the admin layout
Get rid of the navbar custom style, use bootstrap-sass variables instead
Get rid of all the scaffold files
2013-06-27 16:58:20 +02:00
Henne Vogelsang
9d668ad1b1 Add flexvideo class, enable proposal editing, 2013-06-20 00:26:34 +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
39ca877e5e Count events and use datatables, put all tables into wells 2013-05-07 15:09:13 +02: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
Pavlos Ratis
e3c0085ee3 fixed scrolling
Adding # in the href when you click in the 'Details' it takes you 
to the top and then you should scroll down in order to see the user's Details.
Adding `javascript: void(0)` instead of # we fix scrolling because it doesn't take you to the top.
2013-02-16 23:02:58 +00: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
077036d67c Rename attending_social_events_with_partner 2013-02-06 20:26:41 +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
1d7670d74e Add logo to conference page 2013-01-17 15:56:56 +01:00
Matt Barringer
73c81bbf0a Confirm user emails & fix a bug 2013-01-15 14:36:27 +01:00