Commit graph

2393 commits

Author SHA1 Message Date
nasia
6cb11ff2f3 Add Style/WordArray at rubocop.yml #1463 2017-06-06 13:53:05 +03:00
AEtherC0r3
5bb52f24a5 Ignore html_safe in application helper 2017-06-04 15:31:45 +03:00
AEtherC0r3
02d75ec729 Fix registration sorting
Sort the 'Actions' column by registration.attended
2017-06-03 12:37:56 +03:00
Hernán Schmidt
48475b7eba Merge pull request #1504 from shlok007/add-gsoc-label
Introduce label to group GSoC work together
2017-05-30 09:20:13 +02:00
shlok007
1f0601be1b Introduce label to group GSoC work together 2017-05-29 17:26:25 +05:30
Agrim Mittal
e68738c154 update rubocop_todo.yml 2017-05-26 15:47:01 +03:00
Agrim Mittal
255744268b shift relevant functions to versions_helper 2017-05-26 15:47:01 +03:00
Agrim Mittal
b4c2eeb772 change name to versions_helper 2017-05-26 15:47:01 +03:00
hitman
60afb2a474 refractor can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
dbffece956 remove !! from can_manage_volunteers 2017-05-26 15:47:01 +03:00
hitman
4fbb7db16b modify event_type function 2017-05-26 15:47:01 +03:00
hitman
b36d02ceec change to can_manage_volunteers? 2017-05-26 15:47:01 +03:00
hitman
85fa39870d relocate some functions 2017-05-26 15:47:01 +03:00
hitman
c6203a4ed4 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
bb0857cbad remove unnecessary includes from ApplicationHelper 2017-05-26 15:47:01 +03:00
hitman
a5d637fcf1 add documentation for each helper 2017-05-26 15:47:01 +03:00
hitman
5dece1ea48 refractor code into different files 2017-05-26 15:47:01 +03:00
hitman
8320f78d0b add test for new helpers 2017-05-26 15:47:01 +03:00
hitman
d9925f00e9 add volunteers helper 2017-05-26 15:47:01 +03:00
hitman
2e0f7e9b42 relocate some functions 2017-05-26 15:47:01 +03:00
hitman
5b1a730e19 rearrange helper functions 2017-05-26 15:47:01 +03:00
hitman
f63259f187 update rubocop.yml for new files 2017-05-26 15:47:01 +03:00
hitman
e2657bb10d refractor code into different files 2017-05-26 15:47:01 +03:00
Ana María Martínez Gómez
374903def1 Merge pull request #1490 from divyanshumehta/issue_1488
Added Rubocop Cop:Rails/Delegate
2017-05-23 14:24:44 +02:00
divyanshumehta
4594626670 Added link for Cop:Rails in contributing.md 2017-05-23 10:43:03 +05:30
divyanshumehta
4824537aeb Added Rails/Delegate Rubucop Cop 2017-05-23 10:31:40 +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
AEtherC0r3
36b8088726 Replace submitter with speakers in reports#index
Also, in events#show and proposals#index

It is more relevant to check if the speakers have registered to the
conference and filled their biographies than the submitter, because,
there can be multiple speakers and the submitter isn't necessarily one
of them

And, remove admin/events/reports.html.haml, since, it isn't used anymore

Fix #1477, fix #1479
2017-05-20 18:26:45 +03:00
Ana María Martínez Gómez
4a026c9dde Merge pull request #1487 from SergioAtSUSE/from_too_bright_to_matte
Change too bright color to matte
2017-05-15 16:29:19 +02:00
Sergio Lindo Mansilla
207b3611c6 Change too bright color to matte
- The bright colors makes the labels unreadable on some screens.
2017-05-15 15:49:19 +02:00
Chaitanya
008ccf8b6d Add user path to Attendee and Speaker avatar in registration show page
Avatars of attendee and speaker are not linked to respective attendee and speaker. Add user path to each avatar to give more information of attendee and speaker
2017-05-13 22:14:57 +03:00
Agrim Mittal
6c7e8bc8a1 Add rake task for resources 2017-05-13 18:30:30 +03:00
hitman
e73baa2754 add validation for name, used and quantity 2017-05-13 18:30:30 +03:00
Chaitanya
4b72d383ea Fix Travis-Ci errors
Rubocop offenses lead to failure of Travis-ci build. Offensive files are added as exclude files of respective offense in rubocop_todo.yml
2017-05-13 17:49:17 +03:00
Siddhant Bajaj
53a2246ff2 Fixed issue in notification drop down menu
Fixed an indentation issue in notification drop down layout.
2017-05-13 17:48:05 +03:00
AEtherC0r3
dbf7b73d1a Test ConferenceRegistration#new behaviour
Create shared example for when the user can create a new registration
Change older tests to use the shared example
Add tests for confirmed speakers
2017-05-13 17:47:22 +03:00
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