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

2247 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stella Rouzi
a826bb9d1e Merge pull request #1360 from Ana06/contributing 
Improve contributing guide
 2017-03-13 11:52:30 +02:00
Ana María Martínez Gómez
ea4dac2393 Merge pull request #1359 from nikhilgupta1211/view_tests 
Fix #1324 remove view tests
 2017-03-13 10:02:42 +01:00
gotens1211
3ef17e921f Removed the View Tests 2017-03-13 13:33:07 +05:30
Ana María Martínez Gómez
2c33384a87 Improve contributing guide 
Add more details to the Pull Requests workflow section.
 2017-03-12 21:06:53 +01:00
gotens1211
8e4cca980e removed the render banners component test 2017-03-12 18:31:05 +05:30
Hernán Schmidt
05209260a4 Merge pull request #1285 from nikhilgupta1211/modify_navbar 
Sign in Ui improved in mobile
 2017-03-10 17:32:05 +01:00
Ana María Martínez Gómez
00c095d054 Merge pull request #1300 from siddhantbajaj/Demo_data 
Added demo data
 2017-03-10 17:13:40 +01:00
Siddhant Bajaj
f78f449258 Added demo data 2017-03-10 17:40:41 +05:30
Ana María Martínez Gómez
f7f5ab8b58 Merge pull request #1351 from differentreality/contributing_guide 
Add contributing info for first comers
 2017-03-10 12:48:54 +01:00
Stella Rouzi
4ff5bc4c09 Add contributing info for first comers 2017-03-10 11:51:24 +02:00
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
Christian Bruckmayer
b46a721a7d Merge pull request #1332 from agrim123/link_format 
change escape_html: false to true
 2017-03-06 17:34:29 +01:00
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
Henne Vogelsang
61930f8572 Merge pull request #1325 from ChrisBr/fix-heroku 
Reverting #1297 as it broke our heroku deployment
 2017-03-03 15:13:03 +01:00
Christian Bruckmayer
734e1d4dd9
Revert "Mock request to fix factory girl rake" 
This reverts commit 0295850f20.

Because it broke our Heroku deployment.
 2017-03-03 15:08:31 +01:00
Christian Bruckmayer
322d58c61c
Revert "fixed travis issues" 
This reverts commit 1255088ff0.

Because it broke our heroku deployment
 2017-03-03 15:07:54 +01:00
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
Christian Bruckmayer
1ec5c0f0f3 Merge pull request #1321 from differentreality/users_sort_confirmed 
Provide value for sorting column Confirmed? in admin/users#index
 2017-03-03 13:28:53 +01:00
Christian Bruckmayer
b8770f8417 Merge pull request #1323 from nikhilgupta1211/hakiri 
Fixed Hakiri error
 2017-03-03 13:05:44 +01:00
gotens1211
2353fd812e updated rubyzip gem in Gemfile.lock 2017-03-03 17:01:38 +05:30
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
7844554817 Merge pull request #1193 from kormoc/contributing_updates 
Minor Contributing documentation updates.
 2017-03-02 14:07:19 +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
Stella Rouzi
72f2871517 Merge pull request #1267 from nikhilgupta1211/countablejs 
Implementing Countable.js to count words.
 2017-03-01 17:18:37 +02:00
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
Stella Rouzi
fd49e1733f Merge pull request #1311 from nikhilgupta1211/duplicate_methods 
Fixed #1310 removed duplicate methods
 2017-03-01 13:07:21 +02:00
Stella Rouzi
851a5e33b3 Merge pull request #1299 from shlok007/rolify 
Update rolify to 5.1.0
 2017-03-01 12:47:34 +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
3bf8b2472d Merge pull request #1303 from shlok007/ability-spec-resources 
Include test for resources in features/ability_spec.rb
 2017-02-25 20:51:39 +01:00
Christian Bruckmayer
390e68b1ac Merge pull request #1143 from Ana06/schedule-times 
Make the schedule times changeable
 2017-02-23 09:12:02 +01:00
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
Ana María Martínez Gómez
7000e63700 Merge pull request #1297 from siddhantbajaj/Travis_Errors 
fixed travis error
 2017-02-21 18:14:43 +01:00
Siddhant Bajaj
0295850f20 Mock request to fix factory girl rake 2017-02-21 14:44:52 +05:30
shlok007
1ca3147ae0 add resources test in features/ability_spec.rb 2017-02-21 02:01:35 +05:30