17 Commits

Author SHA1 Message Date
Martin Müller
a1b9dd39c6 Revert "Merge branch 'master' of https://git.wiai.de/mmueller/soundboard"
This reverts commit 95bc31dc24088de96532cfe6d17c99ec889cf771, reversing
changes made to f570309d9cc64b761aa2354da885be9cdf8d1b42.
2017-10-26 13:05:25 +02:00
Martin Müller
743807a3ac Revert "fix merge... hopefully"
This reverts commit d42d0046c6deb3cb8ff18eb1cfb6ff798b20b65c.
2017-10-26 13:05:11 +02:00
clemens
d42d0046c6 fix merge... hopefully 2017-10-23 21:22:14 +02:00
95bc31dc24 Merge branch 'master' of https://git.wiai.de/mmueller/soundboard
Conflicts:
	soundboard.py
	static/main.css
	static/main.js
	templates/index.html
2017-10-23 21:15:53 +02:00
217603823e prod-changes 2017-10-23 21:10:42 +02:00
c3c8af986d removed div dependency as mentioned in 6758be03968a4cc563fbf665382cac7588f05814#note_855 2017-08-04 13:21:23 +02:00
fa9a8de0eb added main.css with support for local playback
... as it has been missed in cd933addf7d09132ad4596de9b357337e007ee56
2017-08-04 13:13:35 +02:00
55e8e04bb2 added support for local audio playback
using howler.js library

added support for ctrl+x to toggle between modes

closes #10
2017-08-04 00:41:13 +02:00
6a77fa054d added ajax loading for streams 2017-08-03 22:42:42 +02:00
d4377e0f49 keyboard controls and visuals
closes #21
2017-08-03 20:34:22 +02:00
fa23ea0fbf made button text unselectable 2017-08-03 19:49:37 +02:00
4c34d4ac0e pointer style cursor on hovering sound buttons 2017-08-03 19:37:58 +02:00
6290c93982 added: sound button resets search field 2017-08-03 17:40:34 +02:00
Martin Müller
eeb5135872 Fix typo in CSS 2017-07-18 13:01:11 +02:00
Martin Müller
3e15a967f8 Implement video killing feature 2017-07-14 14:56:44 +02:00
Martin Müller
72f1125618 Add reset button for search 2017-07-13 23:29:00 +02:00
Martin Müller
3391c7e076 Initial commit 2017-07-13 22:38:05 +02:00