Commit graph

  • 1fbbbdae6e deletions Stella Rouzi 2014-08-26 11:06:14 +03:00
  • da061b3902 exclude config/ from rubocop styling, more style fixes Stella Rouzi 2014-08-19 20:14:27 +03:00
  • b7c45718d8 apply StringLiterals cop (remove double quotes, unless there is string interpolation) Stella Rouzi 2014-08-18 21:54:43 +03:00
  • f91467a00a remove trailing spaces and blank lines Stella Rouzi 2014-08-18 21:26:45 +03:00
  • a1ed852287 Merge pull request #492 from hennevogel/master Henne Vogelsang 2014-09-01 18:43:54 +02:00
  • 42159617b4 Fix a double render while confirming proposals Henne Vogelsang 2014-09-01 18:28:07 +02:00
  • 33d5775d52 Merge pull request #491 from hennevogel/master Henne Vogelsang 2014-09-01 17:18:54 +02:00
  • 89440b971d More accept/reject/confirm fixes Henne Vogelsang 2014-09-01 17:17:30 +02:00
  • 28194d47ea Merge pull request #490 from hennevogel/master Henne Vogelsang 2014-09-01 16:54:47 +02:00
  • d112a98e87 Merge pull request #485 from ChrisBr/fix_hakiri_issues Christian Bruckmayer 2014-09-01 16:52:12 +02:00
  • 6147c5d185 Fix accept, reject and confirm mail templates Henne Vogelsang 2014-09-01 16:31:56 +02:00
  • dc2201d937 Merge pull request #489 from ChrisBr/fix_migration Henne Vogelsang 2014-09-01 13:16:23 +02:00
  • 0911e1ed83 Fix failing migration for new price and currency columns of ticket Chrisbr 2014-09-01 13:06:14 +02:00
  • fa5b5242c1 Merge pull request #483 from ChrisBr/refactoring_splash Christian Bruckmayer 2014-08-31 23:10:43 +02:00
  • fedb0753bf Extracted Splashpage from Conference Chrisbr 2014-08-30 12:08:24 +02:00
  • 7793497862 Merge pull request #482 from ChrisBr/refactor_tickets Christian Bruckmayer 2014-08-31 22:52:04 +02:00
  • 6890802a78 User deletion Gopesh Tulsyan 2014-08-10 11:41:35 +05:30
  • a2b8806e35 fix Stella Rouzi 2014-08-17 22:20:28 +03:00
  • 6ab2de4dd9 address the issue of second user becoming an admin automatically. Stella Rouzi 2014-08-17 22:01:04 +03:00
  • c546229a16 make second user admin Stella Rouzi 2014-08-17 20:42:34 +03:00
  • 361e149e86 allow for organizers to also manage users Stella Rouzi 2014-08-17 16:40:48 +03:00
  • 54bc613df1 Merge 36097f6b8b into 5485fe0e7f alter 2014-08-30 20:33:57 +00:00
  • 36097f6b8b fixed https://github.com/openSUSE/osem/issues/430 alterpub 2014-08-31 00:28:28 +04:00
  • 5f8a8ac6d9 Refactoring Tickets Chrisbr 2014-08-28 15:21:05 +02:00
  • c2a1ff1ffc Fix Hakiri issues Chrisbr 2014-08-27 16:18:35 +02:00
  • 5485fe0e7f Merge pull request #471 from ChrisBr/refactoring_registration Christian Bruckmayer 2014-08-22 20:11:46 +02:00
  • d21e19b977 Big refactoring of registration Chrisbr 2014-08-22 15:08:54 +02:00
  • 0f1051d24e Merge pull request #458 from differentreality/remove_attachments Henne Vogelsang 2014-08-22 14:19:26 +02:00
  • 460492157d Merge pull request #376 from differentreality/speakers Henne Vogelsang 2014-08-22 14:19:01 +02:00
  • 5a1dae866a fixes from comments Stella Rouzi 2014-08-06 22:23:10 +03:00
  • d7c7d878f2 fix [] Stella Rouzi 2014-07-28 21:57:46 +03:00
  • fd43d4de11 add links for events/conferences/submitters Stella Rouzi 2014-07-25 01:17:47 +03:00
  • 561a040c72 remove jquery-fileupload-rails Stella Rouzi 2014-08-18 11:49:33 +03:00
  • 30c2d66a15 remove attachments Stella Rouzi 2014-08-17 16:32:01 +03:00
  • 6579b3220f Merge pull request #480 from hennevogel/blah Henne Vogelsang 2014-08-20 22:09:38 +02:00
  • 8e042f2ea6 Use find_or_create_by for the deleted user Henne Vogelsang 2014-08-20 21:45:09 +02:00
  • 8fb852c1c4 Adds ability for guests to subscribe Gopesh Tulsyan 2014-08-19 14:14:49 +05:30
  • 88c4883d63 Merge 41a21ffe27 into 2cd5c83fc6 Stella Rouzi 2014-08-20 16:48:00 +00:00
  • 41a21ffe27 add attr_accessible for TempUser Stella Rouzi 2014-08-20 19:47:07 +03:00
  • 858d8bbae8 create dummy user if not found Stella Rouzi 2014-08-20 17:31:28 +03:00
  • f841442dca fixes Stella Rouzi 2014-08-20 16:23:05 +03:00
  • fecfe530ba fix for buggy migration 20140801080705 Stella Rouzi 2014-08-20 15:45:05 +03:00
  • 7ed14d4935 add corrected migration for adding dummy user to events without users Stella Rouzi 2014-08-20 15:44:26 +03:00
  • cfa9b27589 drop wrong migration 20140801080705 Stella Rouzi 2014-08-20 15:33:38 +03:00
  • 2cd5c83fc6 Merge pull request #477 from hennevogel/master Henne Vogelsang 2014-08-20 01:21:21 +02:00
  • f212aeeb30 Add a rake task to the deployment to backup the DB. Apparently needed with all the broken migrations... Henne Vogelsang 2014-08-20 00:49:48 +02:00
  • b5fe3bfdcd Merge pull request #474 from bear454/minor_fixes James Mason 2014-08-19 14:24:21 -07:00
  • 0e0415d515 Merge pull request #473 from bear454/phantomjs James Mason 2014-08-19 14:24:04 -07:00
  • 2b0d7b880b Use phantomjs gem to demonstrate phantomjs is a dependency, and autoinstall phantomjs. James Mason 2014-08-19 08:47:28 -07:00
  • 89c77fa33b trigger click instead of .click James Mason 2014-08-19 10:08:59 -07:00
  • 0daeaf859f Merge pull request #455 from bear454/drop_glyphs James Mason 2014-08-19 08:54:01 -07:00
  • 818fd96418 Adding a network delay on subsequent action in proposal spec. James Mason 2014-08-19 08:49:51 -07:00
  • cb68445efa Typo James Mason 2014-08-19 08:49:40 -07:00
  • e41fa41acf Merge pull request #472 from ChrisBr/adds_error_message_to_questions Christian Bruckmayer 2014-08-19 13:26:27 +02:00
  • 236f3f20e7 Adds error message to questions controller Chrisbr 2014-08-19 13:01:39 +02:00
  • 206072bf41 Merge d56df82a3c into f2bbb68ad9 Artem Chernikov 2014-08-19 10:50:53 +00:00
  • f2bbb68ad9 Update rails to address CVE-2014-3514. Fix the deployment Henne Vogelsang 2014-08-19 12:31:31 +02:00
  • d56df82a3c fixes CVE-2014-3514 vulnerability Artem Chernikov 2014-08-19 10:21:15 +02:00
  • 3581edf58c Merge pull request #464 from differentreality/fix_migration_event_users Artem Chernikov 2014-08-19 10:06:03 +02:00
  • 65291d8b0d Merge pull request #450 from gopesht/dj_deploy Artem Chernikov 2014-08-19 09:50:36 +02:00
  • eef902291d fix migration. Create dummy user if user doesn't exist, make sure all event_users records are valid Stella Rouzi 2014-08-18 19:56:31 +03:00
  • 42a914398b Specifying bootstrap components explicitly, excluding glyphicons. James Mason 2014-08-15 18:54:14 -07:00
  • e9019ed4fc Update global glyph style James Mason 2014-08-15 18:46:19 -07:00
  • e79ed97a94 Switch schedule glyphs to FontAwesome James Mason 2014-08-15 18:42:14 -07:00
  • eac40ddfd1 Switch proposal attachment glyphs to FontAwesome James Mason 2014-08-15 18:41:12 -07:00
  • d50ac96c6b Switch header navigation glyphs to FontAwesome James Mason 2014-08-15 18:30:21 -07:00
  • ba1aed3c54 Switch admin navigation glyphs to FontAwesome James Mason 2014-08-15 18:28:14 -07:00
  • ebe9780059 Switch Splash gallery glyphs to FontAwesome James Mason 2014-08-15 18:22:20 -07:00
  • 90bc1b0513 Reformat dashboxes like admin/index James Mason 2014-08-15 18:19:56 -07:00
  • 2067ad726e Switch admin conference glyphs to FontAwesome James Mason 2014-08-15 18:15:13 -07:00
  • df35b8bc46 Switch admin list glyphs to FontAwesome... James Mason 2014-08-15 18:08:07 -07:00
  • 9415128fcb Switch todo glyphs to FontAwesome James Mason 2014-08-15 18:03:05 -07:00
  • 206d121d3d Merge pull request #445 from ChrisBr/refactor_registration_period Christian Bruckmayer 2014-08-18 15:26:52 +02:00
  • 4189d5251b Removes stats controller Chrisbr 2014-08-18 14:33:12 +02:00
  • ed55e2bf3a Introduces new RegistrationPeriod Object for Conference #416 Chrisbr 2014-08-18 14:33:02 +02:00
  • 16de834243 Added create method for user creation in the /admin/users_controller Gopesh Tulsyan 2014-08-18 16:40:03 +05:30
  • a620950383 Merge pull request #459 from differentreality/fix_contributing_link Henne Vogelsang 2014-08-18 09:59:26 +02:00
  • 3a17ccb49b Merge pull request #454 from hennevogel/drop-jquery-ui Henne Vogelsang 2014-08-18 09:47:04 +02:00
  • 45b8c5dd68 Drop JQuery-UI. Fixes Issue #353 partly Henne Vogelsang 2014-08-18 09:32:14 +02:00
  • b668120883 fix Stella Rouzi 2014-08-17 22:20:28 +03:00
  • e5290c65fa address the issue of second user becoming an admin automatically. Stella Rouzi 2014-08-17 22:01:04 +03:00
  • 50813de935 fix link Stella Rouzi 2014-08-17 20:54:06 +03:00
  • 95b1be7886 make second user admin Stella Rouzi 2014-08-17 20:42:34 +03:00
  • 4304072b2c allow for organizers to also manage users Stella Rouzi 2014-08-17 16:40:48 +03:00
  • 7123d4ece0 Merge pull request #333 from differentreality/delete_events_without_submitter Artem Chernikov 2014-08-16 16:39:32 +02:00
  • d9438e366d delete old migration Stella Rouzi 2014-08-01 13:41:54 +03:00
  • 312c25431a style fixes Stella Rouzi 2014-07-30 20:01:35 +03:00
  • 9ec10adea1 fix migration Stella Rouzi 2014-07-30 19:36:22 +03:00
  • 36778c24ca fix style Stella Rouzi 2014-07-29 23:01:02 +03:00
  • dd4d4b2601 use sample user for scheduled events without user Stella Rouzi 2014-07-29 21:50:21 +03:00
  • d36fcd9894 delete events without submitter Stella Rouzi 2014-07-17 16:48:27 +03:00
  • 7ebfbae7ab fix test Stella Rouzi 2014-08-07 00:51:21 +03:00
  • 494e834cb5 style fix Stella Rouzi 2014-08-06 22:56:11 +03:00
  • 3bb42bdb10 move sample user creation in seeds Stella Rouzi 2014-08-01 18:27:22 +03:00
  • 59fe90a706 fix style Stella Rouzi 2014-08-01 13:55:45 +03:00
  • 78ab264bc2 delete old migration Stella Rouzi 2014-08-01 13:41:54 +03:00
  • 93ced745e7 name the migration more appropriately Stella Rouzi 2014-08-01 12:03:42 +03:00
  • e82a417874 style fixes Stella Rouzi 2014-07-30 20:01:35 +03:00
  • 6827f45d60 fix migration Stella Rouzi 2014-07-30 19:36:22 +03:00
  • d98cb8ccff fix style Stella Rouzi 2014-07-29 23:01:02 +03:00