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

1401 commits

Author SHA1 Message Date
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
gotens1211
c1b81755c9 Implementing Countable.js to count words. 
Changed the words_count method to work with countable.js

Added the gem for countable.js
 2017-03-01 19:15:19 +05:30
Stella Rouzi
8b5d6603af Merge pull request #1254 from shlok007/devise 
Updated devise to 4.2.0
 2017-03-01 13:29:44 +02:00
gotens1211
ec1adbada8 Removed duplicate methods date_range_string and date_string. 
Added tests for date_string function

corrections in the test
 2017-03-01 15:39:10 +05:30
Ana María Martínez Gómez
ebb5203887 Exclude conference model from ClassLength cop 
Exclude conference.rb file from ClassLength Rubocop cop and decrease the
max value of this cop to 300, as the following class in number of lines is
event.rb with 218.

Also, remove unused comments from Conference model class.
 2017-02-22 17:08:51 +01:00
Ana
bde2ee3d7d Delete Eventschedules out of conference hours 2017-02-22 09:17:34 +01:00
Ana
b3bbaf87a4 Adapt public schedule to use the confence hours 2017-02-22 09:17:34 +01:00
Ana
7eb9a57c34 Adapt admin schedule to use the confence hours 2017-02-22 09:17:32 +01:00
Ana
9b9d255e3b Add fields in conference edit form for hours 
Make possible to change the start and end hours.
 2017-02-22 09:09:29 +01:00
Ana
b80aff3cce Add times to Conference 
Add start hour and end hour to conference to be able to make the schedule times changeable
 2017-02-22 09:09:29 +01:00
Christian Bruckmayer
0d6ba56e55 Merge pull request #1304 from nikhilgupta1211/register_date 
conference_registrations#new prefilled times
 2017-02-20 10:20:49 +01:00
Christian Bruckmayer
b725bde890 Merge pull request #1296 from JewelSam/master 
#1040 Show email in public option
 2017-02-20 09:56:45 +01:00
gotens1211
82db583217 Default date removed from conference registrations. 2017-02-20 08:57:27 +05:30
Stella Rouzi
cf29150a2a Merge pull request #1290 from siddhantbajaj/dropdown 
Fixed dropdown issues in admin/events#show page
 2017-02-16 10:56:33 +02:00
Stella Rouzi
3f21d1bc37 Merge pull request #1288 from siddhantbajaj/Eventindex 
fixed dropdown issue
 2017-02-16 10:56:00 +02:00
Stella Rouzi
e0e7d83aa0 Merge pull request #1270 from siddhantbajaj/schedule 
Fixed schedule creation when there is no room.
 2017-02-16 10:48:56 +02:00
Siddhant Bajaj
1d4615e297 fixed schedule creation 2017-02-16 00:01:40 +05:30
Siddhant Bajaj
3a9d7b9e1f fixed dropdown issues on Event Index page 2017-02-15 23:43:17 +05:30
Siddhant Bajaj
289a8393c8 fixed dropdown issue 2017-02-15 23:39:02 +05:30
JewelSam
56c69f51b7 #1040 Show email in public option 2017-02-14 17:54:31 +03:00
Hernán Schmidt
a0120734e3 Merge pull request #1287 from sheamunion/issue-1273 
Issue 1273
 2017-02-12 19:59:52 +01:00
shlok007
a2b3396897 rename intersecting_events to intersecting_event_schedules 2017-02-12 19:10:03 +05:30
Shea Munion
efa314befd Merge branch 'issue-1273' of https://github.com/sheamunion/osem into issue-1273 2017-02-09 14:04:18 -06:00
Shea Munion
083efc3016 - Revert change to Conference :short_title validation 
- 'short_title' field in new view accepts a-zA-Z0-9_-
 2017-02-09 14:01:11 -06:00
Shea Munion
f1c66508e2 'short title' hint, pattern & title attr accept a-z0-9_- & prepend URL. 2017-02-09 13:51:32 -06:00
Stella Rouzi
0296a1e70d Merge pull request #1277 from BelieveC/master 
Fixes #1260, Change behavior of proposal update page requirement field
 2017-02-09 11:49:42 +02:00
Ana María Martínez Gómez
f42e4adc45 Merge pull request #1261 from shlok007/resources 
Ability to track resources
 2017-02-09 10:45:51 +01:00
BelieveC
c38cabe06e Fixes #1260, Changes behavior of proposal update page requirement field 2017-02-09 01:50:50 +05:30
shlok007
6db2e8abe7 remove input field from admin/resource#index 2017-02-09 01:11:24 +05:30
Hernán Schmidt
bee4dc9038 Merge pull request #1281 from sheamunion/issue-1273 
Better "short title" UI. Fixes #1273
 2017-02-08 19:38:25 +01:00
Shea Munion
1d4140099f Remove dash from regex for short_title format validation. 2017-02-08 12:23:30 -06:00
Shea Munion
c822d65010 Title attr aligns with hint text. Prepend field with conferences_url. 2017-02-08 12:13:01 -06:00
Shea Munion
f416f0edab Add pattern & title attr to 'short title' field & prepended URL. 2017-02-07 19:38:39 -06:00
Shea Munion
96cfc036bc Remove superfluous 'sign in' link. 2017-02-07 19:26:51 -06:00
JewelSam
0e55a7a3ac #1271 - made 'Remember me' label clickable 2017-02-07 19:36:13 +03:00
shlok007
3065766da9 ability to track resources used in conference 2017-02-07 14:58:45 +05:30
gotens1211
4a9c971ec7 Enable Style/SpaceAroundOperators Rubocop 
Cleared all the offenses for Style/SpaceAroundOperators

Added a description for the Style/SpaceAroundOperators Rubocop.
 2017-02-05 19:43:00 +05:30