Artem Chernikov
98e9dec252
Fix travis rubocop
2014-07-21 15:23:10 +02:00
Artem Chernikov
ad2ec92cfa
Add rubocop to travis run
2014-07-21 15:06:22 +02:00
Artem Chernikov
bce659a5d9
Move Accessor names to todo
2014-07-21 15:05:58 +02:00
Artem Chernikov
5289f41eb5
Use only new hash syntax
2014-07-21 15:05:58 +02:00
Artem Chernikov
3901973fd6
Do not use variables in void context
2014-07-21 15:05:58 +02:00
Artem Chernikov
31212b4f1c
Fix linting cops
2014-07-21 15:05:58 +02:00
Artem Chernikov
056fe5ec3f
Fix others additional lints
2014-07-21 15:05:58 +02:00
Artem Chernikov
763f864dc9
Fix basic style issues with rubocop
2014-07-21 15:05:58 +02:00
Artem Chernikov
f4a22851a1
Update rubocop and add basic checks
2014-07-21 15:05:58 +02:00
Christian Bruckmayer
9f03531708
Merge pull request #345 from ChrisBr/bugfix_events_index
...
Added nil checks for call for papers in event index
2014-07-21 12:59:21 +02:00
Chrisbr
9d54d0db93
Added nil checks for call for papers in event index
...
Changed first / lastname to name
close #342
close #344
2014-07-21 12:36:15 +02:00
Christian Bruckmayer
a136b8a609
Merge pull request #297 from ChrisBr/bugfix_events_over_time_new
...
[Bugfix] Confirmed / Unconfirmed events over time for conference dashboard
2014-07-21 11:32:53 +02:00
Stella Rouzi
c5fe3af9db
fix: use ruby's way for interpolation
2014-07-20 19:43:21 +03:00
Stella Rouzi
be468be5d7
Only show openid options if providers are set in User model.
2014-07-20 19:43:20 +03:00
Gopesh Tulsyan
8bffa7e8c2
Navigation fixed
2014-07-19 20:36:51 +05:30
Chrisbr
d1b038c5a7
[Bugfix] Confirmed / Unconfirmed events over time for conference dashboard
2014-07-18 15:22:15 +02:00
Stella Rouzi
609f2fd564
Merge pull request #334 from differentreality/event_person_delete
...
remove old model
2014-07-18 11:08:58 +03:00
Stella Rouzi
feb220c37d
remove old model
2014-07-17 16:54:43 +03:00
Artem Chernikov
64e191f60e
Load env on deploy
2014-07-17 10:39:49 +02:00
Artem Chernikov
1b51b15d18
Attempt to fix hoptoad
2014-07-17 10:19:13 +02:00
Henne Vogelsang
2068d25d84
Merge pull request #328 from hennevogel/master
...
Various small fixes
2014-07-16 19:44:09 +02:00
Gopesh Tulsyan
74a8988abc
Adds migration to Email Settings for Venue Updates
2014-07-16 19:50:36 +05:30
Henne Vogelsang
1d3c84c24d
Make the spec aware of our new default event_types
2014-07-16 14:23:16 +02:00
Henne Vogelsang
064e0a3fd7
Create default event_types. More event validations. Fixes #319
2014-07-16 14:23:16 +02:00
Henne Vogelsang
a76fa8dd59
Fix the layout of the sign in box
2014-07-16 14:23:16 +02:00
Henne Vogelsang
b4dd8c8d22
Move the footer further down to separate it more from the content
2014-07-16 14:23:16 +02:00
Artem Chernikov
bd3f251c45
Merge pull request #322 from openSUSE/review_140716_update_schema
...
Update schema, fixes #320
2014-07-16 14:00:47 +02:00
Artem Chernikov
874588f1fe
Merge pull request #307 from openSUSE/review_140712_remove_therubyracer
...
Remove therubyracer because of the following reasons:
2014-07-16 14:00:36 +02:00
Artem Chernikov
a4ebd4b772
Update schema, fixes #320
2014-07-16 11:17:57 +02:00
James Mason
143e20d1a3
Merge pull request #298 from gopesht/notify_on_date_change
...
Notify on date change
2014-07-15 08:10:21 -07:00
Gopesh Tulsyan
8acf3c088a
Added test for email notification on conference dates and registration dates updates
2014-07-15 16:26:06 +05:30
Gopesh Tulsyan
6d847547b7
Adds email template and settings for conference registration dates updates
...
Added tests
Minor typo
2014-07-15 16:26:06 +05:30
Gopesh Tulsyan
c16d76c9b8
Adds migration for Conference Registration Dates to Email Settings
2014-07-15 16:26:06 +05:30
Gopesh Tulsyan
861c1af729
Conference date update email notification completed
...
Added tests
2014-07-15 16:25:16 +05:30
Gopesh Tulsyan
75cf1123cf
Adds email template and settings for conference dates updates
2014-07-15 16:25:16 +05:30
Artem Chernikov
aee73fb442
Merge pull request #312 from differentreality/user_fields_volunteers
...
Add volunteer fields to user
2014-07-14 21:47:16 +02:00
Artem Chernikov
93ced1ee38
Merge pull request #314 from differentreality/attachment_default
...
fix attachment_default migration
2014-07-14 21:46:46 +02:00
Stella Rouzi
0f9242cbd2
fix attachment_default migration
2014-07-14 21:19:42 +03:00
Stella Rouzi
2966b92319
style fixes
2014-07-14 21:14:32 +03:00
Stella Rouzi
4a8c2173d4
remove put method
2014-07-14 21:14:32 +03:00
Gopesh Tulsyan
6f5ab8988c
Merge pull request #310 from gopesht/unused_route
...
Unused route for Conference#show
2014-07-14 21:35:31 +05:30
Stella Rouzi
e37e0a50c8
add volunteer fields to user
2014-07-14 17:36:58 +03:00
Gopesh Tulsyan
f7337cbb77
Unused route for Conference#show
2014-07-13 16:32:12 +05:30
Artem Chernikov
4c08850786
Remove therubyracer because of the following reasons:
...
* therubyracer is unstable between platforms, platform versions, ruby interpreters and even ruby versons.
Pretty much everytime there's native extension compilation issue, it is therubyracer.
* therubyracer is officially discouraged by heroku as it uses lot of memory. On the other hand node.js advertises itself as very lightweight.
* using therubyracer on server is just like installing Node that can be used only by ruby apps (you're using v8 anyway)
* btw. node.js is necessary only on Windows and Ubuntu development, on Mac development ExecJS is using JavaScriptCore.
catched from https://github.com/sheerun/rails4-bootstrap/issues/18
2014-07-12 12:49:58 +02:00
James Mason
50e75c6dd4
Merge pull request #303 from gopesht/modify_date_helper
...
Removed conference_date_string_helper, moved date_string helper to application_controller
2014-07-10 10:00:58 -07:00
Gopesh Tulsyan
c68c6394bc
Removed conference_date_string_helper, moved date_string to application_controller
...
Deleted home_helper.rb
2014-07-10 22:12:11 +05:30
Christian Bruckmayer
85e9fdc643
Merge pull request #296 from ChrisBr/implements_options_for_root
...
Implements OPTIONS http verb for root path
2014-07-08 10:55:52 +02:00
Chrisbr
61f913b727
Implements OPTIONS http verb for root path
...
close #294
2014-07-08 09:18:32 +02:00
Artem Chernikov
53a30439ca
Merge pull request #275 from hennevogel/master
...
vchoices doesn't belong to conference
2014-07-07 16:24:09 +02:00
Artem Chernikov
45c4009b44
Merge pull request #295 from openSUSE/review_140704_deploy_with_mina
...
Add Mina configuration
2014-07-07 16:20:30 +02:00