shlok007
3fb316482c
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
ac85bad9b3
migrate conferences to organizations
2017-06-12 19:43:44 +05:30
shlok007
e0d8e85808
suggested changes
2017-06-12 19:43:44 +05:30
shlok007
8edf896d86
introduce organizations
2017-06-12 19:43:44 +05:30
Shlok Srivastava
bf54487a19
Merge pull request #1537 from shlok007/fix-haml-lint
...
Fixes failing haml-lint in admin/conferences/show
2017-06-12 19:28:20 +05:30
shlok007
ce9d2b3c5b
fixes failing haml-lint in admin/conference/show
2017-06-12 18:37:50 +05:30
nasia
8cd3326520
Add charts about sold tickets
2017-06-12 15:24:27 +03:00
AEtherC0r3
41503bb7a0
Compute ticket statistics
...
And exclude admin/ConferencesController from rubocop_todo.yml
2017-06-12 15:24:27 +03:00
AEtherC0r3
c2184c1c4f
Add 'week' column to TicketPurchases
2017-06-12 15:24:27 +03:00
selini
9ff3601453
remove unnecessary functions
2017-06-12 12:31:31 +03:00
selini
071ed50acb
Hide recent Registrations/Submissions when conference is over
2017-06-12 12:31:31 +03:00
Ana María Martínez Gómez
415eadf477
Merge pull request #1533 from mdeniz/split_travis_builds
...
Split in 2 jobs Travis builds
2017-06-10 02:21:06 +02:00
mdeniz
ebe1ca374d
Fix the Travis failure in the last PR about axlsx dependencies
2017-06-09 14:41:51 +02:00
mdeniz
5acb4a9339
Split in 2 jobs Travis build
2017-06-09 14:41:44 +02:00
AEtherC0r3
7a7fcced48
Replace .today with .current in program spec
...
The cfp_open? method uses Date.current, so it should also be tested with
Date.current and not Date.today
Also, build was replaced with create to fix a false negative
This is a partial fix for #1522
2017-06-07 15:04:07 +03:00
Ana María Martínez Gómez
08e5f10559
Merge pull request #1471 from nasia-sam/rubocop_string_array
...
Add Style/WordArray at rubocop.yml #1463
2017-06-06 14:56:38 +02:00
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
