Chrisbr
b095064108
Fix eventtypes form
2014-04-30 10:47:33 +02:00
Chrisbr
8154e6f72c
Fixes Hound CI violations
2014-04-28 21:42:09 +02:00
Chrisbr
169fab5c31
Fixes cfp form
2014-04-28 20:52:02 +02:00
Chrisbr
ba2051afc7
Fixes email settings form
2014-04-28 20:31:44 +02:00
Chrisbr
810908089e
Refactoring: Removes not necessary named parameters
2014-04-28 20:25:43 +02:00
Chrisbr
229581efc3
Fixes eventtype form
2014-04-28 20:08:06 +02:00
Chrisbr
c67b255e05
Fixes tracks form
2014-04-28 20:01:20 +02:00
Chrisbr
c4fbf8d038
Fixes rooms form
2014-04-28 19:58:49 +02:00
Chrisbr
ec0543ef3b
dropped first()
2014-04-27 17:38:30 +02:00
Chrisbr
fbda757e70
Replaced find_all_by through find_by
...
Find_by_all is removed in Rails 4.1
2014-04-27 16:27:29 +02:00
Henne Vogelsang
aa17d6ea6f
Merge pull request #64 from differentreality/fix_no_bio
...
save person attributes first
2014-04-23 15:04:55 +02:00
Stella
5e881faef2
fix controller (find and json output). Now attachments get listed (no preview though)
2014-04-21 21:13:25 +03:00
Stella
735d1ef7d2
save person attributes first
2014-04-19 16:42:52 +03:00
Henne Vogelsang
e3fd0c195a
First tests in rspec, with factory_girl
2014-04-09 13:18:11 +02:00
Henne Vogelsang
c261876ce0
Merge pull request #51 from gopesht/delete_users
...
Admin able to delete users except admins
2014-04-09 12:11:48 +02:00
Henne Vogelsang
8f222db0bb
Merge pull request #52 from gopesht/fix_supporter_page
...
fixed supporter page redirect after creation
2014-04-09 12:09:55 +02:00
Gopesh Tulsyan
dd9640b90b
Fixed Bug for checking presence of email template before sending mails
2014-04-04 15:43:36 +05:30
Gopesh Tulsyan
f4b6ff56c6
fixed supporter page redirect after creation
2014-03-28 00:11:08 +05:30
Gopesh Tulsyan
481fcc9f60
Admin able to delete users except admins
2014-03-27 20:14:52 +05:30
Henne Vogelsang
9d72775c29
Use user_registration_path instead of hardcoded /accounts for deployments into sub-directories...
2014-03-24 13:22:41 +01:00
Henne Vogelsang
18968a05b1
* Update devise to latest version
...
* use letter_opener for mails in development
* bring back the flash
* fix redirect loop for logging in
* move all mailer/devise settings to config/config.yml
2014-03-24 12:45:47 +01:00
Henne Vogelsang
24e40a5c90
Merge pull request #41 from differentreality/stats_update
...
Move events stats in Statistics, add ticket distribution
2014-03-17 16:36:03 +01:00
Stella
2e1dcd33fe
Move events stats in Statistics, add ticket distribution
2014-03-09 16:16:22 +02:00
Stella
8f8824ecd6
fix registration page, only show volunteering tab if option is enabled for the conference
2014-03-04 22:22:52 +02:00
Henne Vogelsang
04e06ac251
Remove question fields from speaker statistics
2014-03-04 10:41:38 +01:00
Henne Vogelsang
5b05ffbd56
Rename the volunteers to match the other config routes
2014-03-04 10:30:23 +01:00
Henne Vogelsang
14a896842b
Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers
...
Conflicts:
app/models/conference.rb
app/models/registration.rb
app/views/admin/conference/_sidebar.html.haml
app/views/conference_registration/register.html.haml
2014-03-03 10:52:24 +01:00
Henne Vogelsang
243ea41456
Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions
...
Conflicts:
app/models/conference.rb
config/routes.rb
2014-03-03 10:43:38 +01:00
Henne Vogelsang
4ed72d4967
Merge pull request #33 from differentreality/final_difficulty_levels
...
Add difficulty levels
2014-03-03 10:40:21 +01:00
Stella
5b35e25ecd
Add difficulty levels
2014-02-23 16:09:09 +02:00
Stella
52543589e4
voting visual changes
2014-02-23 14:56:09 +02:00
Stella
3105c8da5d
question builder
2014-02-09 18:05:57 +02:00
Stella
64b2b8b3f8
Volunteers, positions and days and volunteers list for admin, volunteering option for attendees
2014-01-01 11:39:59 +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
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
d603d0830f
fix events stats table
2013-09-04 13:49:29 +03:00
Henne Vogelsang
0d6d5d6a31
Merge pull request #38 from differentreality/redirection
...
Redirection
2013-09-03 02:46:41 -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
9c35395350
redirect to requested page after login
2013-08-25 13:40:44 +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
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
f8a6f9626f
Merge pull request #33 from differentreality/home
...
Home page conferences order
2013-07-29 04:39:52 -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
4f582bc7f9
show first day if today is not within the conference date range
2013-07-29 08:48:04 +03:00
differentreality
adb04ab82e
show current day's schedule
2013-07-29 02:01:24 +03:00
differentreality
ffadfca7a2
show conference until its last day and order by start date
2013-07-28 22:37:26 +03:00
differentreality
1686c61e7c
change track from events list
2013-07-28 22:10:45 +03:00
differentreality
071cd81029
edit event from admin panel, show actual submitter and update event details
2013-07-28 21:21:54 +03:00
