Stella
|
3105c8da5d
|
question builder
|
2014-02-09 18:05:57 +02:00 |
|
Henne Vogelsang
|
4356616566
|
Merge pull request #29 from differentreality/voting_fixes
Voting fixes
|
2014-01-23 03:25:28 -08:00 |
|
Henne Vogelsang
|
9d09d6d038
|
Merge pull request #28 from differentreality/event_registration
Show No of registrations for proposal, in proposal index page
|
2014-01-23 03:25:04 -08:00 |
|
Stella
|
8ca2e53430
|
show voting options only if rating is enabled (>0)
|
2013-12-28 16:20:00 +02:00 |
|
Stella
|
de1ed9be2b
|
Fixes for voting on proposals. 0 for no voting option. Set default value in migration to avoid blank/null problems.
|
2013-12-28 15:29:50 +02:00 |
|
Henne Vogelsang
|
0e1a6b9771
|
Show the supporter_level title, not the class
|
2013-10-22 15:56:44 +02:00 |
|
Henne Vogelsang
|
8aeeabebab
|
Updated the gems, add missing migration for the stats controller, fix most obvious issues with stats
|
2013-10-22 15:52:29 +02:00 |
|
Henne Vogelsang
|
52d1785a7c
|
Fix managing user roles
|
2013-10-22 14:16:20 +02:00 |
|
differentreality
|
87551e88f8
|
Create charts for registrations
Conflicts:
app/controllers/admin/stats_controller.rb
app/views/admin/stats/index.html.haml
|
2013-09-18 12:19:13 +03:00 |
|
differentreality
|
9cf5c59f28
|
final registrations stats
Conflicts:
app/views/admin/stats/index.html.haml
|
2013-09-18 12:15:38 +03:00 |
|
differentreality
|
29d048ee7d
|
Add length along with type title to differentiate between types with same name and different length
|
2013-09-04 13:49:30 +03:00 |
|
differentreality
|
d603d0830f
|
fix events stats table
|
2013-09-04 13:49:29 +03:00 |
|
Henne Vogelsang
|
406b7dcd2d
|
Merge pull request #42 from differentreality/proposal_event_types
Show length of event types in new proposal drop down
|
2013-09-04 02:19:18 -07:00 |
|
Henne Vogelsang
|
6c050ccbc2
|
Merge pull request #41 from differentreality/stats_fix
Fixing some numbers there
|
2013-09-03 02:42:05 -07:00 |
|
differentreality
|
e6b7fbceb5
|
fix
|
2013-09-02 16:38:43 +03:00 |
|
differentreality
|
a0dc62b125
|
Changes based on comments
|
2013-09-02 16:15:02 +03:00 |
|
differentreality
|
aaa77bb893
|
allow stars from 1 to 10, 1 star being the default
|
2013-09-02 15:58:09 +03:00 |
|
differentreality
|
9125bafe4a
|
Show length of event types in new proposal drop down
|
2013-09-01 18:19:25 +03:00 |
|
differentreality
|
e3828c0a74
|
wording
|
2013-08-16 16:11:53 +03:00 |
|
differentreality
|
1d59c05591
|
fix rebase conflict
|
2013-08-16 16:11:21 +03:00 |
|
differentreality
|
69efd2619a
|
fix rebase conflict
|
2013-08-16 16:08:38 +03:00 |
|
differentreality
|
96d14f14de
|
fix rebase conflict
|
2013-08-16 16:06:36 +03:00 |
|
differentreality
|
609b3d45fe
|
check if voting is enabled by organizers
|
2013-08-16 16:06:01 +03:00 |
|
differentreality
|
834362491e
|
star voting system for proposals
|
2013-08-16 16:06:01 +03:00 |
|
Henne Vogelsang
|
b70ba985af
|
Merge pull request #28 from differentreality/cfp
Cfp option to accept changes in events
|
2013-08-15 02:31:36 -07:00 |
|
Henne Vogelsang
|
5ea8a9438e
|
Merge pull request #30 from differentreality/navbar_name
show public name and email on top navbar
|
2013-08-15 02:30:30 -07:00 |
|
differentreality
|
a13a084f3e
|
fixing stat numbers
|
2013-07-30 11:41:39 +03:00 |
|
Henne Vogelsang
|
ef556f02ca
|
Merge pull request #34 from differentreality/admin_events_list
Admin events list
|
2013-07-29 04:40:25 -07:00 |
|
Henne Vogelsang
|
5602d9d9be
|
Merge pull request #32 from differentreality/venue
Minor layout change to single line box for venue name and address
|
2013-07-29 04:39:30 -07:00 |
|
Henne Vogelsang
|
0f229f3db0
|
Merge pull request #31 from differentreality/schedule_show_by_date
Schedule show by date
|
2013-07-29 04:38:59 -07:00 |
|
differentreality
|
b5c002ad77
|
show public name and email on top navbar
|
2013-07-29 08:59:40 +03:00 |
|
differentreality
|
adb04ab82e
|
show current day's schedule
|
2013-07-29 02:01:24 +03:00 |
|
differentreality
|
4a41336bff
|
layout change to single line box for venue name and address
|
2013-07-28 22:41:32 +03:00 |
|
differentreality
|
1686c61e7c
|
change track from events list
|
2013-07-28 22:10:45 +03:00 |
|
differentreality
|
3b201f951a
|
Hide stats by default
|
2013-07-28 21:37:25 +03:00 |
|
differentreality
|
071cd81029
|
edit event from admin panel, show actual submitter and update event details
|
2013-07-28 21:21:54 +03:00 |
|
differentreality
|
0590da056e
|
Do not show New submission button if cfp is closed, unless organizer or admin
|
2013-07-28 13:11:34 +03:00 |
|
differentreality
|
d7ae2ba29b
|
Allow title edit for confirmed proposal if organizer or admin and do not allow event type change for confirmed/unconfirmed proposals if schedule_changes is not set, unless it is done by an admin or organizer
|
2013-07-28 13:03:22 +03:00 |
|
differentreality
|
c91156ae0c
|
Do not allow title change after proposal is confirmed
|
2013-07-28 11:49:47 +03:00 |
|
differentreality
|
d9d889eb9f
|
Option for proposal changes
|
2013-07-28 11:48:56 +03:00 |
|
Ancor Gonzalez Sosa
|
08637503e5
|
schedule renders 10x faster now. Caching disabled
|
2013-07-16 18:16:37 +02: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
|
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 |
|
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 |
|