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

156 commits

Author SHA1 Message Date
Chashmeet Singh
43dbb153c2 fix: #1345 (remove duplicate text in error message) 2017-03-14 22:32:24 +05:30
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string. 
Added tests for date_string function

corrections in the test
 2017-03-01 15:39:10 +05:30
Ana María Martínez Gómez
ebb5203887 Exclude conference model from ClassLength cop 
Exclude conference.rb file from ClassLength Rubocop cop and decrease the
max value of this cop to 300, as the following class in number of lines is
event.rb with 218.

Also, remove unused comments from Conference model class.
 2017-02-22 17:08:51 +01:00
Ana
b80aff3cce Add times to Conference 
Add start hour and end hour to conference to be able to make the schedule times changeable
 2017-02-22 09:09:29 +01:00
Hernán Schmidt
a0120734e3 Merge pull request #1287 from sheamunion/issue-1273 
Issue 1273
 2017-02-12 19:59:52 +01:00
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources 
Ability to track resources
 2017-02-09 10:45:51 +01:00
Shea Munion
1d4140099f Remove dash from regex for short_title format validation. 2017-02-08 12:23:30 -06:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop 
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
 2017-02-05 19:43:00 +05:30
Rishabh Saxena
e0d5b461b3
rubocop: annotate exceptions 2016-12-20 17:21:50 +05:30
Rishabh Saxena
fe828d24db
conference: refactor code and tests 2016-12-20 17:21:50 +05:30
Rishabh Saxena
53291e25b5
automatically create free ticket with new conf 2016-12-20 17:21:49 +05:30
Hernán Schmidt
32019a11e1 Merge pull request #1108 from rishabhs95/stripe 
Online payment feature - direct stripe integration
 2016-08-18 16:04:11 +02:00
Rishabh Saxena
ee0a575a6f add payment model and its associations 2016-08-15 10:59:33 +05:30
Nishanth Vijayan
a45e537bac Setup basic Revision History page 
Sets up paper_trail tracking in important models

and add conference_id to versions for storing conference_id
of conference related objects  as metadata.This will help in querying
for versions related to conferences.

Fix issues with factories & event types initialization.Import paper_trail testing helpers
Fix bug: Creating an event creates a useless version with event update

Add revert and view changes features to revision history
 2016-08-12 13:35:56 +05:30
Ana
7e5d20c89d style: if ! changed by unless 
- if ! changed by unless as it is more readable
- !object.blank? is equivalent to object.present?, also more readable
 2016-08-06 00:57:07 +02:00
Ana
bf7f5ce09f The schedule takes you to the current day and time 
The schedule takes you to the current day and time in case that the current date belongs to the conference schedule.

Closes https://github.com/openSUSE/osem/issues/1057
 2016-07-25 11:33:30 +02:00
Ana
39c4261859 All events takes you to the current day 2016-07-25 11:33:30 +02:00
Ana
0deaf1abc7 Different colors for new tracks, types and levels 
Every time a new track, event type or difficulty level is created, the color picker has a different color by default.

Closes https://github.com/openSUSE/osem/issues/1077
 2016-07-11 13:46:01 +02:00
Ana
460d117d7a making next_color function more readable 2016-06-25 15:36:43 +02:00
Ana
62c3ee1631 Statistics on top of Registrations#index 2016-06-25 14:39:45 +02:00
Ana
f5701f2e77 Statistics on top of Events#index 2016-06-25 14:39:45 +02:00
Henne Vogelsang
40023044af Use PictureUploader on Conference 2016-04-27 17:40:23 +02:00
Henne Vogelsang
ae55c2772f Remove danging :photos table and other photo cruft 2016-04-27 17:40:18 +02:00
Henne Vogelsang
14011f8828 Fix email notifications 2016-04-20 16:22:29 +02:00
Stella Rouzi
b9e10922ee drop dietary choices, social events, and html_export_path 2016-04-09 16:29:20 +03:00
Nishanth Vijayan
48b48e88ac Add before_destroy :cancel to precent role destroy.Change Conference-Role association to have dependent: :destroy_all 2016-03-28 19:49:59 +05:30
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
Henne Vogelsang
e2fb83146a Merge pull request #768 from hennevogel/rubocop 
Update rubocop todo file
 2016-02-18 14:08:04 +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
046f726414 rubocop: Update todo file, enable rails cops 2016-02-08 14:57:23 +01:00
Stella Rouzi
f840f2b3f0 Rooms belong to venue 2016-02-06 17:43: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
Stella Rouzi
152b59aade Fix failed tests of #756 2016-01-21 13:05:27 +02:00
chinmaydd
4eafa43f7e Fixes Start date being greater than End date 2016-01-21 00:26:37 +05:30
Stella Rouzi
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
3d57203727 added more consistency for email_settings 2015-10-14 15:34:23 +02:00
raluka
0c4b0b4ac1 Refactored EmailSetting incosistency. Fixes #603 2015-10-06 11:32:40 +02:00
raluka
11bf53442c Grooming code to fix rubocop offenses 2015-09-17 12:12:51 +02:00
Stella Rouzi
fb607050fe undo deletion of function, so that api works (/api/v1/conferences/) 2015-09-16 10:25:52 +03:00
Henne Vogelsang
68efa06696 Merge pull request #660 from bgeuken/conference_model 
Conference model
 2015-07-02 16:28:06 +02:00
milovanderlinden
5683974151 Fix for #684 2015-06-16 23:09:47 +02:00
Björn Geuken
c972731e20 Small refactoring of get_status & self.get_event_state_line_colors 2015-05-28 10:38:38 +02:00
Björn Geuken
12fa985fff conference: refactor some conditions 2015-05-27 16:06:17 +02:00
Björn Geuken
5a5745947d Simplify cfp_open? method 2015-05-27 16:06:17 +02:00
Björn Geuken
c58585d445 cleanup: if !object.nil? -> if object 2015-05-27 16:06:17 +02:00
Björn Geuken
a1d022d0be Refactor user_registered? method 2015-05-27 16:06:14 +02:00
Björn Geuken
3e77241f8a user_registered: Return false if user is nil 
The return value of user_registered? is only used as boolean. So we can
don't need to hande non existent users separately.
 2015-05-27 16:02:01 +02:00
Björn Geuken
f180ce0d27 Refactor registration_open? method, part II 2015-05-21 19:16:02 +02:00
Björn Geuken
0d8a77c9ef Refactor registration_open? method 
The registration_period is already checked in registration_dates_given?
method. No need to check it twice
 2015-05-21 19:16:02 +02:00