gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-14 12:14:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2264 commits 15 branches 2 tags 50 MiB
Commit graph

2264 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hernán Schmidt
89af26bf18 Merge pull request #1387 from openSUSE/lagartoflojo-patch-1 
Fix link to TRANSLATION guide in README
 2017-03-17 16:21:03 +01:00
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
Hernán Schmidt
29e77db802 Fix link to TRANSLATION guide in readme 
It was borked.
 2017-03-17 15:42:37 +01:00
Ana María Martínez Gómez
f73c449be8 Merge pull request #1371 from amiedes/test-coverage 
Increase test coverage for user model. Fix small bug.
 2017-03-17 13:32:47 +01:00
Alberto Miedes Garcés
9d4c02cdb0 Improve test coverage for User model 
* Wrote specs for `User#attended_event?`
* Wrote specs for `User#registered_to_event?
 2017-03-17 11:26: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
Ana María Martínez Gómez
c2866a1810 Merge pull request #1363 from differentreality/contributing_guide 
Documentation updates
 2017-03-17 09:28:04 +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
Stella Rouzi
b0a84ad1c6 Merge pull request #1348 from siddhantbajaj/RegistrationLimit 
Fixed registration limit issue
 2017-03-14 09:12:51 +02:00
Stella Rouzi
893ad60995 Merge pull request #1364 from BelieveC/MockAuthConfigForGithub 
Add mock_auth config for Github
 2017-03-13 19:38:00 +02:00
Siddhant Bajaj
3655c80feb Fixed registration limit issue 2017-03-13 22:59:02 +05:30
Chaitanya
123c9f6a6f Add mock_auth config for Github 2017-03-13 18:48:41 +05:30
Stella Rouzi
e8699f4258 Updating readme, install, payments, contributing files 2017-03-13 14:29:52 +02:00
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
gotens1211
9c2a09eaf2 changed dropdown for small devices 2017-03-11 08:48:21 +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