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

1438 commits

Author SHA1 Message Date
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
nasia
7497d0394e Fix Splashpages#show so it matches splashpages#edit 2017-04-05 19:18:17 +03: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
Eugene Dubinin
b7bdb29cbe use flash.now instead of flash where page is rendered in the same controller methods 2017-04-03 20:15:51 +03:00
Stella Rouzi
d90d2344d6 Merge pull request #1423 from nikhilgupta1211/splashpage 
Added Include Venue and Lodgings to the Splashpage components
 2017-04-03 13:59:44 +03:00
Ana María Martínez Gómez
f3e712a1bc Merge pull request #1319 from JewelSam/master 
#1220 adding the cell size attribute to the database
 2017-04-03 10:23:49 +02:00
JewelSam
f6e74461ba Add schedule interval as attribute of a program 
Also, the part of the schedule event is deleted and the length of the event types
changes to the nearest suitable after changing the length of the interval.

This closes #1220
 2017-04-01 21:39:20 +03:00
Ana María Martínez Gómez
42741fa90b Merge pull request #1352 from BelieveC/ScheduleLogIn 
Fixes #1343, Allow viewing public schedule without login
 2017-03-31 15:58:26 +02:00
Ana María Martínez Gómez
93b185e8d8 Merge pull request #1370 from alator21/move_proposal_edit_to_admin 
Move proposal edit to admin
 2017-03-31 15:53:49 +02:00
gotens1211
bd51be45e5 Added Include Venue and Lodgings to Splashpage components 
Fixes #1422
 2017-03-31 15:26:59 +05:30
gotens1211
73a6e06fd3 Show event time in conference timezone 
Added an application helper method `time_with_timezone` to return time with the conference timezone which solves the issue of wrong timezone in `scheule.xml` and `admin/events#show`.

Fixes #1188
 2017-03-31 13:13:57 +05:30
Christian Bruckmayer
6ea0752ef7 Merge pull request #1420 from siaw23/master 
Enable Rails/Validation Rubocop cop
 2017-03-29 08:56:38 +02:00
Alator
8a96bd137c Added hints for username and name in sign up form and in edit profile 2017-03-28 23:02:40 +03:00
Emanuel Hayford
e5587d42a2 Enable Rails/Validation Rubocop cop 
Cop checks for the use of old-style attribute validation. Supports autocorrection which was run
to fix the files concerned

Closes #1414
 2017-03-28 21:47:31 +02:00
Chaitanya
782937b1d9 Enable Style/ZeroLengthPredicate Rubocop cop 
This cop checks for numeric comparisons that can be replaced by a predicate method. It supports autocorrection, so all the offenses where automatically solved.

Closes #1416
 2017-03-28 14:42:21 +05:30
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
Siddhant Bajaj
e8aa7c8a98 Fixed Venue link in todo list for organiser 
"Add venue" link in todo list is not active for the organiser of that
conference. Fixes #1383
 2017-03-26 00:25:44 +05:30
Chaitanya
e46953e03f Fix SyntaxError in SchedulesController#events 
Remove unexpected => from app/views/schedules/_event.html.haml to resolve syntax error

Closes #1404
 2017-03-25 10:41:53 +05:30
Chaitanya
0e8e626156 Allow to view schedule without login 
Add show and events action's can abilities of schedule for not_signed_in user in order to make schedule available to view without login.

Closes #1343
 2017-03-24 20:52:27 +05:30
Alator
d860ec5607 Update proposal link in reports 2017-03-21 19:50:37 +02:00
Ana María Martínez Gómez
4b418238d2 Merge pull request #1378 from BelieveC/EnableDoubleNegation 
Fixes #1374 to Enable Style/DoubleNegation Rubocop
 2017-03-21 11:44:56 +01:00
Stella Rouzi
5e9bc683ae Move reports to separate controller 2017-03-20 17:51:37 +02:00
Stella Rouzi
a325eccc77 Merge pull request #1358 from divyanshumehta/issue_1326 
Changed Ruby syntax in views
 2017-03-20 17:19:28 +02:00
Chaitanya
7de009e46e Enable Style/DoubleNegation Rubocop cop 
This cop checks for uses of double negation (!!) to convert something to a boolean value. It doesn't support autocorrection, so all the offenses where manually solved.

Closes #1374
 2017-03-20 19:12:40 +05:30
divyanshumehta
1ca448df6f Changed Ruby syntax in views. Fixed #1326 2017-03-20 18:27:39 +05:30
Ana María Martínez Gómez
125a7fe29a Merge pull request #1309 from commandprompt/bug_1298_fix_pr 
fixes bug OSEM#1298
 2017-03-17 15:44:47 +01:00
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
d4b9ea48f9 Merge pull request #1320 from nikhilgupta1211/nav_collapse 
changed navbar dropdown for small devices. fixes #1380
 2017-03-16 21:42:20 +01:00
Ana María Martínez Gómez
a5a6c81cd9 Merge pull request #1355 from chashmeetsingh/master 
Update error message
 2017-03-15 15:27:41 +01:00
Chashmeet Singh
43dbb153c2 fix: #1345 (remove duplicate text in error message) 2017-03-14 22:32:24 +05:30
Siddhant Bajaj
3655c80feb Fixed registration limit issue 2017-03-13 22:59:02 +05:30
gotens1211
9c2a09eaf2 changed dropdown for small devices 2017-03-11 08:48:21 +05:30
gotens1211
db2d776c3b Sign in Ui improved in mobile 
hover fix for sign_in btn

improved osem-navbar.css.scss

removed class black
 2017-03-08 21:20:11 +05:30
Stella Rouzi
56c7906d52 Merge pull request #1338 from nasia-sam/change_date_format 
changed date format in proposals#show
 2017-03-08 11:08:24 +02:00
Stella Rouzi
77c7bdfecf Merge pull request #1266 from AEtherC0r3/fix_unreachable_code 
Remove the unreachable code and modify the error message in ConferenceRegistrationsController#new
 2017-03-08 10:55:27 +02:00
Stella Rouzi
cd997c8e88 Merge pull request #1275 from shlok007/intersecting-events 
Display concurrent events
 2017-03-08 10:51:53 +02:00
nasia
c7e6fb42b7 changed date format in proposals#show 2017-03-07 21:21:00 +02:00
AEtherC0r3
88e1646e87 Fix unreachable code (#1140) in ConferenceRegistrationController#new 
Remove the unreachable code from ConferenceRegistrationController#new
Rework the  error message logic in ConferenceRegistrationController#new
Fix redirect to #edit when the user is registered
Refactor ConferenceRegistrationController#new spec and add more tests
 2017-03-07 17:40:19 +02:00
shlok007
4dd10d09ad display concurrent events on event#show 2017-03-07 20:56:38 +05:30
hitman
226d16dc63 fix markdown issue 2017-03-06 20:57:04 +05:30
hitman
040db7990b change escape_html: false to true 2017-03-06 18:38:45 +05:30
Christian Bruckmayer
f85ff0c6c5 Merge pull request #1322 from differentreality/commercial_in_admin_event 
Commercial in admin/events#show and all links in admin namespace
 2017-03-03 13:29:24 +01:00
Stella Rouzi
1772e13523 Shows commercial in admin/events#show and links to admin namespace 2017-03-03 12:43:59 +02:00
Stella Rouzi
2dba9287ae Provide value for sorting column Confirmed? in admin/users#index 2017-03-03 12:36:42 +02:00
Ana María Martínez Gómez
acc4cc3aef Merge pull request #1283 from siddhantbajaj/Voteschange 
show vote changes
 2017-03-02 14:10:39 +01:00
Christian Bruckmayer
ff65b3b601 Merge pull request #1243 from cniedzwiedz/squash_test 
Fixed XSS in markdown() method
 2017-03-02 14:01:51 +01:00
Siddhant Bajaj
dcfc25a541 Show vote versions in event history 2017-03-02 17:07:19 +05:30