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
2431 commits 15 branches 2 tags 50 MiB
Commit graph

70 commits

Author SHA1 Message Date
divyanshumehta
0d01ed08b0 Added Style/SpaceInsideBrackets Rubocop cop 2017-06-11 22:57:52 +05:30
AEtherC0r3
fa56ff7f6d Add helper function for speaker selection 
The line '@users = User.all.order(:name)' is replicated a lot of times
in EventsController and ProposalsController.
So, this commit removes it and adds a helper function
'speaker_selector_input' that generates the field where the @users
variable was used.
Also, it makes the query more specific.

Fix #1455

Other changes:
* Include the username in the drop down menu
* Add .active scope to User and corresponding tests
* Add :disabled trait to User factory
 2017-05-20 18:27:07 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Chaitanya
4427f43bdf Enable Style/RedundantSelf Rubocop cop 
This cop checks for redundant uses of self. It supports autocorrection, so all the offenses where automatically solved.

Closes #1373
 2017-03-28 13:27:52 +05:30
Alberto Miedes Garcés
e5aa6ab868 Fix bug in User#registered_to_event? 
Fix exception being thrown in `User#registered_to_event?` when the user
is not registered in the corresponding event conference.
 2017-03-17 11:26:47 +01:00
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
Henne Vogelsang
ebcb2780cd Configure OSEM via environment variables 
Instead of reading a yaml file we get configuration from the
environment.
 2016-04-29 16:36:47 +02:00
Ana
a30893fae3 test I removed accidentally while rebasing restored 2016-04-27 00:41:40 +02:00
Ana
22916971c7 Word limit on user biography changes 2016-04-27 00:28:31 +02:00
Ana
5c044a801d Word limit on user biography 2016-04-27 00:27:44 +02:00
Stella Rouzi
01ec43e53a Registration for Events 2016-04-26 16:11:40 +03:00
Aditya Prakash
7e04a267cb Fix get_roles method of User model 
Previous implementation was associating resources with all
the roles regardless of user role in the resource. ie:
if user is cfp member of conf1, the method was returning:
{ organizer => conf1,
  cfp => conf1,
  Info Desk => conf1,
  Volunteers Coordinator => conf1
}
 2016-04-17 14:11:09 +05:30
Aditya Prakash
3c356cbaaf Remove unused functions from user model 
set_up is callback and should be a private method.
removed methods:
* ticket(id) was introduced in 5f8a8ac6, however never used.
* self.prepare(params) only use instance was removed in d21e19b9
* attending_conference?(conference) introduced in merge of person and user model 23bf55b6,
  any previous use instance difficult to find
* biography_word_count: we are using js for this now
* biography_limit only use instance was removed in 23bf55b6
 2016-04-17 12:10:58 +05:30
Ana
922e94649d overriding the #name attribute 2016-03-10 22:49:54 +01:00
Christian Bruckmayer
55ab8a8e8f Set sign_in attributes on iChain login 
Set last_sign_in_at and current_sign_in_at attributes when iChain login is enabled. #807
 2016-03-10 15:04:02 +01:00
Stella Rouzi
40a48e1e7e Update rolify and cancancan 2016-03-07 23:32:15 +02: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
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
355ecc0ac6 Introduce strong parameters 2015-12-23 11:36:50 +02:00
raluka
1addae9cd9 WIP changed CommentsController#index; temporary view for all_comments 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
74dcd75a8c created can_manage_comments helper for rendering button 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
chrisbr
799fd0c3a4 Adds dependent restricted association to some models 
fix #348
 2014-12-18 13:38:40 +01:00
Henne Vogelsang
b65a33f047 Merge pull request #560 from hennevogel/feature-user-view 
Various small UI fixes
 2014-12-09 15:52:44 +01:00
Henne Vogelsang
d13efa5f52 Various small fixes for the participant UI 2014-12-05 16:04:34 +01:00
Stella
0a58301b66 add username for mock credentials of openid in development 2014-11-30 00:08:56 +02:00
Stella Rouzi
57c73f9eae make user an admin only if user is the first one after the deleted user. 2014-11-12 16:22:53 +02:00
Stella Rouzi
2e7169ede7 Make second user admin 2014-11-12 16:21:33 +02:00
Stella
3be200abcc move subscribe to its own controller, add authorization, test subscribe/unsubscribe 2014-11-12 14:00:17 +02:00
Stella Rouzi
4f3684db76 Merge pull request #537 from differentreality/username_deleted_user_seeds 
add username to deleted_user in seeds
 2014-11-12 13:41:16 +02:00
chrisbr
085629958e Test for ichain authentication 2014-11-12 11:45:17 +01:00
Stella
e3ad72268e add is_disabled attribute for deleted user 2014-11-09 20:37:28 +02:00
chrisbr
56cb805110 Adds disabled flag to user and checks it if iChain is enabled 2014-11-06 16:17:11 +01:00
Henne Vogelsang
164dd75712 Include disabled omniauth in ichain config for delayed jobs 2014-11-06 11:16:54 +01:00
chrisbr
49d565def2 Implements iChain authentication 2014-11-04 17:42:47 +01:00
chrisbr
15c6ed127f Implements username authentication 
It's now possible to login with either username or email
That's necessary to be backward compatible for iChain login
 2014-11-03 15:25:33 +01:00
Chrisbr
5f8a8ac6d9 Refactoring Tickets 
- Tickets now independent from registration
- Implemented money gem
#419
 2014-08-28 15:21:05 +02:00
Chrisbr
d21e19b977 Big refactoring of registration 
- Added datatable gem
- Addaed datatable to events, users (#422), registrations
 2014-08-22 15:08:54 +02:00
Stella Rouzi
3bb42bdb10 move sample user creation in seeds 2014-08-15 20:45:29 +03:00
Artem Chernikov
566382eca8 Merge pull request #441 from differentreality/cancancan 
Cancancan
 2014-08-15 12:00:35 +02:00
Stella Rouzi
bf6b09d9f4 add github for openid login 2014-08-15 06:16:42 +03:00
Stella Rouzi
aeb28833f1 fixes 2014-08-13 22:53:14 +03:00
Stella Rouzi
e2fb434dc7 Implement role authorization 2014-08-13 22:53:13 +03:00
Gopesh Tulsyan
41fc21f7f4 Added Subscription model to send emails 2014-08-12 16:47:35 +05:30
Henne Vogelsang
5f96c276e9 Rework the Sign Up/Sign In views 
Use Capybaras save_page when feature tests go wrong
 2014-08-01 13:35:06 +02:00
Henne Vogelsang
c982cbb88a Refactored proposal. Enabled cancancan 2014-07-23 16:24:05 +02:00
Stella Rouzi
a87018192a style fixes 2014-06-30 15:46:52 +03:00