David Sedeño
|
8d548eab62
|
Merge 7c0cd30dda into ed083be58b
|
2016-02-14 18:13:51 +00:00 |
|
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
|
f3f40822b0
|
Put the config name as title in layouts. fix #773
|
2016-02-11 21:56:15 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
208478ff2d
|
added pretty view for comments
|
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
|
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
|
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 |
|
raluka
|
b780996128
|
created comments with FactoryGirl
|
2015-09-17 12:13:21 +02:00 |
|
raluka
|
aa1ff51b58
|
small changes
|
2015-09-17 12:13:21 +02:00 |
|
raluka
|
35714f350e
|
Issue#15: Added Comment Notifications: notification_emails and comments view
|
2015-09-17 12:13:21 +02:00 |
|
Christian Bruckmayer
|
244ea9d34a
|
Merge pull request #708 from raluka/remaining_days
Issue #649: Wrong days remaining label when submitting a new proposal
|
2015-08-28 13:27:42 +02:00 |
|
raluka
|
1de8f979cd
|
Issue #649: Wrong days remaining label when submitting a new proposal
|
2015-08-27 10:35:43 +02:00 |
|
William Hale
|
a0ffab098b
|
Wrapped voted? notification in label to promote visibility.
|
2015-08-11 06:23:41 -07:00 |
|
William Hale
|
4af7eef954
|
Removed Voted? column and added information to Rating column.
|
2015-08-11 05:57:08 -07:00 |
|
Stella Rouzi
|
49b38da188
|
Fix ordering for event.average_voting in events#index
|
2015-08-07 20:51:06 -07:00 |
|
William Hale
|
1a068d2d24
|
added Voted? column to admin/events view
|
2015-08-06 23:19:09 -07:00 |
|
Stella Rouzi
|
2a6ca7b0ff
|
Fix ordering for event.average_voting in events#index
|
2015-08-06 07:41:20 +03:00 |
|
raluka
|
3df77c84f6
|
Issue#690: fixed Attendance Button
|
2015-07-15 12:44:08 +02:00 |
|
Stella Rouzi
|
124d275a09
|
Merge pull request #671 from differentreality/registrations_xls
Remove redundant code.
|
2015-07-02 21:27:15 +03:00 |
|
Stella Rouzi
|
8567a997cb
|
Merge pull request #679 from differentreality/switch
Rework bootstrapSwitch
|
2015-07-02 13:08:16 +03:00 |
|
Stella Rouzi
|
ebadb84f2f
|
Fix longitude latitude order
|
2015-06-17 22:08:18 +03:00 |
|
Christian Bruckmayer
|
491df2c5c6
|
Merge pull request #687 from meonkeys/fix-start-date-typo
fix "End Date" typo on Call for Papers show
|
2015-06-17 12:08:54 +02:00 |
|
Adam Monsen
|
279817d57d
|
fix "End Date" typo on Call for Papers show
|
2015-06-16 21:26:15 -07:00 |
|