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

2357 commits

This branch
This branch
All branches
Author SHA1 Message Date
AEtherC0r3
fdff485b3e Allow confirmed speakers to register anytime 
If the registration period is over then speakers of confirmed events
can't register anymore. They should be able to, since they are gonna be
there anyway.

* Allow the speakers of confirmed events to register regardless of the
registration period
* Provision for registrations of confirmed speakers, so as not to
exceed the registration limit
* Add scope for registered speakers

Fix #829 and fix #802
 2017-05-13 17:47:22 +03:00
Siddhant Bajaj
1c12200003 Fixed paper trail inconsistent results for numeric values 
There is a known issue in paper_trail that whenever we Query the
'versions.object' column it evaluates inconsistent results for numeric
values due to limitations of SQL wildcard matchers against the
serialized objects. So to fix this issue I have manually formed the where
query instead of using where_object and where_object_changes. I have
also added test for the same.
Fixes #1307
 2017-05-11 14:01:52 +03:00
Ana María Martínez Gómez
3ae97eb889 Merge pull request #1486 from Ana06/fix-rubocop-haml 
Fix haml-lint error
 2017-05-11 12:55:42 +02:00
Ana María Martínez Gómez
0aff947f05 Fix haml-lint error 
The error was introduced when merging

https://github.com/openSUSE/osem/pull/1469

as a offense was introduced since the tests there were run
and the PR got merged.
 2017-05-11 11:59:33 +02:00
Ana María Martínez Gómez
52c90811a6 Merge pull request #1469 from agrim123/haml_lint 
Add Haml lint
 2017-05-11 09:58:15 +02:00
selini
8a0f3c99b0 Create links for speakers in admin/reports#index 2017-05-10 10:34:45 +03:00
Eugene Dubinin
93404d543f implement user creation by admin 2017-05-08 22:54:02 +03:00
divyanshumehta
f057900fb1 Added link to lodging section in splashpage's navbar 2017-05-08 15:28:28 +03:00
AEtherC0r3
95b88be061 Add tests for openid signup with every provider 
The spec for omniauth doesn't test signup for every provider, and it
doesn't test if it has tests for all available providers
Also, we no longer use secrets

* Add model test to check if the omniauth providers have changed
* Test signup using every provider
* Replace secretswith environment variables
 2017-05-06 10:37:58 +03:00
AEtherC0r3
9341edd9cb Change mock accounts credentials 
The names and usernames don't follow a canonical pattern
And the emails point to a valid domain not owned by osem and not
reserved for illustration purposes

Normalize the users' names and usernames and change the domain of the
email addresses to example.com

Fix #1365
 2017-05-06 10:37:58 +03:00
Agrim Mittal
681dfb7889 Add haml-lint to travis script 2017-04-26 20:11:38 +05:30
Agrim Mittal
b69eb7d262 generate haml-lint_todo 
Automatically generated using --auto-gen-config and added haml-lint.yml which inherits from haml-lint_todo
 2017-04-26 18:27:20 +05:30
Agrim Mittal
605a1a9c5f Add haml-lint gem 
Added haml_lint gem v0.24.0
 2017-04-26 18:27:20 +05:30
Ana María Martínez Gómez
5be1ad52ee Merge pull request #1334 from siddhantbajaj/DeleteEventSchedules 
Fixed DeleteEventSchedules issue
 2017-04-26 13:38:54 +02:00
Siddhant Bajaj
dc865abaaa Excluded conference_spec from block cop 
Fixes #1333
 2017-04-25 18:00:24 +05:30
Siddhant Bajaj
7ff34c5b23 Added relation between EventSchedule and program model 
Program has many event_schedules through schedules
 2017-04-25 18:00:24 +05:30
Siddhant Bajaj
7ce816e146 Fixed DeleteEventSchedules issue 
Issues with DeleteEventSchedules method in conference controller:
1.It deletes EventSchedules of all the conferences that are not in the
hours range. Instead it should delete EventSchedules of those events
only that belong to that particular conference only.
2.If we set invalid start or end hour attribute of a conference then
also EventSchedules gets deleted even though conference is not
successfully updated.
Fixed both the issues and added test for the same.
 2017-04-25 18:00:24 +05:30
David Sedeño
ec71b111fe Add description to xml. fixes #1435 2017-04-25 13:35:09 +03:00
Ana María Martínez Gómez
8dbe9ceb01 Merge pull request #1337 from siddhantbajaj/Validation 
Added validation in EventSchedule model
 2017-04-24 10:55:43 +02:00
Ana María Martínez Gómez
43d1d8f0a5 Merge pull request #1451 from agrim123/update_rubocop_0.48.1 
update rubocop to 0.48.1
 2017-04-24 10:53:41 +02:00
nasia
a6e8283bcf Fix commercial option for users in dashboard#show #1390 2017-04-24 10:16:39 +03:00
Siddhant Bajaj
23473e1476 Added hour transient attribute to event_scheduled factory 
It allows event_scheduled to be created with custom time.
 2017-04-22 01:28:49 +05:30
Siddhant Bajaj
95d459f058 Added validation in EventSchedule model and test in event_schedule_spec 
EventSchedule start time should be in hours range of the conference.Therefore it adds validation on start_time attribute of event schedule model. It also adds test for the same.
 2017-04-22 01:20:05 +05:30
Agrim Mittal
aaeca108a8 Add missed offenses to rubocop_todo 
A known rubocop bug, solved by adding files manually
Closes #1450
 2017-04-21 21:36:39 +05:30
Agrim Mittal
7a10d69f14 regenerate rubocop_todo 
Automatically generated using --auto-gen-config
 2017-04-21 21:36:21 +05:30
Agrim Mittal
c27ab2d4a9 update to rubocop v0.48.1 
Updated other gems(nokogiri rails-dom-testing) to be able to update rubocop
 2017-04-20 14:58:00 +05:30
Ana María Martínez Gómez
be33f345a1 Merge pull request #1306 from siddhantbajaj/Confirmed_Events 
fixed Confirmed Scheduled Events issue
 2017-04-18 15:37:54 +02:00
Ana María Martínez Gómez
dc190b5339 Merge pull request #1460 from nikhilgupta1211/imageschedule 
Removed the extra condition for displaying the first speaker image
 2017-04-18 15:20:43 +02:00
Siddhant Bajaj
cd9f329939 Fixed Confirmed Scheduled Events issue 
Fixed issues with scheduled_event_distribution method in conference.rb
and added test in conference_spec.rb to confirm issue is fixed.
Fixes #1302
 2017-04-18 18:30:42 +05:30
Ana María Martínez Gómez
7741d43d17 Merge pull request #1449 from sunny-b/master 
Enable Performance/StringReplacement Rubocop cop
 2017-04-18 10:55:10 +02:00
gotens1211
3ead7ef586 Removed the extra condition for displaying the first speaker image 
Removed the if statement in schedule_item.html.haml file which was generating an extra img_tag for the first speaker

Fixes #1454
 2017-04-17 17:40:23 +05:30
Stella Rouzi
c97a774579 Merge pull request #1330 from shlok007/ability-features 
Improved features/ability_spec.rb
 2017-04-14 18:55:54 +03:00
shlok007
f04c7a7cab improved features/ability_spec.rb 2017-04-14 14:51:21 +00:00
Stella Rouzi
92cb010cc6 Merge pull request #1448 from nasia-sam/cfp_access_to_schedule 
Add permission to access admin/shedule by cfp #1432
 2017-04-14 17:14:21 +03:00
Stella Rouzi
c31fea71a8 Merge pull request #1278 from commandprompt/multiple_speakers_manual_event_mgmt_pr 
Implements support for multiple speakers per event and adding events manually by conf admins
 2017-04-14 16:23:02 +03:00
Sunny
0564d2df7a add performance/stringreplacement rubocop cop 
Enabled the performance/stringreplacement rubocop in the .rubocop.yml file and removed it from .rubocop_todo.yml. This cop checks for instances where gsub can be replaced with tr or delete. Supports auto correct, but there weren't any offenses.

Closes #1444
 2017-04-13 21:20:35 -04:00
nasia
11938025cf Add permission to access admin/shedule by cfp#1432 2017-04-13 20:45:19 +03:00
Eugene Dubinin
790e2fd3a2 implement manual event management and support for multiple speakers per event 2017-04-13 17:15:21 +03:00
Ana María Martínez Gómez
46a6a59622 Merge pull request #1430 from codyborders/master 
Adds Style/Tab cop to rubocop.yml
 2017-04-07 18:50:22 +02:00
Ana María Martínez Gómez
fd6d0bf39b Merge pull request #1446 from sunny-b/master 
Enable Style/DotPosition Rubocop cop
 2017-04-07 11:21:34 +02:00
Sunny
03fa299058 enable style/dotposition rubocop cop 2017-04-06 23:19:58 -04:00
Cody Borders
535b3f86d6 Fixes Style/Tab cops 
Removes exclusions for Style/Tab cops in rubocop_todo
Places Style/Tab cop in appropriate alphabetical order
All cops now fixed.
 2017-04-06 10:57:44 -06:00
Christian Bruckmayer
e28d681eb8 Merge pull request #1443 from nasia-sam/similar_splashpage_show_and_edit 
Change Splashpages#show so it matches splashpages#edit
 2017-04-06 17:37:34 +02:00
Christian Bruckmayer
5f74360da8 Merge pull request #1441 from neilhalligan/rubocop-edit 
Add Lint/DuplicatedKey to rubocop
 2017-04-06 09:34:41 +02:00
Neil Halligan
c74e914683 Add Lint/DuplicatedKey to rubocop 
Fixes openSUSE/osem#1437
 2017-04-05 17:33:14 +01:00
nasia
7497d0394e Fix Splashpages#show so it matches splashpages#edit 2017-04-05 19:18:17 +03:00
Ana María Martínez Gómez
c149710da4 Merge pull request #1341 from nikhilgupta1211/edit_splashpage 
Issue #1340 Make Splashpage components selected by default
 2017-04-05 14:34:09 +02:00
gotens1211
eb1e8ed238 Changed the default state of components in splashpage to selected 
Mark the splashpage components to checked for the new action, also modified the display changes in splashpages test

Fixes #1340
 2017-04-05 17:11:11 +05:30
Christian Bruckmayer
dae9aca2c5 Merge pull request #1434 from nasia-sam/admin_resources 
Fix admin/resources inherit
 2017-04-05 13:17:31 +02:00
nasia
6414631a32 Fix admin/resources inherit 2017-04-04 21:30:16 +03:00