differentreality
adb04ab82e
show current day's schedule
2013-07-29 02:01:24 +03:00
Ancor Gonzalez Sosa
7f3c8a65de
Only confirmed events in JSON API
2013-07-16 18:42:22 +02:00
Ancor Gonzalez Sosa
08637503e5
schedule renders 10x faster now. Caching disabled
2013-07-16 18:16:37 +02:00
Ancor Gonzalez Sosa
740a604c01
Adding api/v1/conferences/x/conferences
...
* A little weird, but needed by suseconferenceclient
2013-07-16 17:04:48 +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
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
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
differentreality
8f34baecf6
add nickname and affiliation in registrations list
2013-07-15 06:45:32 +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
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
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
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
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
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
Ancor Gonzalez Sosa
b54b098a19
Fixing the json generated by admin/conference/x/events
2013-07-11 13:49:50 +02:00
Henne Vogelsang
00af4e0aee
Merge pull request #13 from differentreality/event_registration
...
Event registration
2013-07-11 02:47:32 -07:00
Ancor Gonzalez Sosa
c6956482f0
Speaker can be changed in admin/conference/x/events
2013-07-11 09:04:54 +02: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
d95d8f234b
json API for suseconferenceclient
2013-07-08 10:07:12 +02:00
Ancor Gonzalez Sosa
27017a4823
WIP: first prototype of the JSON API.
...
* Tests not included, so I cannot prove that it works
2013-07-04 14:02:50 +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
c18400f9df
Make it possible to view proposals from the schedule
2013-06-20 17:24:41 +02:00
Henne Vogelsang
9d668ad1b1
Add flexvideo class, enable proposal editing,
2013-06-20 00:26:34 +02:00
Henne Vogelsang
2d79e8e692
Cache the schedule page, fix empty rooms
2013-06-19 20:56:37 +02:00
Henne Vogelsang
b2f8cfbec3
First version of the non-js schedule. Removed the assets from version control.
2013-06-19 13:58:48 +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
178e584730
Fix confirming of proposals
2013-05-07 17:00:26 +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
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
59fe29c1a4
Force new users to fill out their name before trying to register
2013-02-06 18:43:10 +01:00
