gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 04:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1543 commits 15 branches 2 tags 50 MiB
Commit graph

596 commits

Author SHA1 Message Date
Stella Rouzi
fb4e8958e0 Fix variable @program typo in programs#show 2016-03-09 20:11:59 +02:00
Christian Bruckmayer
9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track 
Feature: Add/change Track for Event
 2016-03-07 17:12:33 +01:00
Christian Bruckmayer
feeac2a816 Merge pull request #846 from chocoelho/add_conference_email 
Add conference email to splashscreen
 2016-03-07 14:19:05 +01:00
Carlos Coelho
fda08ecdb5 Added email to social media section 
related to #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-07 09:47:21 -03:00
Rishabh Saxena
2c1db3bd2a Making datatable responsive in admin's users view. 2016-03-07 15:15:29 +05:30
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
18bb1bd237 Merge pull request #770 from hennevogel/feature_venue_show 
Beautify venue#show
 2016-03-04 19:44:49 +02:00
Henne Vogelsang
33e1c6eae1 Beautify venues#show 2016-03-04 17:05:42 +01:00
Henne Vogelsang
f83e76102f Make use of holder.js in venue#show 2016-03-04 15:59:17 +01:00
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
David Sedeño
cdaf77d8b8 Add program to event relation in user/show. fix #789 2016-02-22 22:20:19 +01:00
Henne Vogelsang
8f42f79423 Merge pull request #769 from hennevogel/gems 
Gems: Update MySQL2, switch assets to rails-assets.org
 2016-02-18 14:03:35 +01:00
Stella Rouzi
73422735c0 Merge pull request #762 from davidsf/registration_limit 
Add registration limit to conference
 2016-02-18 13:55:16 +02:00
David Sedeño
f3f40822b0 Put the config name as title in layouts. fix #773 2016-02-11 21:56:15 +01:00
David Sedeño
28fbc518f3 Add registration_limit to conference model. Added the input for registration limit in the edit conference form. In the controller, if the limit has exceeded redirect to root_path with an alert. fix #761 2016-02-10 15:59:39 +01:00
Henne Vogelsang
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +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