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

1866 commits

This branch
This branch
All branches
Author SHA1 Message Date
Henne Vogelsang
e8eb787378 Merge pull request #1171 from differentreality/fix_event_link_in_schedule_events 
Fixes event link in schedule all_events
 2016-08-23 14:46:37 +02:00
differentreality
3fdf183e96 Fixes event link in schedule all_events 2016-08-23 15:13:18 +03:00
Henne Vogelsang
7b64dca766 Merge pull request #1050 from hennevogel/one 
More cherry picked commits for 1.1
 2016-06-30 12:44:22 +02:00
Henne Vogelsang
51503fdff3 revision is deprecated, use branch in mina 2016-06-22 13:24:31 +02:00
Stella Rouzi
d62665a190 XML export fix tests. Add not nil room for scheduled events. 2016-06-22 13:24:10 +02:00
Henne Vogelsang
9d2e97b498 Merge pull request #1043 from hennevogel/one 
One
 2016-06-20 16:36:50 +02:00
Henne Vogelsang
acc1c3c5f3 Deploy from the stable branch and not from master 2016-06-20 15:10:22 +02:00
Stella Rouzi
a16a3f6bfd add test 2016-06-20 15:07:12 +02:00
Stella Rouzi
419f3bb296 fixes 2016-06-20 15:07:12 +02:00
Stella Rouzi
1412369b39 XML export 2016-06-20 15:07:12 +02:00
Rishabh Saxena
5cc12a38ab change datepicker id to place correct constraints 2016-06-20 15:07:12 +02:00
Rishabh Saxena
a394d67063 update nokogiri gem 2016-06-20 15:07:12 +02:00
Henne Vogelsang
50bccbe667 Merge pull request #1031 from hennevogel/one 
Some cherry-picked fixes for 1.1
 2016-06-15 16:59:32 +02:00
Christian Bruckmayer
576dc17100 Implements csv export of registrations 
close #1021
 2016-06-08 13:59:42 +02:00
Ana
32ed3b6373 Wrong test: proposal cannot be rated 2016-06-08 13:59:42 +02:00
Nishanth Vijayan
11f6f36f09 Remove routes of Speakers,People and Photos controllers 2016-06-08 13:59:42 +02:00
Henne Vogelsang
3578953b1e Hotfix question display 
what a mess....
 2016-06-08 13:59:41 +02:00
Henne Vogelsang
5765dd1242 Limit splash navigation options 2016-06-08 13:59:41 +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