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

2317 commits

This branch
This branch
All branches
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
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
Stella Rouzi
ab0719096a Merge pull request #1366 from AEtherC0r3/openid_documentation 
Improve Openid documentation
 2017-04-04 15:52:58 +03:00
Stella Rouzi
7297888e38 Merge pull request #1429 from commandprompt/flash_messages_fix_pr 
use flash.now instead of flash before calling render
 2017-04-04 15:51:32 +03:00
AEtherC0r3
3f46fed0b2 Remove reference to secrets.yml in INSTALL.md 
INSTALL.md references two methods for enabling openID
1) adding the provider's API keys in config/secrets.yml and
2) adding the provider's API keys as environment variable in the
relevant .env files

The first method is not acceptable anymore, so it is no longer mentioned
 2017-04-03 23:55:59 +03:00
AEtherC0r3
dcd57934fb Add OpenID test documentation 
* Write a paragraph that informs contributors about the openID test
accounts that are available and provide instructions on how to
enable them in development (#1315) in CONTRIBUTING.md

* Add missing environment variable for openID logins via openSUSE
(OSEM_SUSE_KEY, OSEM_SUSE_SECRET) in dotenv.example
 2017-04-03 23:55:59 +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
af09ad239c Merge pull request #1426 from nasia-sam/dublicated_routes 
Fix dublicated routes
 2017-03-31 15:54:00 +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
nasia
962bbaedb2 Fix dublicated routes 2017-03-31 15:48:44 +03:00
gotens1211
bd51be45e5 Added Include Venue and Lodgings to Splashpage components 
Fixes #1422
 2017-03-31 15:26:59 +05:30
Ana María Martínez Gómez
81ef0bcb6a Merge pull request #1393 from nikhilgupta1211/xml_timezone 
Fixes #1188 show the conference timezone in show.xml.haml
 2017-03-31 11:34:56 +02:00
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
Ana María Martínez Gómez
d1bf19867c Merge pull request #1421 from sunny-b/master 
Enable Style/NegatedIf Cop and Fix Alphabetical Ordering
 2017-03-30 10:30:55 +02:00
Iris Sprague
29650beddb enable negatedif and correct db file 
fix spacing
 2017-03-29 11:24:43 -04:00
Christian Bruckmayer
6ea0752ef7 Merge pull request #1420 from siaw23/master 
Enable Rails/Validation Rubocop cop
 2017-03-29 08:56:38 +02:00
Christian Bruckmayer
6891c760b4 Merge pull request #1419 from alator21/hints_for_user 
Added hints for username and name in sign up form
 2017-03-29 08:55: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
Ana María Martínez Gómez
e2a7e396a2 Merge pull request #1417 from BelieveC/EnableZeroLengthPredicate 
Enable Style/ZeroLengthPredicate Rubocop cop
 2017-03-28 13:18:13 +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
Ana María Martínez Gómez
8a19c52698 Merge pull request #1398 from BelieveC/EnableRedundantSelf 
Enable Style/RedundantSelf Rubocop cop
 2017-03-28 10:48:00 +02:00
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
Ana María Martínez Gómez
444ceb8960 Merge pull request #1400 from siaw23/master 
Group related cops together
 2017-03-27 12:03:22 +02:00
Stella Rouzi
33201ee13c Merge pull request #1401 from nikhilgupta1211/hakiri 
Fix hakiri error
 2017-03-26 17:08:49 +03:00
Stella Rouzi
6367f3f56b Merge pull request #1384 from siddhantbajaj/Venue 
Fixed venue link in todo list for organizer
 2017-03-26 16:58:11 +03:00
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
Stella Rouzi
b3be600855 Merge pull request #1405 from BelieveC/FixScheduleEventBug 
Fix SyntaxError in SchedulesController#events
 2017-03-25 18:33:09 +02:00
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
gotens1211
a1d9cc39f9 Fixes #1402 Updated nokogiri in gemfile.lock 2017-03-25 09:18:17 +05:30
Emanuel Hayford
50b2153754 Group related cops together 
This groups related cops in rubocop configuration file together and
arranges them in an alphabetical order

Close #1385
 2017-03-24 20:13:02 +01:00
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
Stella Rouzi
8fb29972da Merge pull request #1268 from shlok007/tests 
Added feature tests for Roles
 2017-03-21 13:13:15 +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
Christian Bruckmayer
8ae25730f2 Merge pull request #1250 from differentreality/reports 
Move reports to its own controler
 2017-03-21 10:23:06 +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