Commit Graph

889 Commits

Author SHA1 Message Date
Nicolas A. Tonne 3c71f48a33 Merge branch 'master' of github.com:nixolas1/Zoff 2015-04-30 23:32:45 +02:00
Nicolas A. Tonne 796b93435e Favicon 2015-04-30 23:32:40 +02:00
Kasper Rynning-Tønnesen 22baed5429 Fixed twitter message 2015-04-30 23:13:52 +02:00
Kasper Rynning-Tønnesen 64a33c400c Refreshing scroll on logout 2015-04-30 23:10:32 +02:00
Kasper Rynning-Tønnesen 5e639eb6be Fixed some scripts 2015-04-30 23:08:38 +02:00
Kasper Rynning-Tønnesen 17d3191568 Resetting adminpass on logout too 2015-04-30 23:06:58 +02:00
Kasper Rynning-Tønnesen 34bc8953c0 Fixed removing of Remove button and faulty variable adminTogg 2015-04-30 23:04:53 +02:00
Nicolas 8ee2d1afa0 Merge pull request #111 from nixolas1/dev
Zöff with Material and Sockets, YOOLOOO
2015-04-30 22:56:31 +02:00
Kasper Rynning-Tønnesen b48d3021b7 Revert "Update README.md"
This reverts commit 917002f424.
2015-04-30 22:55:14 +02:00
Kasper Rynning-Tønnesen adbe209399 Revert "Update README.md"
This reverts commit af0b551c8d.
2015-04-30 22:55:07 +02:00
Kasper Rynning-Tønnesen 4803f5a925 Revert "Update README.md"
This reverts commit 8b3ddf99b9.
2015-04-30 22:54:59 +02:00
Kasper Rynning-Tønnesen 49cc450156 Revert "Update README.md"
This reverts commit ecd6de0d0d.
2015-04-30 22:54:42 +02:00
Nicolas ac5f283a9c Update README.md 2015-04-30 22:51:39 +02:00
KasperRT c17138f1c2 Update README.md 2015-04-30 22:45:18 +02:00
KasperRT ecd6de0d0d Update README.md 2015-04-30 22:42:42 +02:00
KasperRT 8b3ddf99b9 Update README.md 2015-04-30 22:40:40 +02:00
KasperRT af0b551c8d Update README.md 2015-04-30 22:38:48 +02:00
KasperRT 917002f424 Update README.md 2015-04-30 22:36:39 +02:00
Nicolas d797f2dbbd Update README.md 2015-04-30 22:27:49 +02:00
Nicolas A. Tonne 9d55361bbe Prod ready 2015-04-30 22:27:02 +02:00
Kasper Rynning-Tønnesen 8dd9dbedd1 Merge branch 'dev' of https://github.com/nixolas1/Zoff into dev 2015-04-30 22:22:25 +02:00
Kasper Rynning-Tønnesen d6bc7e4620 display and hide on frontpage fix 2015-04-30 22:22:12 +02:00
Nicolas A. Tonne dbb8fe8ac1 Merge branch 'dev' of github.com:nixolas1/Zoff into dev 2015-04-30 22:14:52 +02:00
Nicolas A. Tonne 1f83e49ac8 delete unused shit 2015-04-30 22:14:46 +02:00
Kasper Rynning-Tønnesen 70447c5263 removed some logs 2015-04-30 22:14:06 +02:00
Nicolas A. Tonne 97faaa922b Mobile styling, some toasts, more colors, now uses minified versions 2015-04-30 21:46:26 +02:00
Nicolas A. Tonne 291f6bfdc6 Merge branch 'dev' of github.com:nixolas1/Zoff into dev 2015-04-30 17:26:08 +02:00
Nicolas A. Tonne d3178f549b top menu now at top on mobile 2015-04-30 17:26:04 +02:00
Kasper Rynning-Tønnesen c13de21cd7 Reimplemented vote and guid 2015-04-30 17:13:35 +02:00
Kasper Rynning-Tønnesen 70288779ee Merge branch 'dev' of https://github.com/nixolas1/Zoff into dev 2015-04-30 17:07:27 +02:00
Kasper Rynning-Tønnesen 14c6b284e2 removed votes and guids 2015-04-30 17:07:06 +02:00
Nicolas A. Tonne 0d516b28a2 fix 2015-04-30 17:04:59 +02:00
Nicolas A. Tonne f7273c3c5a Merge branch 'dev' of github.com:nixolas1/Zoff into dev 2015-04-30 16:48:01 +02:00
Nicolas A. Tonne 8ee05b874f Test for song import 2015-04-30 16:47:52 +02:00
Kasper Rynning-Tønnesen 5dcffe47d6 Added ESC listener to already existing document keyup 2015-04-30 15:41:49 +02:00
Kasper Rynning-Tønnesen a78e2883a1 fucking logs 2015-04-29 19:37:40 +02:00
Kasper Rynning-Tønnesen db0baa1c46 Added errorcodes for errorHandler. Removes big problems with unwanted skipping of video when ID's not loaded yet 2015-04-29 19:35:00 +02:00
Nicolas A. Tonne 3277569863 Merge branch 'dev' of github.com:nixolas1/Zoff into dev 2015-04-29 00:39:09 +02:00
Nicolas A. Tonne 8e27fb2823 Fixed hidden result 2015-04-29 00:39:05 +02:00
Kasper Rynning-Tønnesen 090d230727 Added failsafe for error 2015-04-29 00:32:17 +02:00
Nicolas A. Tonne 85d01de33c Merge branch 'dev' of github.com:nixolas1/Zoff into dev
Conflicts:
	static/js/search.js
2015-04-29 00:27:29 +02:00
Nicolas A. Tonne 1b00999158 Close results on search toggler, descriptive logging 2015-04-29 00:26:21 +02:00
Kasper Rynning-Tønnesen ba496369c8 Fixed ESC button not working on search input, and removed some logs 2015-04-29 00:25:00 +02:00
Kasper Rynning-Tønnesen cfc16dfcaf removed log of full list 2015-04-29 00:09:09 +02:00
Kasper Rynning-Tønnesen 5a2a217bc3 more logging 2015-04-29 00:05:07 +02:00
Kasper Rynning-Tønnesen d9b31fb997 logging out videoid 2015-04-29 00:02:36 +02:00
Kasper Rynning-Tønnesen b2519516f6 added parseint for duration 2015-04-28 22:09:29 +02:00
Nicolas A. Tonne 5e9aeebfc2 Add playlist now v3 2015-04-28 18:26:28 +02:00
Kasper Rynning-Tønnesen 204c385d62 Added small log for errorhandler 2015-04-27 16:57:48 +02:00
Nicolas A. Tonne 47eda6beae Mobile styling 2015-04-27 16:10:59 +02:00