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

1523 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nishanth Vijayan
34e8dade05 Enforce min bundler version required by rails-assets 2016-03-08 19:20:35 +05:30
Nishanth Vijayan
64b825cebe Fix markdown editors bug #811 using asset gem. 2016-03-08 16:50:30 +05:30
Henne Vogelsang
b9469f6a17 Merge pull request #847 from ChrisBr/update_country_select 
Update country_select gem
 2016-03-08 11:23:50 +01:00
Christian Bruckmayer
d5f138b3dc Update country_select gem 
and removed git repository from Gemfile. Caused bundle install error in vagrant box.
 2016-03-07 18:28:14 +01:00
Christian Bruckmayer
9fbd2e9618 Merge pull request #827 from hennevogel/feature-proposal_for_track 
Feature: Add/change Track for Event
 2016-03-07 17:12:33 +01:00
Henne Vogelsang
25e879ee13 Merge pull request #825 from chocoelho/switch_vagrant_box 
Updated vagrant box to official Leap release
 2016-03-07 16:24:23 +01:00
Henne Vogelsang
c9cce9fcca Update INSTALL.md 
Add `vagrant exec` instructions
 2016-03-07 14:52:39 +01:00
Christian Bruckmayer
feeac2a816 Merge pull request #846 from chocoelho/add_conference_email 
Add conference email to splashscreen
 2016-03-07 14:19:05 +01:00
Carlos Coelho
fda08ecdb5 Added email to social media section 
related to #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-07 09:47:21 -03:00
Carlos Coelho
483d9a234e Verified contact has email or not 
issue #764

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-07 09:43:55 -03:00
Christian Bruckmayer
c61696a3f8 Merge pull request #845 from rishabhs95/admin-view-users-datatable 
Making datatable responsive in admin's users view.
 2016-03-07 11:26:53 +01:00
Henne Vogelsang
636eb40499 Merge pull request #831 from ChrisBr/letter_open_web 
Add letter_opener_web
 2016-03-07 10:50:30 +01:00
Rishabh Saxena
2c1db3bd2a Making datatable responsive in admin's users view. 2016-03-07 15:15:29 +05:30
Christian Bruckmayer
ac7149fbe5 Merge pull request #832 from ChrisBr/vagrant 
More Vagrant fixes
 2016-03-05 16:23:13 +01:00
Christian Bruckmayer
50d946e4a7 Fixes setup db if statement in bootstrap.sh 
to setup the database if there is no developement and no test database already.
 2016-03-05 15:15:22 +01:00
Christian Bruckmayer
38296b0a63 Rename options.yml to config.yml in bootstrap.sh 
options.yml does not exists in context of OSEM.
Probably a c&p error.
 2016-03-05 15:13:56 +01:00
Christian Bruckmayer
2dad051ab9 Add letter_opener_web 
to present emails in the browser in development mode.
Using letter_opener in combination with Vagrant does not work
because it's not possible to launch a web browser in your
Vagrant box. Fixes #817.
 2016-03-05 14:09:42 +01:00
Christian Bruckmayer
c5c392d4c7 Merge pull request #794 from differentreality/user_model_tests 
Add tests for Event. Remove redundant function 'def week' from Event.
 2016-03-05 13:45:39 +01:00
Christian Bruckmayer
0ddaea2e5f Merge pull request #823 from hennevogel/master 
Some Vagrant fixes
 2016-03-05 13:06:13 +01:00
Henne Vogelsang
feaf9d8078 Feature: Add/change Track for Event 2016-03-05 02:54:09 +01:00
Stella Rouzi
81c82466f8 Add tests for Event. Remove redundant function 'def week' from Event. 2016-03-04 19:46:25 +02:00
Stella Rouzi
18bb1bd237 Merge pull request #770 from hennevogel/feature_venue_show 
Beautify venue#show
 2016-03-04 19:44:49 +02:00
Carlos Coelho
99ce0411bc Updated vagrant box to official Leap release 
related to openSUSE/osem#824

Signed-off-by: Carlos Coelho <carlos@pencillabs.com>
 2016-03-04 13:14:29 -03:00
Henne Vogelsang
af168f0f55 Merge pull request #700 from differentreality/roles_updated 
Roles updated
 2016-03-04 17:11:56 +01:00
Henne Vogelsang
33e1c6eae1 Beautify venues#show 2016-03-04 17:05:42 +01:00
Henne Vogelsang
f83e76102f Make use of holder.js in venue#show 2016-03-04 15:59:17 +01:00
Henne Vogelsang
205fda70ea Some Vagrant fixes 
* The whole boostrap script runs in /vagrant
* Make sure that we don't overwrite existing databases
  even if there is no config for them
 2016-03-04 15:39:00 +01:00
Christian Bruckmayer
3dc7aaf4ea Merge pull request #816 from chashmeetsingh/patch-2 
Update Gemfile.lock
 2016-03-04 08:52:31 +01:00
Chashmeet Singh
edbba42e16 Update Gemfile.lock 
Fixes #815
 2016-03-03 22:35:17 +05:30
Henne Vogelsang
0e01ffa565 Merge pull request #786 from sonalkr132/test 
Speed up test boot time
 2016-03-03 16:42:46 +01:00
Henne Vogelsang
46237a936a Merge pull request #787 from davidsf/fix_schedule_in_firefox 
Fix gradient in schedule page in Firefox
 2016-03-03 16:41:55 +01:00
Aditya Prakash
6301072484 Add webmock for external requests in tests 
external_request.rb needs to be required before lint is run.
 2016-03-02 21:15:29 +05:30
Aditya Prakash
640be7497f Add config to allow running FactoryGirl lint before suit 
By default the lint will be run before every test suit.
Set it to false in config.yml if you would rather just use the rake
task: `bundle exec rake factory_girl:lint`
 2016-03-02 21:15:29 +05:30
Aditya Prakash
f84150362b Move FactoryGirl.lint to rake task 
This significantly improves start time of tests. It is also the recommended
way: https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md#linting-factories

Read more at: https://github.com/thoughtbot/factory_girl/issues/772
 2016-03-02 21:15:28 +05:30
Stella
ccd7ecbb90 Roles into their own controller. Rework interface. Add flash messages to ajax calls. Add description to roles. Possible to edit roles in use. 2016-03-01 17:10:45 +02:00
Christian Bruckmayer
eda5c2bc07 Merge pull request #800 from sonalkr132/allow_future_date 
Allow selection of future dates on registration period page
 2016-03-01 12:17:53 +01:00
Christian Bruckmayer
a8b270f6e1 Merge pull request #803 from sonalkr132/update-rails 
Update rails to 4.2.5.2
 2016-03-01 10:28:20 +01:00
Aditya Prakash
3e146e159b Update rails to 4.2.5.2 
Changed modules are:-
* actionpack: Possible remote code execution vulnerability
  https://groups.google.com/forum/#!topic/rubyonrails-security/ly-IH-fxr_Q
* actionview:  Possible Information Leak Vulnerability
  https://groups.google.com/forum/#!topic/rubyonrails-security/ddY6HgqB2z4

Rest of the action* modules are released with no change.
 2016-03-01 14:40:47 +05:30
Aditya Prakash
0c6075dcc7 DRY datepicker function call 2016-02-29 16:54:51 +05:30
Aditya Prakash
04d5216c38 Allow selection of future dates on registration period page 
close: #798
 2016-02-29 16:28:09 +05:30
Christian Bruckmayer
dace1037bd Merge pull request #776 from sonalkr132/deprecation 
Follow up on update of rails and activeuuid
 2016-02-29 11:40:05 +01:00
Christian Bruckmayer
00b95333c8 Merge pull request #797 from AdiChat/AdiChat-Remove-d3 
Removed d3_rails gem
 2016-02-29 10:30:30 +01:00
AdiChat
b0bc54700b Ran bundle install 2016-02-27 22:08:16 +05:30
Aditya Chatterjee
f57edd1e35 Deleted d3_rails gem 2016-02-27 18:01:38 +05:30
Henne Vogelsang
1313ac0a91 Update mina 2016-02-25 15:40:51 +01:00
Henne Vogelsang
3b0eb1c407 Merge pull request #788 from differentreality/registration_period_before_conference_end 
Add validations for registration_period
 2016-02-25 15:20:17 +01:00
Stella Rouzi
f567187d45 Add validations for registration_period 2016-02-23 12:57:45 +02:00
Christian Bruckmayer
68cc4a73d9 Merge pull request #790 from davidsf/fix_user_show 
Add program to event relation in user/show.
 2016-02-22 22:51:31 +01:00
David Sedeño
cdaf77d8b8 Add program to event relation in user/show. fix #789 2016-02-22 22:20:19 +01:00
David Sedeño
1efdcdc4cf Fix gradient in schedule page in Firefox. fix #748 2016-02-20 23:10:27 +01:00