David Sedeño
|
7c0cd30dda
|
Add venue_photos model and venue_photos admin controller in order to add more images to Venues and allow to delete it.
Show the additional photos in splash. Added fancybox gem for zoom when click on the additional photo.
fix #777
|
2016-02-13 17:39:30 +01:00 |
|
David Sedeño
|
00acf0c255
|
Fix room_params in scheduler update. fix #771
|
2016-02-08 22:52:58 +01:00 |
|
Henne Vogelsang
|
6fa3864771
|
Fix CFP ability
|
2016-02-08 12:53:13 +01:00 |
|
Henne Vogelsang
|
8e324ac1af
|
Fix showing a schedule without venue/rooms
|
2016-02-08 12:52:56 +01:00 |
|
Stella Rouzi
|
813658fb19
|
rebase fixes for commercials path
|
2016-02-06 17:43:51 +01:00 |
|
Stella Rouzi
|
a0d045e156
|
Remove attr_accessible from Program and Cfp, final fixes after introducing strong params
|
2016-02-06 17:43:51 +01:00 |
|
Stella Rouzi
|
f840f2b3f0
|
Rooms belong to venue
|
2016-02-06 17:43:51 +01:00 |
|
Stella Rouzi
|
feabbfbc99
|
rebase against email settings changes
|
2016-02-06 17:42:51 +01:00 |
|
Stella Rouzi
|
444356fbc7
|
Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels
|
2016-02-06 17:42:51 +01:00 |
|
Henne Vogelsang
|
028b82fda8
|
Merge pull request #729 from differentreality/api
API with more options
|
2016-02-06 17:37:35 +01:00 |
|
David Sedeño
|
302d45f91a
|
If there are tickets for the conference, not show the msg about the free of charge. fix #745
|
2016-02-02 21:19:14 +01:00 |
|
Christian Bruckmayer
|
57610eb39e
|
Merge pull request #716 from differentreality/abilities
Abilities: Minor changes & grooming
|
2016-01-25 17:20:24 +01:00 |
|
Stella Rouzi
|
6be8d383b7
|
Remove unnecessary code
|
2016-01-21 21:49:48 +02:00 |
|
Stella Rouzi
|
ecef151f91
|
API with more options, includes #712
|
2016-01-21 21:49:48 +02:00 |
|
Christian Bruckmayer
|
28e55f3f50
|
Merge pull request #737 from ChrisBr/commercial_new
Simplify adding commercials to conference and event
|
2016-01-21 20:29:03 +01:00 |
|
chrisbr
|
23664119bd
|
Implement simplified commercials workflow
It's now possible to simply enter the url of the third party provider to enter a commercial.
|
2016-01-21 19:41:12 +01:00 |
|
Stella Rouzi
|
17a1c0e87c
|
fix hakiri issue
|
2016-01-21 20:19:37 +02:00 |
|
Stella Rouzi
|
152b59aade
|
Fix failed tests of #756
|
2016-01-21 13:05:27 +02:00 |
|
Christian Bruckmayer
|
d7d851cb56
|
Merge pull request #752 from davidsf/titlepage_in_conference_show
Conference title in conference show view. fix #751
|
2016-01-21 11:25:07 +01:00 |
|
chinmaydd
|
4eafa43f7e
|
Fixes Start date being greater than End date
|
2016-01-21 00:26:37 +05:30 |
|
David Sedeño
|
3095787aa7
|
Add title in conference show view. fix #751
|
2016-01-17 20:49:30 +01:00 |
|
Stella Rouzi
|
8ffa8b1e86
|
Venue has show action, not index. Make the ability to schedule an Event more clear.
|
2016-01-13 13:16:15 +02:00 |
|
Christian Bruckmayer
|
81a43cc2b6
|
Raise exception on XSRF fail
Reported by hakiri.io
|
2016-01-13 10:35:16 +01:00 |
|
Stella Rouzi
|
355ecc0ac6
|
Introduce strong parameters
|
2015-12-23 11:36:50 +02:00 |
|
raluka
|
9eb47bd3f0
|
merged from upstream
|
2015-10-14 16:02:40 +02:00 |
|
raluka
|
3d57203727
|
added more consistency for email_settings
|
2015-10-14 15:34:23 +02:00 |
|
Stella Rouzi
|
2e692f7ea5
|
Merge pull request #705 from altsalt/master
added Voted? column to admin/events view
|
2015-10-14 14:31:30 +03:00 |
|
Stella Rouzi
|
759aa54689
|
Syntax style + code groomming
|
2015-10-06 14:15:38 +03:00 |
|
raluka
|
0c4b0b4ac1
|
Refactored EmailSetting incosistency. Fixes #603
|
2015-10-06 11:32:40 +02:00 |
|
raluka
|
1cf877bf76
|
grooming style
|
2015-10-05 13:28:35 +02:00 |
|
raluka
|
f7c70ba55c
|
updated comment layout from upstream; added grouped_by_event behaviour to comments_dropdown and helper
|
2015-09-21 15:56:57 +02:00 |
|
raluka
|
1b63728440
|
Grooming conference.rb to fix rubocop offenses
|
2015-09-17 12:23:01 +02:00 |
|
raluka
|
f294316cba
|
added comments to explain comments_controller
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
f3996a9bff
|
added extra condition for view Create Conference link
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
37339dccc1
|
refactored comments_controller tests; fixed access to Administration link into user_menu view
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
a9a43d726f
|
WIP created tests for comments_controller.rb
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
208478ff2d
|
added pretty view for comments
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
21c10166ec
|
added test file for comments_controller WIP
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
945bac1fe8
|
WIP modified CommentsController#index
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
bc67cac873
|
sorting comments after event title and created at in index
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
8dd0ac7c1d
|
rewrite CommentsController#index to have everything in one call
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
1addae9cd9
|
WIP changed CommentsController#index; temporary view for all_comments
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
7ba3cfd473
|
event title and conference title in 2 different lines now in view
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
cd2a52023b
|
changed comments helper to proper return unread comments available for current_user
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
0c39590f2e
|
fixed Administration link in user_menu dropdown
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
800a41b3f9
|
added logic for available conferences based on roles in comments_controller.rb
|
2015-09-17 12:13:22 +02:00 |
|
raluka
|
52a503afd2
|
changed #signed_in_with_roles(user) in ability.rb model
|
2015-09-17 12:13:21 +02:00 |
|
raluka
|
df29484317
|
changed wrong test for ability
|
2015-09-17 12:13:21 +02:00 |
|
raluka
|
74dcd75a8c
|
created can_manage_comments helper for rendering button
|
2015-09-17 12:13:21 +02:00 |
|
raluka
|
e10a2491d3
|
created tests for user ability
|
2015-09-17 12:13:21 +02:00 |
|