Skip to content

Commit

Permalink
Merge pull request #127 from pipix51/master
Browse files Browse the repository at this point in the history
Updating FOSSASIA 2015
  • Loading branch information
mariobehling committed Jan 2, 2017
2 parents 0bcd019 + 8be0a1a commit 5c60455
Show file tree
Hide file tree
Showing 5 changed files with 1,075 additions and 655 deletions.
19 changes: 18 additions & 1 deletion sample/FOSSASIA15/microlocations
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
[]
[
{
"id": 1,
"name": "Biopolis, 30 Biopolis Street, Singapore",
"floor": Level 2 Matrix,
"latitude": 1.303304,
"longitude": 103.792613,
"room": Auditorium
},
{
"id": 2,
"name": "NUS Plug-In@Blk71, 71 Ayer Rajah Crescent,",
"floor": null,
"latitude": 1.296667,
"longitude": 103.787173,
"room": null
}
]
93 changes: 92 additions & 1 deletion sample/FOSSASIA15/session_types
Original file line number Diff line number Diff line change
@@ -1 +1,92 @@
[]
[
{
"id":1,
"name":"Welcome Developers in town at RedHat Office",
"length":1.00
},
{
"id": 2,
"name": "Visit of Singapore OneMakerGroup at National Design Center",
"length":4.00
},
{
"id": 3,
"name": "Pre-Event Meetup: Singapore Steamboat followed by get together at Blujaz Cafe",
"length":2.00
},
{
"id": 4,
"name": "Welcome & Registration",
"length":0.50
},
{
"id": 5,
"name": "Talks and Presentations on Open Source Technologies, Software, Hardware, Design",
"length":2.75
},
{
"id": 6,
"name": "Lunch",
"length":1.00
},
{
"id": 7,
"name": "Talks and Presentations on Open Source Technologies, Software, Hardware and Open Design",
"length":3.25
},
{
"id": 8,
"name": "Social Event at Labrador Park",
"length":4.00
},
{
"id": 9,
"name": "Welcome, Breakfast & Registration",
"length":1.00
},
{
"id": 10,
"name": "Workshops and Talks on Open Technologies in Five Tracks",
"length":3.00
},
{
"id": 11,
"name": "Lunch",
"length":1.00
},
{
"id": 12,
"name": "Workshops and Talks on Open Technologies in Five Tracks",
"length":3.50
},
{
"id": 13,
"name": "FOSSASIA Open Tech Community: Dessert, Snack & Pub Crawl",
"length":3.50
},
{
"id": 14,
"name": "Welcome, Breakfast & Registration",
"length":1.00
},
{
"id": 15,
"name": "Workshops and Talks on Open Technologies in Five Tracks",
"length":3.00
},
{
"id": 16,
"name": "Lunch",
"length": 1.00
},
{
"id": 17,
"name": "Workshops and Talks on Open Technologies in Five Tracks",
"length":3.30
},
{
"id": 18,
"name": "After-Event Hacking, Coding, Relaxing at Hackerspace.sg",
"length":1.00
}
]
Loading

0 comments on commit 5c60455

Please sign in to comment.