Commit graph

  • 3269e3204b Merge 9de5837d35 into 01ba76e8c6 Sarah Julia Kriesch 2015-05-06 22:33:10 +00:00
  • 01ba76e8c6 Merge pull request #638 from bgeuken/small_patches Henne Vogelsang 2015-05-06 14:08:50 +02:00
  • 68bbdb9fc9 Fix styling issue: " -> ' Björn Geuken 2015-05-05 14:04:26 +02:00
  • 9de5837d35 Update edit.html.haml Sarah Julia Kriesch 2015-05-02 15:09:40 +02:00
  • 40e08b5624 Update edit.html.haml Henne Vogelsang 2015-05-02 15:07:31 +02:00
  • a1cb616a9c osc15 ruby workshop fixing issue #650 Tommy Jans 2015-05-02 14:57:30 +02:00
  • 53d52e01b9 Merge 30b9d8cf96 into d3e0066f88 Stella Rouzi 2015-04-23 14:56:39 +00:00
  • f420b10732 only get registrations with answered question Stella Rouzi 2015-04-23 14:48:45 +03:00
  • d3e0066f88 Merge pull request #647 from hennevogel/master Henne Vogelsang 2015-04-23 12:20:32 +02:00
  • 132fe6f98c Disable registration/event submission without sign in with ichain Henne Vogelsang 2015-04-23 11:50:22 +02:00
  • 4ed8a72967 Widen the sign-in menu a bit Henne Vogelsang 2015-04-22 16:31:44 +02:00
  • c3330a846f Always show the Update button for registrations Henne Vogelsang 2015-04-22 15:35:46 +02:00
  • 8accc47bcc Merge pull request #646 from differentreality/questions_users Stella Rouzi 2015-04-23 12:22:52 +03:00
  • ef96da7144 include questions in registrations pdf and xls Stella Rouzi 2015-04-23 12:07:11 +03:00
  • 58974d6914 Implement simplified commercials workflow chrisbr 2015-04-22 21:30:32 +02:00
  • 3b8b86eb85 show users per question Stella Rouzi 2015-04-22 18:55:51 +03:00
  • 9963c1550f Merge pull request #627 from ChrisBr/redirect_registration Christian Bruckmayer 2015-04-20 17:28:34 +02:00
  • 6eef0c1ca7 Merge pull request #643 from differentreality/events_json Stella Rouzi 2015-04-20 18:26:25 +03:00
  • 04f38fdf50 Merge dbad8808a0 into b2c7d9be99 Sameer Deshmukh 2015-04-20 15:23:30 +00:00
  • b2c7d9be99 Merge pull request #617 from sonalkr132/hakiri_dos Henne Vogelsang 2015-04-20 17:23:24 +02:00
  • 6cc8c1e5c2 Merge pull request #635 from bgeuken/refactor_calculate_progress Henne Vogelsang 2015-04-20 17:21:15 +02:00
  • 206c3a8144 Merge pull request #636 from bgeuken/cleanup_get_progress Henne Vogelsang 2015-04-20 17:20:09 +02:00
  • 3b8c91bbd9 fix scrolling of left column in schedule, show only @conference.events Stella Rouzi 2015-04-20 13:17:47 +03:00
  • 8250e1305e event: refactor get_state_color method Björn Geuken 2015-04-17 16:33:30 +02:00
  • 82edf7870a event: refactor as_json method and add a test Björn Geuken 2015-04-17 16:20:39 +02:00
  • 80f8bba951 Refactor abstract_word_count method Björn Geuken 2015-04-17 15:37:21 +02:00
  • 9f3da955f0 Move default value into else branch and remove superfluous variable Björn Geuken 2015-04-17 15:33:57 +02:00
  • 650a49d87b Update method documentation (returns a string not an fixnum) Björn Geuken 2015-04-17 09:47:01 +02:00
  • ac0abce6e1 Small refactoring of calculate_setup_progress, part II Björn Geuken 2015-04-17 09:42:10 +02:00
  • 28669ac635 get_progress: align case and when as rubocop Björn Geuken 2015-04-17 14:19:32 +02:00
  • e9ba87a49c get_progress: cleanup case statement Björn Geuken 2015-04-17 10:15:38 +02:00
  • eea7d94223 get_progress: Move default value into else branch Björn Geuken 2015-04-17 10:12:31 +02:00
  • db59fa096c get_progress: Turn if condition into switch Björn Geuken 2015-04-17 10:09:43 +02:00
  • 83bf6a512d get_progress: simplify percentage generation Björn Geuken 2015-04-17 09:57:00 +02:00
  • d910a0f532 Small refactoring of calculate_setup_progress Björn Geuken 2015-04-17 09:36:02 +02:00
  • 751bf4eb42 Merge pull request #634 from differentreality/hackweek_proposal_workflow Henne Vogelsang 2015-04-17 10:40:59 +02:00
  • 5b543cf3f9 Merge 5efe8d8862 into 333c5e39bf Shayon Mukherjee 2015-04-17 07:57:28 +00:00
  • e6bb168c5e Refactoring of proposal workflow. Fixes #215 Stella Rouzi 2015-04-16 18:34:41 +03:00
  • 333c5e39bf Merge pull request #630 from hennevogel/master Stella Rouzi 2015-04-15 12:00:46 +03:00
  • 9e0c871494 Fix rubocop warnings and User index bug Henne Vogelsang 2015-04-15 10:23:24 +02:00
  • 6a5cccbaad Last stage of refactoring of the ability model and spec Henne Vogelsang 2015-04-14 17:33:59 +02:00
  • 762985b83d Merge pull request #629 from ChrisBr/refactoring_new Henne Vogelsang 2015-04-14 09:45:15 +02:00
  • ac1d9fd329 First stage of refactoring of the ability model and spec chrisbr 2015-04-13 16:47:07 +02:00
  • 6d5d969347 Merge pull request #628 from ChrisBr/update_redcarpet Henne Vogelsang 2015-04-13 14:43:28 +02:00
  • 6f64602d85 Redirect to registration edit page when user is already registered chrisbr 2015-04-09 10:19:32 +02:00
  • a47c84dfbb Update redcarpet CVE#46916 chrisbr 2015-04-11 09:33:08 +02:00
  • 30b9d8cf96 Show Help Link even when openID is disabled. Put sign_in data under .container Stella Rouzi 2015-04-06 14:55:16 +03:00
  • 3bd82039ad Merge pull request #621 from differentreality/subscription_authorization Stella Rouzi 2015-04-01 11:49:40 +03:00
  • edc322de7e Merge pull request #1 from openSUSE/master Adrian 2015-03-30 19:37:29 +02:00
  • 0e8bdfcb56 no authorization for Conference, as it's being authorized with read action which includes index and show actions, however action show is authorized only for Conference with public splashpage Stella Rouzi 2015-03-28 13:24:21 +02:00
  • d7b8d6669d Merge 5b0adf5c09 into defef46ae8 Shubhankar Deshpande 2015-03-26 13:33:37 +00:00
  • defef46ae8 Merge pull request #615 from hennevogel/master Henne Vogelsang 2015-03-26 14:30:14 +01:00
  • 035e4fe7e8 Merge f8ba32001d into ff124632ef Aditya Prakash 2015-03-20 11:48:32 +00:00
  • f8ba32001d addition question layout fixed #607 Aditya Prakash 2015-03-20 17:18:02 +05:30
  • 5efe8d8862 Changed minutes to hours for target/program Shayon Mukherjee 2015-03-16 16:12:16 -07:00
  • ff124632ef Merge pull request #611 from shayonj/dashboard-status-minutes-fix Christian Bruckmayer 2015-03-16 12:20:51 +01:00
  • 07049d61f8 Merge pull request #618 from sonalkr132/broken_link Christian Bruckmayer 2015-03-16 12:18:55 +01:00
  • fb457da675 removed broken add user link on admin/users Aditya Prakash 2015-03-15 19:28:28 +05:30
  • d11ebe96ff solve dos on hakiri Aditya Prakash 2015-03-15 19:06:38 +05:30
  • bce4bdcdc6 Update nio4r Christian Bruckmayre 2015-03-15 12:35:06 +01:00
  • 0ce4aa0a49 Fix the ability spec * Get rid of the volunteer coordinator role, we don't use it currently * Test the ability with users that exclusively have a single role Henne Vogelsang 2015-03-13 00:43:09 +01:00
  • e8ab94e1c7 Implements sign up during registration. Solves most of #215 Henne Vogelsang 2015-03-12 23:53:57 +01:00
  • 511007138a Merge pull request #612 from ChrisBr/program Christian Bruckmayer 2015-03-09 15:47:38 +01:00
  • 35fb75cce6 Correct some spelling mistakes. Thanks to Robert Bronstein Henne Vogelsang 2015-03-09 15:40:03 +01:00
  • 232cc249d4 Implements program section for unscheduled events chrisbr 2015-03-09 15:31:06 +01:00
  • c7271780f2 Add creation/update times to qanswers Henne Vogelsang 2015-03-04 15:10:11 +01:00
  • 37164e3694 Fixing functions for minutes to hours conversion for dashboard Shayon Mukherjee 2015-03-02 09:30:11 -06:00
  • 0894d9ec29 Merge pull request #604 from shayonj/format-comments-partial Henne Vogelsang 2015-03-02 11:10:25 +01:00
  • dbad8808a0 fixes abstract count not showing properly Sameer Deshmukh 2015-02-28 23:44:52 +05:30
  • 0326518bc0 Merge 784a45a1fb into cc66027220 Sameer Deshmukh 2015-02-28 17:51:13 +00:00
  • 784a45a1fb fixed bug which did not increment abstract word count properly Sameer Deshmukh 2015-02-28 23:18:10 +05:30
  • 54bcc89204 Refactored nested comments. Now using partial to load them Shayon Mukherjee 2015-02-27 11:11:14 -06:00
  • cc66027220 Update rest-client to fix OSVDB-117461 Henne Vogelsang 2015-02-27 13:56:32 +01:00
  • 3cb569ad88 Fix some email template links Henne Vogelsang 2015-02-27 13:37:40 +01:00
  • 59257c85c5 Merge pull request #602 from v0dro/replace-with-case Henne Vogelsang 2015-02-27 11:53:00 +01:00
  • ee3def430e replace if-else with case-when Sameer Deshmukh 2015-02-26 12:58:28 +05:30
  • 93a09b729e Adapt the ticket text to be more precise Henne Vogelsang 2015-02-18 14:54:18 +01:00
  • 5b0adf5c09 Merge pull request #1 from shubhankardesh/shubhankardesh-patch-1 Shubhankar Deshpande 2015-02-13 07:31:56 +05:30
  • e72af56649 Update index.pdf.prawn Shubhankar Deshpande 2015-02-13 07:17:43 +05:30
  • af8a653fbb Merge pull request #596 from openSUSE/update_nio4r Christian Bruckmayer 2015-02-10 12:15:24 +01:00
  • a7e35b24c4 Updates nio4r to 1.1 Christian Bruckmayre 2015-02-09 18:55:27 +01:00
  • 01f96e27e0 Merge pull request #585 from hennevogel/master Henne Vogelsang 2015-02-02 13:36:06 +01:00
  • 6076e29733 Merge pull request #562 from differentreality/highlights_cfp Stella Rouzi 2015-01-22 20:40:24 +02:00
  • dc05cc83ac Merge pull request #580 from openSUSE/refactor_email_settings Gopesh Tulsyan 2015-01-22 00:49:19 +05:30
  • fbdec2a58e fix sorting in events#index with button functionality and add color/text to switch buttons Stella 2015-01-21 20:12:57 +02:00
  • b8b3703175 fix table sorting in admin/events#index Stella 2014-12-19 12:39:22 +02:00
  • 8fab09e63b proposal creation: only show is_highlight for organizers or cfp Stella 2014-12-19 12:29:20 +02:00
  • 44f693a093 fix height of switch Stella 2014-12-19 12:27:35 +02:00
  • a845dd5d7d add bootstrap-switch for is_highlight Stella Rouzi 2014-12-13 21:13:19 +02:00
  • 2dd326c8b9 show only confirmed events as highlights Stella Rouzi 2014-12-11 20:56:36 +02:00
  • 11d0a71231 fix controller update Stella 2014-12-09 21:40:34 +02:00
  • ecfc348ea8 add highlights and fix cfp in splashpage Stella Rouzi 2014-12-08 18:08:21 +02:00
  • 8e25338436 Merge pull request #582 from ChrisBr/fix71 Christian Bruckmayer 2015-01-21 15:14:19 +01:00
  • 1037df2e50 Merge pull request #584 from differentreality/remove_destroy Henne Vogelsang 2015-01-21 14:16:48 +01:00
  • e9f9f6524b Correct Transifex API key parsing. Fixes #573 Henne Vogelsang 2015-01-21 12:04:53 +01:00
  • e9bcfc1af4 Merge 8686887695 into bca62e6204 Stella Rouzi 2015-01-19 16:38:54 +00:00
  • 8686887695 read config var in js Stella Rouzi 2015-01-19 18:37:07 +02:00
  • 80fbc144ac remove user deletion until further notice Stella 2015-01-18 22:01:05 +02:00
  • 6afb1ee4a9 Fixing tests for email settings template Gopesh Tulsyan 2015-01-15 12:22:36 +05:30
  • 5446c349c2 Events open now in new tab when clicking in schedule close #71 chrisbr 2015-01-15 16:28:53 +01:00