Commit graph

  • 5664b99dc4 changed #signed_in_with_roles(user) in ability.rb model raluka 2015-09-01 13:01:57 +02:00
  • 244ea9d34a Merge pull request #708 from raluka/remaining_days Christian Bruckmayer 2015-08-28 13:27:42 +02:00
  • 062762089b changed wrong test for ability raluka 2015-08-27 12:36:35 +02:00
  • 1de8f979cd Issue #649: Wrong days remaining label when submitting a new proposal raluka 2015-08-21 19:15:02 +02:00
  • a3b6f204cb created can_manage_comments helper for rendering button raluka 2015-08-26 22:09:36 +02:00
  • 84cd952b57 created tests for user ability raluka 2015-08-26 13:07:13 +02:00
  • eab2894fad created comments with FactoryGirl raluka 2015-08-25 14:41:09 +02:00
  • b6d726d40e unread_notifications has no longer assigned instance variable raluka 2015-08-24 17:44:24 +02:00
  • 878e6cc1f8 small changes raluka 2015-08-24 17:17:29 +02:00
  • 38e8be8793 Issue#15: Added Comment Notifications: notification_emails and comments view raluka 2015-07-17 18:55:47 +02:00
  • c2af760baf Merge pull request #704 from differentreality/vote_order_events_index Henne Vogelsang 2015-08-24 11:06:51 +02:00
  • a0ffab098b Wrapped voted? notification in label to promote visibility. William Hale 2015-08-11 06:23:41 -07:00
  • 3505ab062b Merge branch 'master' of https://github.com/altsalt/osem William Hale 2015-08-11 05:57:46 -07:00
  • 4af7eef954 Removed Voted? column and added information to Rating column. William Hale 2015-08-11 00:34:22 -07:00
  • 1b8ec36bc1 Removed Voted? column and added information to Rating column. William Hale 2015-08-11 00:34:22 -07:00
  • fd998f68b2 Merge 900c62c72b into a73ca335a9 Zachary Jaffee 2015-08-11 03:24:02 +00:00
  • 900c62c72b updated gemfile to depricate D3-rails Zach Jaffee 2015-08-10 23:22:26 -04:00
  • 49b38da188 Fix ordering for event.average_voting in events#index Stella Rouzi 2015-08-06 07:41:20 +03:00
  • 1a068d2d24 added Voted? column to admin/events view William Hale 2015-08-06 23:19:09 -07:00
  • 2a6ca7b0ff Fix ordering for event.average_voting in events#index Stella Rouzi 2015-08-06 07:41:20 +03:00
  • a73ca335a9 Merge pull request #697 from raluka/toggle_button Henne Vogelsang 2015-07-15 16:52:38 +02:00
  • 3df77c84f6 Issue#690: fixed Attendance Button raluka 2015-07-10 15:40:11 +02:00
  • 4edc189d66 Merge ff6f53aec2 into 124d275a09 raluca 2015-07-07 17:10:48 +00:00
  • ff6f53aec2 refactoring code for attendance button raluka 2015-07-07 19:10:20 +02:00
  • 522f0b31d9 created action for attendance-button raluka 2015-07-06 18:36:46 +02:00
  • bd0cfb99bc properly created switch button raluka 2015-07-02 14:23:31 +02:00
  • e1832732b4 Added check_box for presence raluka 2015-07-02 12:27:28 +02:00
  • 124d275a09 Merge pull request #671 from differentreality/registrations_xls Stella Rouzi 2015-07-02 21:27:15 +03:00
  • 68efa06696 Merge pull request #660 from bgeuken/conference_model Henne Vogelsang 2015-07-02 16:28:06 +02:00
  • 5f31a4b027 Merge pull request #685 from dogodigi/iss684 Henne Vogelsang 2015-07-02 16:25:19 +02:00
  • 8567a997cb Merge pull request #679 from differentreality/switch Stella Rouzi 2015-07-02 13:08:16 +03:00
  • 35c37272e6 Update INSTALL.md Henne Vogelsang 2015-06-30 12:33:36 +02:00
  • 51b01d638c Update INSTALL.md Henne Vogelsang 2015-06-30 12:09:21 +02:00
  • 26ab437c9e Merge pull request #689 from differentreality/cfp_view_spec Christian Bruckmayer 2015-06-18 09:34:52 +02:00
  • 8c7821a919 Merge pull request #681 from differentreality/longitude_latitude Stella Rouzi 2015-06-17 23:18:41 +03:00
  • ebadb84f2f Fix longitude latitude order Stella Rouzi 2015-06-15 12:19:13 +03:00
  • 848aa5f12a Small test addition for #687 Stella Rouzi 2015-06-17 22:04:43 +03:00
  • 491df2c5c6 Merge pull request #687 from meonkeys/fix-start-date-typo Christian Bruckmayer 2015-06-17 12:08:54 +02:00
  • 279817d57d fix "End Date" typo on Call for Papers show Adam Monsen 2015-06-16 21:26:15 -07:00
  • 5683974151 Fix for #684 milovanderlinden 2015-06-16 23:09:47 +02:00
  • 5b6f79bbd8 Merge pull request #659 from bgeuken/fix_registration_dates_given Christian Bruckmayer 2015-06-15 22:06:42 +02:00
  • a80e3d814e Merge pull request #656 from bgeuken/make_schedules_links Christian Bruckmayer 2015-06-15 22:06:33 +02:00
  • 8575c3843f Merge 6b3ed8a05e into a35f98b1a3 Stella Rouzi 2015-06-15 09:00:58 +00:00
  • 6b3ed8a05e Fix labels for longitude latitude Stella Rouzi 2015-06-15 12:00:12 +03:00
  • 53f0606ac1 Rework bootstrapSwitch Stella Rouzi 2015-06-14 22:28:33 +03:00
  • 19ebe11d29 Merge 24db130c92 into a35f98b1a3 Rob Smith 2015-06-14 19:16:31 +00:00
  • a35f98b1a3 Merge pull request #678 from kormoc/fix_abstract_word_count Stella Rouzi 2015-06-14 22:15:32 +03:00
  • 922e4934ba Fix the abstrct count on the proposal create and edit pages Rob Smith 2015-06-14 11:28:15 -07:00
  • 24db130c92 Allow a proposal to be created with a Subtitle and Difficulty Level. Rob Smith 2015-06-13 12:28:27 -07:00
  • a9f806ca39 Merge pull request #674 from differentreality/dasboard_todo_venu_link Stella Rouzi 2015-06-12 12:36:16 +03:00
  • 0013a3a814 Merge pull request #639 from differentreality/devise_partials Stella Rouzi 2015-06-12 12:30:51 +03:00
  • b57e5a64fe Merge pull request #670 from differentreality/users_changes Stella Rouzi 2015-06-12 10:46:28 +03:00
  • 529a75eee6 Edit link for venue in dashboard TODO list Stella Rouzi 2015-06-12 10:34:31 +03:00
  • 04e9f77138 Remove redundant code. Stella Rouzi 2015-06-11 15:37:00 +03:00
  • bd79719054 style Stella Rouzi 2015-06-11 15:22:54 +03:00
  • 2b433a9cbe make @user definition more clear Stella Rouzi 2015-04-23 14:53:55 +03:00
  • 30831ce718 Add styling to passwords and confirmations Stella Rouzi 2015-04-22 20:40:21 +03:00
  • 28143a8cce keep fields reference in devise new registration Stella Rouzi 2015-04-20 18:38:48 +03:00
  • b8313aa064 Styling Stella Rouzi 2015-04-20 18:30:47 +03:00
  • 969c24c091 Move common views to partial Stella Rouzi 2015-04-18 21:44:40 +03:00
  • 393f26c679 De-activate buttons in registrations#show when conference has ended, so that user cannot edit registration details after the conference is over. Stella Rouzi 2015-06-11 15:15:02 +03:00
  • fcca0e71d2 show label of confirmed or unconfirmed in users#show Stella Rouzi 2015-03-02 12:58:06 +02:00
  • bc2b262510 add username and nickname in user#show and styling changes Stella Rouzi 2015-03-02 11:35:08 +02:00
  • 93bbd0ea0d td width with col-md Stella Rouzi 2015-03-01 17:15:57 +02:00
  • 1890aece1d remove datatable error in admin/users#index due to submissions table Stella Rouzi 2015-03-01 17:01:28 +02:00
  • 40b517d209 Update email_settings.rb Sarah Julia Kriesch 2015-06-02 18:40:52 +02:00
  • b6c84d7984 Merge 01edcb37c9 into b15c1abd2e Christian Bruckmayer 2015-06-01 09:18:35 +00:00
  • 01edcb37c9 Add schema changes chrisbr 2015-06-01 11:17:37 +02:00
  • a31d0bf9f5 Update 201505312045_rename_email_settings.rb Sarah Julia Kriesch 2015-05-31 22:39:47 +02:00
  • 53a8627bba Update 201505312045_rename_email_settings.rb Sarah Julia Kriesch 2015-05-31 22:22:37 +02:00
  • 9651c57748 Update 201505312045_rename_email_settings.rb Sarah Julia Kriesch 2015-05-31 22:03:35 +02:00
  • 1ba26fd111 Create 201505312045_rename_email_settings.rb Sarah Julia Kriesch 2015-05-31 20:48:10 +02:00
  • c972731e20 Small refactoring of get_status & self.get_event_state_line_colors Björn Geuken 2015-05-19 20:18:28 +02:00
  • 12fa985fff conference: refactor some conditions Björn Geuken 2015-05-19 20:12:03 +02:00
  • 5a5745947d Simplify cfp_open? method Björn Geuken 2015-05-19 20:06:26 +02:00
  • c58585d445 cleanup: if !object.nil? -> if object Björn Geuken 2015-05-19 20:05:02 +02:00
  • a1d022d0be Refactor user_registered? method Björn Geuken 2015-05-19 19:57:50 +02:00
  • 3e77241f8a user_registered: Return false if user is nil Björn Geuken 2015-05-19 19:54:10 +02:00
  • e334a6dec3 Add a test for user_registered? Björn Geuken 2015-05-19 19:52:08 +02:00
  • f180ce0d27 Refactor registration_open? method, part II Björn Geuken 2015-05-19 20:04:19 +02:00
  • 0d8a77c9ef Refactor registration_open? method Björn Geuken 2015-05-19 20:02:02 +02:00
  • bc966259fb Refactor registration_dates_given? Björn Geuken 2015-05-21 18:53:27 +02:00
  • 7638b33926 Fix registration_dates_given? Björn Geuken 2015-05-21 18:48:07 +02:00
  • 0705a070a2 Merge 71c37c4142 into b15c1abd2e Sarah Julia Kriesch 2015-05-18 19:30:14 +00:00
  • b15c1abd2e Merge pull request #657 from bgeuken/calculate_progress Henne Vogelsang 2015-05-18 14:53:37 +02:00
  • ca7f1a3b25 Simplify progress calculation Björn Geuken 2015-05-16 15:21:30 +02:00
  • 1862534b2c Avoid float conversion when calculating progress Björn Geuken 2015-05-16 15:19:03 +02:00
  • 5043d26cc5 Update comment of calculate_progress method Björn Geuken 2015-05-16 15:17:20 +02:00
  • b685628208 Remove superflous condition Björn Geuken 2015-05-16 14:54:15 +02:00
  • 94bb76f5ec Haml'fy schedule_item partial Björn Geuken 2015-05-16 14:52:18 +02:00
  • 7309782b05 TypoFix: <span> -> </span> Björn Geuken 2015-05-16 14:50:12 +02:00
  • 02e6f78153 Handle talks on the scheduler table as links Björn Geuken 2015-05-15 17:52:51 +02:00
  • 93135a6085 Move view for proposals on schedule board into a partial Björn Geuken 2015-05-15 17:27:22 +02:00
  • 1731625153 Remove superflous span element Björn Geuken 2015-05-15 17:22:46 +02:00
  • 54f86a3212 Replace tabs by whitespaces and fix indentation Björn Geuken 2015-05-15 17:20:38 +02:00
  • 71c37c4142 Update email_settings.rb Sarah Julia Kriesch 2015-05-14 17:43:11 +02:00
  • 090f2a0245 Update email_settings.rb Sarah Julia Kriesch 2015-05-14 16:36:31 +02:00
  • 1b2bf50355 Merge a1cb616a9c into fc56c06991 Tommy Jans 2015-05-07 09:38:41 +00:00
  • fc56c06991 Merge branch 'cwxda-master' Henne Vogelsang 2015-05-07 11:38:20 +02:00
  • 1cbda33564 osc15 ruby workshop fixing issue #650 Tommy Jans 2015-05-02 14:57:30 +02:00