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

1850 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
1cc2b0cac2 Add heroku button to README.md 2016-06-08 14:55:12 +02:00
Henne Vogelsang
5b773197f3 Update INSTALL.md 2016-06-08 14:47:50 +02:00
Henne Vogelsang
be4198eb37 Merge pull request #1024 from Ana06/event-length 
Limit event types length
 2016-06-02 15:46:45 +02:00
Henne Vogelsang
2cc37290bc Merge pull request #1026 from ChrisBr/csv_export 
Implements csv export of registrations
 2016-06-02 15:46:17 +02:00
Christian Bruckmayer
0de4813c27 Implements csv export of registrations 
close #1021
 2016-06-02 15:22:21 +02:00
Ana
74e889a046 length test in EventType fixed 2016-06-01 13:09:45 +02:00
Ana
55c41810b2 Limit event types lenght 2016-05-31 16:51:12 +02:00
Stella Rouzi
301ad1c722 Merge pull request #1015 from Ana06/wrong-test 
Wrong test: proposal cannot be rated
 2016-05-28 23:58:18 +03:00
Stella Rouzi
e94b766bea Merge pull request #1014 from nishanthvijayan/remove-dead-routes 
Remove routes of Speakers,People and Photos controllers
 2016-05-28 23:56:46 +03:00
Ana
f648b8731a Wrong test: proposal cannot be rated 2016-05-27 00:45:42 +02:00
Nishanth Vijayan
740c57f0ad Remove routes of Speakers,People and Photos controllers 2016-05-27 01:22:41 +05:30
Henne Vogelsang
efda31870b Merge pull request #1012 from hennevogel/master 
Fix heroku setup
 2016-05-25 17:08:20 +02:00
Henne Vogelsang
c2a706d0a1 Apparently something at heroku tries to .tr this... 2016-05-25 17:00:31 +02:00
Henne Vogelsang
a3dd8e6c95 Use config/database.yml for ClearDB config 
If we use .env heroku neither sees DATABASE_URL nor
config/database.yml and assumes we use postgre. There
also is no need to load the rails env in the task.
 2016-05-25 16:49:56 +02:00
Henne Vogelsang
70e82632f2 If no DATABASE_URL is set heroku used postgre 
So set it to some imaginary value. We use a generated database.yml anyway.
 2016-05-25 16:32:03 +02:00
Henne Vogelsang
36b397796d Inherited apps need other deploy steps than master 
We need to setup DATABASE_URL before deploying and populate the database after. Also there is no need for the heroku ruby buildpack twice...
 2016-05-25 15:15:54 +02:00
Henne Vogelsang
799bb6979e Update app.json 2016-05-25 14:48:02 +02:00
Henne Vogelsang
28eed457b2 Add a rake task to setup DATABASE_URL for ClearDB 
There currently is no other way to inherit environment
variables from parent apps on heroku
 2016-05-25 14:41:16 +02:00
Henne Vogelsang
7d77495936 Hotfix question display 
what a mess....
 2016-05-25 14:40:45 +02:00
Henne Vogelsang
949c20ac21 Limit splash navigation options 2016-05-25 13:45:48 +02:00
Henne Vogelsang
fc52cd008e Do not inherit DATABASE_URL 2016-05-25 13:44:26 +02:00
Henne Vogelsang
771bef7e36 Merge pull request #998 from differentreality/task_events_with_wrong_track_id 
Add task to remove non-existent track_id from Event.
 2016-05-25 12:04:09 +02:00
Christian Bruckmayer
dcb27ae999 Merge pull request #1009 from hennevogel/routing 
Fix program routing outside of Admin
 2016-05-23 17:20:14 +02:00
Henne Vogelsang
30e10a4e40 Fix program routing outside of Admin 
We don't have ProgramsController so we can't have routes
for it
 2016-05-23 15:18:25 +02:00
Stella Rouzi
7f97079e9b name of task 2016-05-23 15:00:02 +03:00
Stella Rouzi
d17268e4e1 change name of task 2016-05-23 14:56:49 +03:00
Stella Rouzi
63df0d880b dry 2016-05-23 14:56:49 +03:00
Stella Rouzi
7560e0bc0c namespace data 2016-05-23 14:56:49 +03:00
Stella Rouzi
bd4f2e26be Single task 2016-05-23 14:56:49 +03:00
Stella Rouzi
eb8eda9279 Add task to fix room and difficulty_level foreign_keys 2016-05-23 14:56:49 +03:00
Stella Rouzi
aa38aa6085 Add task to remove non-existent track_id from Event. 2016-05-23 14:56:49 +03:00
Henne Vogelsang
d6a8680d5d Merge pull request #1008 from nishanthvijayan/remove-unused-helpers 
Remove unused helper methods
 2016-05-23 11:52:22 +02:00
Henne Vogelsang
0fd48f103b Merge pull request #1006 from nishanthvijayan/restrict-sponsor-access 
Display sponsor pages only if sponsorship levels are defined
 2016-05-23 11:51:54 +02:00
Nishanth Vijayan
6eda97e10c Remove unused helper methods 2016-05-21 01:00:46 +05:30
Christian Bruckmayer
139df75ab6 Merge pull request #1007 from hennevogel/master 
Adapt the logo data migration task to carrierwave
 2016-05-20 15:23:22 +02:00
Henne Vogelsang
6575bc10db Adapt the logo data migration task to carrierwave 2016-05-19 15:48:27 +02:00
Nishanth Vijayan
e83b2c3a90 Display sponsor pages only if sponsorship levels are defined 2016-05-19 19:11:38 +05:30
Henne Vogelsang
02487be6fb Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings 
Fix deprecation warnings
 2016-05-19 14:37:39 +02:00
Henne Vogelsang
81ddb76c24 Merge pull request #994 from differentreality/allow_nil_max_attendees 
allow max_attendees to be nil
 2016-05-19 12:03:43 +02:00
Henne Vogelsang
6a127a29a3 Merge pull request #1001 from ChrisBr/ability 
Fixes ability
 2016-05-19 12:01:31 +02:00
Henne Vogelsang
afbffbf2b1 Merge pull request #1004 from ChrisBr/proposal_show 
Make proposal show view more robust
 2016-05-19 12:00:23 +02:00
Henne Vogelsang
20be0f58ba Merge pull request #1005 from ChrisBr/ichain 
Hide Submit proposal if iChain is enabled and user is not logged in
 2016-05-19 12:00:10 +02:00
Christian Bruckmayer
aa925f9f75 Hide Submit proposal if iChain is enabled and user is not logged in 
because it's not possible to create a user while submitting a proposal when iChain is enabled. User would get
not authorized error message.
 2016-05-19 11:49:20 +02:00
Christian Bruckmayer
406e37a1d8 Adapt ability to allow proposal creation if cfp is open 
This was not possible before when iChain was enabled.
- Initialize @event object now with load_and_autorize before filter
- Remove not necessary event_users initilization in :new action
- Adapt ability and feature tests
 2016-05-19 11:47:41 +02:00
Christian Bruckmayer
acf5b6e8f2 Make proposal show view more robust 
Partially fixes #718. Some objects have an foreign_key set on track, difficulty level or room but the
referenced object does not exists. This is caused by introducing dependent: nullify after deleting
some of the objects. This commit will make the show page more robust, however, we need to
fix the corrupt objects in an additional commit.
 2016-05-19 10:40:27 +02:00
Christian Bruckmayer
5c4fba8b44 Merge pull request #999 from differentreality/user_bio_count 
Fix bio length when nil in user#edit
 2016-05-19 10:19:29 +02:00
Nishanth Vijayan
d152b5eddc Update paper_trail gem to latest 2016-05-18 23:27:18 +05:30
Nishanth Vijayan
13f0f9703d Replace usage of deprecated member_label option in forms with Array of label/value pairs 2016-05-18 23:26:47 +05:30
Nishanth Vijayan
c00b04e9e8 Update htmlentities gem to remove duplicated key warning 2016-05-17 20:15:49 +05:30
Christian Bruckmayer
7135c0249d Merge pull request #1000 from nishanthvijayan/fix-ability-spec 
Fix ability model spec
 2016-05-17 13:24:14 +02:00