|
|
a61415b53e
|
Merge branch 'master' into 'master'
Improve legibility on sound buttons
Closes #14
See merge request mmueller/soundboard!4
|
2017-12-07 20:50:51 +00:00 |
|
Florian
|
366bbd52bc
|
Fix indentation
|
2017-12-07 18:19:23 +01:00 |
|
|
|
88e6cb9d77
|
Merge branch 'revert-61493f13' into 'master'
Revert "Correct indentation"
See merge request fknoch/soundboard!2
|
2017-12-07 11:16:38 +00:00 |
|
|
|
f40e2ca2f7
|
Revert "Correct indentation"
This reverts commit 61493f130a9d10181e77b8ad6bd9901d3b3e1704
|
2017-12-07 11:16:09 +00:00 |
|
|
|
61493f130a
|
Correct indentation
|
2017-12-07 11:15:17 +00:00 |
|
|
|
f5f1f66b23
|
Change sound button color and text
|
2017-12-07 10:49:49 +00:00 |
|
|
|
72905376e4
|
Merge branch 'revert-fe523e6f' into 'master'
Revert "Update sound button color and typography"
See merge request fknoch/soundboard!1
|
2017-12-07 10:47:34 +00:00 |
|
|
|
ec1a4e560d
|
Revert "Update sound button color and typography"
This reverts commit fe523e6f5333db5e613d994ac3739dae854a90d1
|
2017-12-07 10:46:41 +00:00 |
|
|
|
fe523e6f53
|
Update sound button color and typography
|
2017-12-07 10:45:30 +00:00 |
|
|
|
116ed2adba
|
Merge branch 'master' into 'master'
Master
See merge request mmueller/soundboard!3
|
2017-11-14 21:58:05 +00:00 |
|
|
|
cffcc29606
|
remove tabbing for tag elements
|
2017-11-14 22:38:58 +01:00 |
|
|
|
a18db979bb
|
Merge branch 'metadata' of https://git.wiai.de/mmueller/soundboard
|
2017-11-14 22:18:06 +01:00 |
|
|
|
431512be3d
|
Merge branch 'master' of https://git.wiai.de/mmueller/soundboard
|
2017-11-14 10:58:41 +01:00 |
|
Martin Müller
|
8bfff63e12
|
Merge branch 'master' into metadata
|
2017-11-14 01:07:01 +01:00 |
|
|
|
44361ffc76
|
fixed issue in string comparison
|
2017-11-11 02:27:17 +01:00 |
|
|
|
a11b74f120
|
added support for playing MP3 files from URL using the streams tab
|
2017-11-11 01:29:19 +01:00 |
|
|
|
e6107bdfe3
|
bugfix for searchfield reset using ESC key
|
2017-11-11 01:05:40 +01:00 |
|
|
|
3b9786d8eb
|
Merge branch 'master' into 'master'
added title tag to a/button HTML element
See merge request mmueller/soundboard!2
|
2017-11-07 10:52:40 +00:00 |
|
|
|
c9eff2d77d
|
added title tag to a/button HTML element
|
2017-11-07 11:38:41 +01:00 |
|
Martin Müller
|
1a4526809d
|
Merge branch 'master' into metadata
|
2017-11-06 16:19:47 +01:00 |
|
Martin Müller
|
fad8a1b1f8
|
Rename filter function to searchFilter
|
2017-11-04 17:06:02 +01:00 |
|
Martin Müller
|
92f869ce6b
|
Store changes to tags in metadata DB
|
2017-11-04 16:57:05 +01:00 |
|
Martin Müller
|
b4e795417b
|
Remove print statement used for debugging
|
2017-11-04 12:03:12 +01:00 |
|
Martin Müller
|
5068488386
|
Disable button hover effect when in edit mode
|
2017-11-04 12:01:51 +01:00 |
|
Martin Müller
|
a6a1b04a8e
|
Fix button spacing and adjust it to edit mode
|
2017-11-04 11:58:11 +01:00 |
|
Martin Müller
|
99bb026a56
|
Fix alignment of checkboxes for edit form
|
2017-11-04 11:47:16 +01:00 |
|
Martin Müller
|
d52dede612
|
Fix SQL query for tag to include button name
|
2017-11-03 17:55:11 +01:00 |
|
Martin Müller
|
03be396c87
|
Change SQL query to get already set tags
|
2017-11-03 17:38:48 +01:00 |
|
Martin Müller
|
80e0ba439b
|
Rework edit form w/ checkboxes, filter and DB tags
|
2017-11-03 16:17:10 +01:00 |
|
Martin Müller
|
577e625a51
|
Revert "add images"
This reverts commit f570309d9cc64b761aa2354da885be9cdf8d1b42.
|
2017-10-26 13:07:06 +02:00 |
|
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 |
|
clemens
|
f570309d9c
|
add images
|
2017-10-23 21:04:52 +02:00 |
|
Martin Müller
|
425a6d3094
|
Add hint for JavaScript linter to fix ES6 warnings
|
2017-09-14 18:33:41 +02:00 |
|
Martin Müller
|
d0dc1a7fbd
|
Minor code style improvements (mostly whitespace)
|
2017-09-14 18:33:01 +02:00 |
|
Martin Müller
|
984ff20c19
|
Fix whitespace issues (trailing, indentation, etc)
|
2017-09-14 18:27:36 +02:00 |
|
|
|
b6905e566c
|
fixed wrong js comment
|
2017-08-04 17:39:27 +02:00 |
|
|
|
64102b9396
|
housekeeping in main.js
adding some comments
restructured keylisteners
|
2017-08-04 14:48:19 +02:00 |
|
|
|
6408ca40e4
|
Merge branch 'master' of https://git.wiai.de/mmueller/soundboard
|
2017-08-04 14:26:45 +02:00 |
|
|
|
3d38220023
|
removed blur() in resetSearch()
see d4377e0f49dc8dd5787f4466c9ab7f7e7cd37ec5#note_874 for details
|
2017-08-04 14:26:40 +02:00 |
|
|
|
6e538a6bf8
|
Update README.rst
|
2017-08-04 12:21:09 +00:00 |
|
Martin Müller
|
94224c0c64
|
Serve sound files via Flask for local playback
|
2017-08-04 14:18:58 +02:00 |
|
|
|
ed84c4fbe9
|
added TODOs to main.js
|
2017-08-04 13:59:24 +02:00 |
|
|
|
8eaf74a4b4
|
added apache config for serving sounds to clients
... and playing them on client side
addition to 55e8e04bb25a7ac8ccde6e38b889ec4fad29c7de
|
2017-08-04 13:58:41 +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 |
|
|
|
cd933addf7
|
added kill audio support for local playback
|
2017-08-04 00:58:39 +02:00 |
|
