mirror/osem
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-06-14 10:47:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,420 Commits 15 Branches 2 Tags
703dce4f5c98a8f97675e631494de6b8c2bc86dd
Commit Graph

2420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shlok Srivastava
703dce4f5c Merge pull request #1517 from shlok007/copy-organizations 
Introduce organizations to OSEM
 2017-06-12 23:21:09 +05:30
Shlok Srivastava
6bb2143282 Merge branch 'master' into copy-organizations 2017-06-12 22:46:53 +05:30
Ana María Martínez Gómez
53040b3be9 Merge pull request #1498 from divyanshumehta/issue_1497 
Added Style/SpaceInsideBrackets Rubocop cop
 2017-06-12 17:45:30 +02:00
shlok007
cc5d47e6de suggested changes 2017-06-12 19:43:44 +05:30
shlok007
6cf9ddbdea fix failing test 2017-06-12 19:43:44 +05:30
shlok007
521c05af61 skip failing tests 2017-06-12 19:43:44 +05:30
shlok007
b29856a122 suggested changes 2017-06-12 19:43:44 +05:30
shlok007
949f5cb591 add foreign key to conferences 2017-06-12 19:43:44 +05:30
shlok007
cce3ff7aea creating default organization while creating a conference 2017-06-12 19:43:44 +05:30
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
divyanshumehta
1223fef87c Use of rubocop compliant unescaping methods in application_helper.rb 2017-06-11 22:57:52 +05:30
divyanshumehta
0d01ed08b0 Added Style/SpaceInsideBrackets Rubocop cop 2017-06-11 22:57:52 +05:30
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