1234 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Henne Vogelsang	751bf4eb42	Merge pull request #634 from differentreality/hackweek_proposal_workflow ... Refactoring of proposal workflow. Fixes #215	2015-04-17 10:40:59 +02:00
Stella Rouzi	e6bb168c5e	Refactoring of proposal workflow. Fixes #215	2015-04-16 18:37:31 +03:00
Stella Rouzi	333c5e39bf	Merge pull request #630 from hennevogel/master ... Last stage of refactoring of the ability model and spec	2015-04-15 12:00:46 +03:00
Henne Vogelsang	9e0c871494	Fix rubocop warnings and User index bug	2015-04-15 10:23:24 +02:00
Henne Vogelsang	6a5cccbaad	Last stage of refactoring of the ability model and spec	2015-04-14 17:33:59 +02:00
Henne Vogelsang	762985b83d	Merge pull request #629 from ChrisBr/refactoring_new ... First stage of refactoring of the ability model and spec	2015-04-14 09:45:15 +02:00
chrisbr	ac1d9fd329	First stage of refactoring of the ability model and spec	2015-04-14 08:31:52 +02:00
Henne Vogelsang	6d5d969347	Merge pull request #628 from ChrisBr/update_redcarpet ... Update redcarpet CVE#46916	2015-04-13 14:43:28 +02:00
chrisbr	a47c84dfbb	Update redcarpet CVE#46916	2015-04-11 09:33:08 +02:00
Stella Rouzi	3bd82039ad	Merge pull request #621 from differentreality/subscription_authorization ... no authorization for Conference in subscriptions controller	2015-04-01 11:49:40 +03:00
Stella Rouzi	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	2015-03-28 13:24:21 +02:00
Henne Vogelsang	defef46ae8	Merge pull request #615 from hennevogel/master ... Implements sign up during registration. Solves most of #215	2015-03-26 14:30:14 +01:00
Christian Bruckmayer	ff124632ef	Merge pull request #611 from shayonj/dashboard-status-minutes-fix ... Fixing functions for minutes to hours conversion for dashboard	2015-03-16 12:20:51 +01:00
Christian Bruckmayer	07049d61f8	Merge pull request #618 from sonalkr132/broken_link ... removed broken add user link on admin/users	2015-03-16 12:18:55 +01:00
Aditya Prakash	fb457da675	removed broken add user link on admin/users	2015-03-15 19:28:28 +05:30
Henne Vogelsang	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	2015-03-13 00:43:09 +01:00
Henne Vogelsang	e8ab94e1c7	Implements sign up during registration. Solves most of #215	2015-03-12 23:53:57 +01:00
Christian Bruckmayer	511007138a	Merge pull request #612 from ChrisBr/program ... Implements program section for unscheduled events	2015-03-09 15:47:38 +01:00
chrisbr	232cc249d4	Implements program section for unscheduled events ... close #610	2015-03-09 15:31:06 +01:00
Henne Vogelsang	c7271780f2	Add creation/update times to qanswers	2015-03-04 15:10:11 +01:00
Shayon Mukherjee	37164e3694	Fixing functions for minutes to hours conversion for dashboard	2015-03-02 11:36:42 -06:00
Henne Vogelsang	0894d9ec29	Merge pull request #604 from shayonj/format-comments-partial ... Refactored nested comments. Now using partial to load them	2015-03-02 11:10:25 +01:00
Shayon Mukherjee	54bcc89204	Refactored nested comments. Now using partial to load them	2015-02-27 12:29:18 -06:00
Henne Vogelsang	cc66027220	Update rest-client to fix OSVDB-117461	2015-02-27 13:56:32 +01:00
Henne Vogelsang	3cb569ad88	Fix some email template links	2015-02-27 13:37:40 +01:00
Henne Vogelsang	59257c85c5	Merge pull request #602 from v0dro/replace-with-case ... replaced if-else with case-when	2015-02-27 11:53:00 +01:00
Sameer Deshmukh	ee3def430e	replace if-else with case-when ... replaced if-else with case-when slight update	2015-02-27 11:28:20 +05:30
Henne Vogelsang	93a09b729e	Adapt the ticket text to be more precise	2015-02-18 14:54:18 +01:00
Christian Bruckmayer	af8a653fbb	Merge pull request #596 from openSUSE/update_nio4r ... Updates nio4r to 1.1	2015-02-10 12:15:24 +01:00
Christian Bruckmayre	a7e35b24c4	Updates nio4r to 1.1	2015-02-09 18:55:27 +01:00
Henne Vogelsang	01f96e27e0	Merge pull request #585 from hennevogel/master ... Correct Transifex API key parsing. Fixes #573	2015-02-02 13:36:06 +01:00
Stella Rouzi	6076e29733	Merge pull request #562 from differentreality/highlights_cfp ... add highlights and fix cfp in splashpage	2015-01-22 20:40:24 +02:00
Gopesh Tulsyan	dc05cc83ac	Merge pull request #580 from openSUSE/refactor_email_settings ... Refactor Admin Email Settings Form	2015-01-22 00:49:19 +05:30
Stella	fbdec2a58e	fix sorting in events#index with button functionality and add color/text to switch buttons	2015-01-21 20:12:57 +02:00
Stella	b8b3703175	fix table sorting in admin/events#index	2015-01-21 17:28:19 +02:00
Stella	8fab09e63b	proposal creation: only show is_highlight for organizers or cfp	2015-01-21 17:28:18 +02:00
Stella	44f693a093	fix height of switch	2015-01-21 17:28:18 +02:00
Stella Rouzi	a845dd5d7d	add bootstrap-switch for is_highlight	2015-01-21 17:28:18 +02:00
Stella Rouzi	2dd326c8b9	show only confirmed events as highlights	2015-01-21 17:28:18 +02:00
Stella	11d0a71231	fix controller update	2015-01-21 17:28:18 +02:00
Stella Rouzi	ecfc348ea8	add highlights and fix cfp in splashpage	2015-01-21 17:28:18 +02:00
Christian Bruckmayer	8e25338436	Merge pull request #582 from ChrisBr/fix71 ... Events open now in new tab when clicking in schedule	2015-01-21 15:14:19 +01:00
Henne Vogelsang	1037df2e50	Merge pull request #584 from differentreality/remove_destroy ... remove user deletion until further notice	2015-01-21 14:16:48 +01:00
Henne Vogelsang	e9f9f6524b	Correct Transifex API key parsing. Fixes #573	2015-01-21 12:05:55 +01:00
Stella	80fbc144ac	remove user deletion until further notice	2015-01-18 22:01:05 +02:00
Gopesh Tulsyan	6afb1ee4a9	Fixing tests for email settings template ... Refactor Refactor	2015-01-17 21:17:39 +05:30
chrisbr	5446c349c2	Events open now in new tab when clicking in schedule ... close #71	2015-01-15 16:28:53 +01:00
Gopesh Tulsyan	327db11a8a	Changing id tags for nav form	2015-01-15 11:12:57 +05:30
Gopesh Tulsyan	fc450b98ae	Refactor Admin Email Settings Form	2015-01-15 11:09:08 +05:30
Stella Rouzi	bca62e6204	Merge pull request #564 from differentreality/speakers ... Remove link to change speaker in Events list	2014-12-19 10:49:48 +02:00