Commit graph

  • e0778a94de use sample user for scheduled events without user Stella Rouzi 2014-07-29 21:50:21 +03:00
  • b5b85ede71 delete events without submitter Stella Rouzi 2014-07-17 16:48:27 +03:00
  • 79af7266ec Merge pull request #452 from differentreality/conference_view_test_edit Stella Rouzi 2014-08-15 20:38:44 +03:00
  • 98112b5a03 Adds delayed jobs recipe for production, and some documentation added for running delayed jobs in local Gopesh Tulsyan 2014-08-14 21:38:18 +05:30
  • 63366d43a4 Merge pull request #453 from ChrisBr/bugfix_conference_controller Christian Bruckmayer 2014-08-15 16:57:13 +02:00
  • 367c962c1b Merge pull request #429 from ChrisBr/fix_campaigns Christian Bruckmayer 2014-08-15 16:14:31 +02:00
  • d0e9805456 Removes dulplicate conference update action and moves methods out of private area Chrisbr 2014-08-15 16:06:02 +02:00
  • 71bf793cdf Merge pull request #451 from hennevogel/master Henne Vogelsang 2014-08-15 14:12:21 +02:00
  • 1ab7fe3051 Merge pull request #449 from ChrisBr/introduce_speakers_relation Christian Bruckmayer 2014-08-15 13:00:59 +02:00
  • 70e3d0af35 Merge pull request #448 from ChrisBr/introduce_participants_relation Christian Bruckmayer 2014-08-15 12:58:10 +02:00
  • e9530dce9b fix view test to search for input field with correct value Stella Rouzi 2014-08-15 13:32:25 +03:00
  • 83731d37dd Merge pull request #434 from differentreality/typo Stella Rouzi 2014-08-15 13:23:28 +03:00
  • 09dea4b4c5 fix typo openSUSE Stella Rouzi 2014-08-07 09:21:29 +03:00
  • 566382eca8 Merge pull request #441 from differentreality/cancancan Artem Chernikov 2014-08-15 12:00:35 +02:00
  • 63cf8e784a Fix email from config variable. Fixes #446 Henne Vogelsang 2014-08-15 11:58:47 +02:00
  • b89432aff7 Merge pull request #374 from differentreality/openid_keys Artem Chernikov 2014-08-15 11:20:47 +02:00
  • 88f613ef8c Add controller tests for roles Stella Rouzi 2014-08-15 11:37:11 +03:00
  • b1c65eea79 style fix Stella Rouzi 2014-08-06 22:48:28 +03:00
  • 035988a2e1 remove keys Stella Rouzi 2014-07-25 12:33:38 +03:00
  • bf6b09d9f4 add github for openid login Stella Rouzi 2014-07-24 23:18:57 +03:00
  • c8e741d0ca openID keys for localhost in example secrets, so that openID works out of the box Stella Rouzi 2014-07-24 22:58:36 +03:00
  • efc00787fc style fix Stella Rouzi 2014-08-14 20:18:38 +03:00
  • 7d35fc2857 fix test and add test for roles view Stella Rouzi 2014-08-14 19:58:50 +03:00
  • 911143c006 fix in admin menu and rework menu tests Stella Rouzi 2014-08-14 16:46:34 +03:00
  • 47f524259c Introduces speakers relation to conference #416 Chrisbr 2014-08-14 11:25:11 +02:00
  • 61f23f88c9 style fixes from rubocop Stella Rouzi 2014-08-14 12:08:01 +03:00
  • c7d47ce6df Introduces participants relation to conference #416 Chrisbr 2014-08-14 10:46:02 +02:00
  • ba6643a394 fix sponsor test, fixes from rebase, remove admin area check from application controller, fix admin menu layout Stella Rouzi 2014-08-14 11:37:30 +03:00
  • 17ebad413e base controller Stella Rouzi 2014-08-13 14:37:05 +03:00
  • 336d0e9d04 migration for old roles Stella Rouzi 2014-08-13 22:48:05 +03:00
  • beb88b848d changes from comments, fix commercials failing test Stella Rouzi 2014-08-13 22:46:41 +03:00
  • d794593e10 migrate roles Stella Rouzi 2014-07-30 15:22:14 +03:00
  • aeb28833f1 fixes Stella Rouzi 2014-08-13 14:37:15 +03:00
  • 1cbf78df3d create @user with cancan for remove_user action Stella Rouzi 2014-08-13 16:05:54 +03:00
  • e9a57f78a3 style Stella Rouzi 2014-08-13 15:29:31 +03:00
  • c9d608175b fix from rebase Stella Rouzi 2014-08-12 22:42:53 +03:00
  • f169049003 write in 1 single line actions with no body Stella Rouzi 2014-08-12 22:27:02 +03:00
  • f5081813d9 fix from rebase Stella Rouzi 2014-08-12 22:11:07 +03:00
  • f7ef401be7 style fixes Stella Rouzi 2014-08-12 20:23:51 +03:00
  • eaf637e9bd db Stella Rouzi 2014-08-12 16:51:29 +03:00
  • d13c1a83e4 fix in questions Stella Rouzi 2014-08-12 16:33:01 +03:00
  • e7a79528b6 fix Stella Rouzi 2014-08-12 16:06:46 +03:00
  • bbeae5e0ff fix Stella Rouzi 2014-08-12 15:59:22 +03:00
  • ed11253d4f fix style Stella Rouzi 2014-08-12 15:56:12 +03:00
  • e6ddb910d6 fix style Stella Rouzi 2014-08-12 15:54:53 +03:00
  • 58a63d9fd0 fix style Stella Rouzi 2014-08-12 15:53:50 +03:00
  • 71dfb3b7e4 fix conflicts Stella Rouzi 2014-08-12 15:48:29 +03:00
  • e2fb434dc7 Implement role authorization Stella Rouzi 2014-08-12 11:51:59 +03:00
  • f86added23 Merge 27fc0acbf8 into 6755328c4c Christian Bruckmayer 2014-08-13 09:41:35 +00:00
  • 6755328c4c Merge pull request #443 from hennevogel/master Henne Vogelsang 2014-08-13 11:41:28 +02:00
  • 489c4ce6a2 Merge 0d0c5700cb into d4074b798e Gopesh Tulsyan 2014-08-13 08:36:11 +00:00
  • 0d0c5700cb Revert "Added route to root path for navigation from splash" Gopesh Tulsyan 2014-08-13 14:05:25 +05:30
  • d4074b798e Merge pull request #377 from gopesht/add_email_settings_to_user_accounts Gopesh Tulsyan 2014-08-13 09:22:34 +05:30
  • fe17bd26e5 Merge pull request #440 from gopesht/add_home_route_to_splash Gopesh Tulsyan 2014-08-13 09:20:56 +05:30
  • 6e2efa502b Switch to apache init restart as passenger's tmp/restart.txt seem not to be reliable :-/ Henne Vogelsang 2014-08-12 18:43:46 +02:00
  • 27fc0acbf8 Introduces new audience object #416 Chrisbr 2014-08-12 17:59:35 +02:00
  • 63d2980fe3 Merge pull request #437 from ChrisBr/refactor_basic_menu Christian Bruckmayer 2014-08-12 17:25:40 +02:00
  • ebdf0df410 Moving notifications to models Gopesh Tulsyan 2014-08-12 16:04:24 +05:30
  • 4809edffe4 Removed brand helper for consistency, replaced glyphicons with fontawesome icons Gopesh Tulsyan 2014-08-12 17:03:24 +05:30
  • a39f4cf0dd Subscription on Registration, Independent Subscription without registration Gopesh Tulsyan 2014-07-25 13:13:35 +05:30
  • 41fc21f7f4 Added Subscription model to send emails Gopesh Tulsyan 2014-07-24 21:13:03 +05:30
  • 22cc5e4f14 Extracting Photos form Conference edit form close #384 Chrisbr 2014-08-12 08:38:51 +02:00
  • a8b94c13f3 Refactoring Conference Basics #384 Chrisbr 2014-08-07 21:33:08 +02:00
  • ac25561523 Merge pull request #432 from differentreality/style_module Artem Chernikov 2014-08-11 10:26:23 +02:00
  • 7afa8be27c Merge pull request #412 from gopesht/fix_splash_layout Gopesh Tulsyan 2014-08-07 17:00:53 +05:30
  • ddfe8e5227 Fix splash layouts, other ui fixes Gopesh Tulsyan 2014-08-01 12:23:33 +05:30
  • a2089a09fa Merge pull request #435 from openSUSE/review_140807_add_cleanup_for_mina Artem Chernikov 2014-08-07 10:58:56 +02:00
  • 0fe8c76c9b Remove syck, add notifier back, add cleanup on deploy Artem Chernikov 2014-08-07 10:30:34 +02:00
  • e6cdb3a6ce style fix Stella Rouzi 2014-08-07 09:19:58 +03:00
  • e06e0a5ca3 more style fixes Stella Rouzi 2014-08-07 07:42:22 +03:00
  • 1c1391c69e enable style ClassAndModuleChildren Stella Rouzi 2014-08-06 21:14:00 +03:00
  • 2f814c7320 Disable :notify_errbit in deploy. Issue #431 Henne Vogelsang 2014-08-06 20:48:56 +02:00
  • cb15ba401f Fix campaigns dashboard missing method bug Chrisbr 2014-08-06 18:26:07 +02:00
  • 83ad4551dd Merge pull request #424 from ChrisBr/refactor_media Christian Bruckmayer 2014-08-06 16:34:33 +02:00
  • 2a731e8350 Refactoring Conference/Event media to new media object close #420 Chrisbr 2014-08-05 18:23:42 +02:00
  • 850beb72e1 Merge pull request #409 from hennevogel/refactor-conference-contact Henne Vogelsang 2014-08-06 11:56:14 +02:00
  • 31f56ea4a9 Merge pull request #427 from gopesht/fix#309 Artem Chernikov 2014-08-04 16:22:39 +02:00
  • 340ba6826e Merge pull request #402 from openSUSE/review_140730_363_sprint_discipline Artem Chernikov 2014-08-04 15:46:16 +02:00
  • 23c68211f0 Redirect to root path if splash is not public Gopesh Tulsyan 2014-08-03 11:27:54 +05:30
  • 1729faac05 Merge 1c90edd4c3 into 9cf333eeec Gopesh Tulsyan 2014-08-04 09:35:58 +00:00
  • 9734ce9836 [ci skip] Improve on issues section and meeting day Artem Chernikov 2014-08-03 11:37:55 +02:00
  • 9cf333eeec Merge pull request #398 from differentreality/openid_mock Artem Chernikov 2014-08-03 11:22:41 +02:00
  • a8379081b4 enable openids in development by default, do not show openID header unless keys are set. Stella Rouzi 2014-07-30 17:18:58 +03:00
  • 5aa0d58c57 Move Conference contact details to Contact Henne Vogelsang 2014-07-31 20:09:38 +02:00
  • eb3e6898d2 Implements Contacts Henne Vogelsang 2014-07-31 18:49:46 +02:00
  • 4955b2b7b8 Merge pull request #414 from hennevogel/master Henne Vogelsang 2014-08-01 14:29:13 +02:00
  • b5b1d093e5 Disable Style/ClassLength on Conference. It's Issue #413 now Henne Vogelsang 2014-08-01 14:14:54 +02:00
  • 6b77dd0bbe Merge a72fc1c02e into 021b118c5c Artem Chernikov 2014-08-01 11:50:37 +00:00
  • 021b118c5c Merge pull request #406 from gopesht/fix_user_creation Gopesh Tulsyan 2014-08-01 17:19:11 +05:30
  • 31b9c0ca1a Merge 5fe99dd041 into d14297712f Christian Bruckmayer 2014-08-01 11:35:26 +00:00
  • d14297712f Merge pull request #364 from hennevogel/signup Henne Vogelsang 2014-08-01 13:35:19 +02:00
  • 5f96c276e9 Rework the Sign Up/Sign In views Use Capybaras save_page when feature tests go wrong Henne Vogelsang 2014-07-23 14:55:06 +02:00
  • 76028f5755 Merge pull request #408 from hennevogel/dashboard-icons Henne Vogelsang 2014-08-01 13:24:43 +02:00
  • 9dd866f17d Adds 'new' method to admin/users controller, to render new user template, fixes #380 Gopesh Tulsyan 2014-07-31 19:23:46 +05:30
  • e9bf2f8399 Style the general dashboard icons Henne Vogelsang 2014-08-01 10:12:04 +02:00
  • d39d10d3f7 Merge pull request #403 from openSUSE/review_140730_proceed_with_styling Artem Chernikov 2014-07-31 15:18:24 +02:00
  • 3c0d1953c6 Merge d1f5b1e3cc into 518e1cc62b Christian Bruckmayer 2014-07-31 10:24:30 +00:00
  • d1f5b1e3cc Refactoring Admin menu #384 Chrisbr 2014-07-30 12:03:16 +02:00
  • 5fe99dd041 Refactoring Venue, Lodgings und Rooms #385 Chrisbr 2014-07-31 12:20:04 +02:00
  • eb127b4f8c Add new styles to be checked Artem Chernikov 2014-07-30 23:43:00 +02:00