Henne Vogelsang
|
f2bbb68ad9
|
Update rails to address CVE-2014-3514. Fix the deployment
|
2014-08-19 12:31:31 +02:00 |
|
Artem Chernikov
|
3581edf58c
|
Merge pull request #464 from differentreality/fix_migration_event_users
fix migration
|
2014-08-19 10:06:03 +02:00 |
|
Artem Chernikov
|
65291d8b0d
|
Merge pull request #450 from gopesht/dj_deploy
Adds delayed jobs recipe for production, and some documentation
|
2014-08-19 09:50:36 +02:00 |
|
Stella Rouzi
|
eef902291d
|
fix migration. Create dummy user if user doesn't exist, make sure all event_users records are valid
|
2014-08-18 19:56:31 +03:00 |
|
Christian Bruckmayer
|
206d121d3d
|
Merge pull request #445 from ChrisBr/refactor_registration_period
Introduces new registration period object
|
2014-08-18 15:26:52 +02:00 |
|
Chrisbr
|
4189d5251b
|
Removes stats controller
|
2014-08-18 14:33:12 +02:00 |
|
Chrisbr
|
ed55e2bf3a
|
Introduces new RegistrationPeriod Object for Conference
#416
|
2014-08-18 14:33:02 +02:00 |
|
Henne Vogelsang
|
a620950383
|
Merge pull request #459 from differentreality/fix_contributing_link
fix link
|
2014-08-18 09:59:26 +02:00 |
|
Henne Vogelsang
|
3a17ccb49b
|
Merge pull request #454 from hennevogel/drop-jquery-ui
Drop JQuery-UI
|
2014-08-18 09:47:04 +02:00 |
|
Henne Vogelsang
|
45b8c5dd68
|
Drop JQuery-UI. Fixes Issue #353 partly
|
2014-08-18 09:32:14 +02:00 |
|
Stella Rouzi
|
50813de935
|
fix link
|
2014-08-17 20:54:06 +03:00 |
|
Artem Chernikov
|
7123d4ece0
|
Merge pull request #333 from differentreality/delete_events_without_submitter
Delete events without submitter
|
2014-08-16 16:39:32 +02:00 |
|
Stella Rouzi
|
d9438e366d
|
delete old migration
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
312c25431a
|
style fixes
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
9ec10adea1
|
fix migration
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
36778c24ca
|
fix style
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
dd4d4b2601
|
use sample user for scheduled events without user
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
d36fcd9894
|
delete events without submitter
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
7ebfbae7ab
|
fix test
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
494e834cb5
|
style fix
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
3bb42bdb10
|
move sample user creation in seeds
|
2014-08-15 20:45:29 +03:00 |
|
Stella Rouzi
|
59fe90a706
|
fix style
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
78ab264bc2
|
delete old migration
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
93ced745e7
|
name the migration more appropriately
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
e82a417874
|
style fixes
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
6827f45d60
|
fix migration
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
d98cb8ccff
|
fix style
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
e0778a94de
|
use sample user for scheduled events without user
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
b5b85ede71
|
delete events without submitter
|
2014-08-15 20:45:28 +03:00 |
|
Stella Rouzi
|
79af7266ec
|
Merge pull request #452 from differentreality/conference_view_test_edit
fix view test to search for input field with correct value
|
2014-08-15 20:38:44 +03:00 |
|
Gopesh Tulsyan
|
98112b5a03
|
Adds delayed jobs recipe for production, and some documentation added for running delayed jobs in local
|
2014-08-15 22:13:07 +05:30 |
|
Christian Bruckmayer
|
63366d43a4
|
Merge pull request #453 from ChrisBr/bugfix_conference_controller
Removes dulplicate conference update action
|
2014-08-15 16:57:13 +02:00 |
|
Christian Bruckmayer
|
367c962c1b
|
Merge pull request #429 from ChrisBr/fix_campaigns
Fix campaigns dashboard missing method bug
|
2014-08-15 16:14:31 +02:00 |
|
Chrisbr
|
d0e9805456
|
Removes dulplicate conference update action and moves methods out of private area
|
2014-08-15 16:06:02 +02:00 |
|
Henne Vogelsang
|
71bf793cdf
|
Merge pull request #451 from hennevogel/master
Fix email from config variable. Fixes #446
|
2014-08-15 14:12:21 +02:00 |
|
Christian Bruckmayer
|
1ab7fe3051
|
Merge pull request #449 from ChrisBr/introduce_speakers_relation
Introduces speakers relation to conference #416
|
2014-08-15 13:00:59 +02:00 |
|
Christian Bruckmayer
|
70e3d0af35
|
Merge pull request #448 from ChrisBr/introduce_participants_relation
Introduces participants relation to conference #416
|
2014-08-15 12:58:10 +02:00 |
|
Stella Rouzi
|
e9530dce9b
|
fix view test to search for input field with correct value
|
2014-08-15 13:32:25 +03:00 |
|
Stella Rouzi
|
83731d37dd
|
Merge pull request #434 from differentreality/typo
fix typo openSUSE
|
2014-08-15 13:23:28 +03:00 |
|
Stella Rouzi
|
09dea4b4c5
|
fix typo openSUSE
|
2014-08-15 13:10:35 +03:00 |
|
Artem Chernikov
|
566382eca8
|
Merge pull request #441 from differentreality/cancancan
Cancancan
|
2014-08-15 12:00:35 +02:00 |
|
Henne Vogelsang
|
63cf8e784a
|
Fix email from config variable. Fixes #446
|
2014-08-15 11:58:47 +02:00 |
|
Artem Chernikov
|
b89432aff7
|
Merge pull request #374 from differentreality/openid_keys
Openid keys + addition of github
|
2014-08-15 11:20:47 +02:00 |
|
Stella Rouzi
|
88f613ef8c
|
Add controller tests for roles
|
2014-08-15 11:37:11 +03:00 |
|
Stella Rouzi
|
b1c65eea79
|
style fix
|
2014-08-15 06:16:42 +03:00 |
|
Stella Rouzi
|
035988a2e1
|
remove keys
|
2014-08-15 06:16:42 +03:00 |
|
Stella Rouzi
|
bf6b09d9f4
|
add github for openid login
|
2014-08-15 06:16:42 +03:00 |
|
Stella Rouzi
|
c8e741d0ca
|
openID keys for localhost in example secrets, so that openID works out of the box
|
2014-08-15 06:16:42 +03:00 |
|
Stella Rouzi
|
efc00787fc
|
style fix
|
2014-08-14 20:18:38 +03:00 |
|
Stella Rouzi
|
7d35fc2857
|
fix test and add test for roles view
|
2014-08-14 19:58:50 +03:00 |
|