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

975 commits

Author SHA1 Message Date
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +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
Carlos Coelho
483d9a234e Verified contact has email or not 
issue #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-07 09:43:55 -03:00
Rishabh Saxena
2c1db3bd2a Making datatable responsive in admin's users view. 2016-03-07 15:15:29 +05:30
Christian Bruckmayer
c5c392d4c7 Merge pull request #794 from differentreality/user_model_tests 
Add tests for Event. Remove redundant function 'def week' from Event.
 2016-03-05 13:45:39 +01:00
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02: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
af168f0f55 Merge pull request #700 from differentreality/roles_updated 
Roles updated
 2016-03-04 17:11:56 +01: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
Henne Vogelsang
46237a936a Merge pull request #787 from davidsf/fix_schedule_in_firefox 
Fix gradient in schedule page in Firefox
 2016-03-03 16:41:55 +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
Aditya Prakash
0c6075dcc7 DRY datepicker function call 2016-02-29 16:54:51 +05:30
Aditya Prakash
04d5216c38 Allow selection of future dates on registration period page 
close: #798
 2016-02-29 16:28:09 +05:30
Aditya Chatterjee
f57edd1e35 Deleted d3_rails gem 2016-02-27 18:01:38 +05:30
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57: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
David Sedeño
1efdcdc4cf Fix gradient in schedule page in Firefox. fix #748 2016-02-20 23:10:27 +01:00
Henne Vogelsang
ed0f55c45f Fix remaining rubocop problems 2016-02-18 14:40:24 +01:00
Henne Vogelsang
e2fb83146a Merge pull request #768 from hennevogel/rubocop 
Update rubocop todo file
 2016-02-18 14:08:04 +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
405b614c43 Merge pull request #783 from davidsf/fix_proposal_confirmation 
Fix error 500 in user proposal confirmation
 2016-02-18 14:00:02 +02: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
4783bc99b5 Fix error 500 in user proposal confirmation. fix #782 2016-02-17 18:19:32 +01:00
David Sedeño
a88bb4ea97 If the conference has only one day, not put the day twice in splashpage info. fix #780 2016-02-17 16:02:01 +01: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
David Sedeño
00acf0c255 Fix room_params in scheduler update. fix #771 2016-02-08 22:52:58 +01:00
Henne Vogelsang
046f726414 rubocop: Update todo file, enable rails cops 2016-02-08 14:57:23 +01:00
Henne Vogelsang
09ec76a130 Switch javascript assets to rails-assets.org 2016-02-08 13:53:06 +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