Commit graph

1004 commits

Author SHA1 Message Date
Henne Vogelsang
2cd5c83fc6 Merge pull request #477 from hennevogel/master
Add a rake task to the deployment to backup the DB.
2014-08-20 01:21:21 +02:00
Henne Vogelsang
f212aeeb30 Add a rake task to the deployment to backup the DB.
Apparently needed with all the broken migrations...
2014-08-20 00:49:48 +02:00
James Mason
b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes
Minor fixes
2014-08-19 14:24:21 -07:00
James Mason
0e0415d515 Merge pull request #473 from bear454/phantomjs
Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall it.
2014-08-19 14:24:04 -07:00
James Mason
2b0d7b880b Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs. 2014-08-19 10:32:37 -07:00
James Mason
89c77fa33b trigger click instead of .click 2014-08-19 10:09:24 -07:00
James Mason
0daeaf859f Merge pull request #455 from bear454/drop_glyphs
Drop glyphs, use FontAwesome instead.
2014-08-19 08:54:01 -07:00
James Mason
818fd96418 Adding a network delay on subsequent action in proposal spec.
Without this, I get consistent failures, and others experience intermmitent failures, on this spec.
2014-08-19 08:49:51 -07:00
James Mason
cb68445efa Typo 2014-08-19 08:49:40 -07:00
Christian Bruckmayer
e41fa41acf Merge pull request #472 from ChrisBr/adds_error_message_to_questions
Adds error message to questions controller
2014-08-19 13:26:27 +02:00
Chrisbr
236f3f20e7 Adds error message to questions controller 2014-08-19 13:01:39 +02:00
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
James Mason
42a914398b Specifying bootstrap components explicitly, excluding glyphicons. 2014-08-18 08:52:26 -07:00
James Mason
e9019ed4fc Update global glyph style 2014-08-18 08:51:16 -07:00
James Mason
e79ed97a94 Switch schedule glyphs to FontAwesome 2014-08-18 08:51:16 -07:00
James Mason
eac40ddfd1 Switch proposal attachment glyphs to FontAwesome 2014-08-18 08:51:16 -07:00
James Mason
d50ac96c6b Switch header navigation glyphs to FontAwesome 2014-08-18 08:51:13 -07:00
James Mason
ba1aed3c54 Switch admin navigation glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
ebe9780059 Switch Splash gallery glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
90bc1b0513 Reformat dashboxes like admin/index 2014-08-18 08:49:44 -07:00
James Mason
2067ad726e Switch admin conference glyphs to FontAwesome 2014-08-18 08:49:44 -07:00
James Mason
df35b8bc46 Switch admin list glyphs to FontAwesome...
... match with dashbox icons.
2014-08-18 08:49:44 -07:00
James Mason
9415128fcb Switch todo glyphs to FontAwesome 2014-08-18 08:49:44 -07: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