summaryrefslogtreecommitdiff
path: root/www
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'websocket2' into websocketPeter Grassberger2016-06-279-2156/+427
|\
| * drop dropzone, add websocket uploadsPeter Grassberger2016-06-279-1920/+111
| |
| * add socket reconnectPeter Grassberger2016-06-273-21/+71
| |
| * remove old upload functionality, fix progressbarPeter Grassberger2016-06-277-412/+207
| |
| * add websocketsPeter Grassberger2016-06-236-68/+303
| |
* | add clock.now()Christian Pointner2016-06-251-1/+9
|/
* changed <select> based music pool selector to bootstrap dropdownChristian Pointner2016-06-235-25/+49
|
* changed <select> based show selector to bootstrap dropdownChristian Pointner2016-06-234-24/+34
|
* sorting show and musicpool names for selectorChristian Pointner2016-06-223-3/+14
|
* replace .html('') with .empty() and .html(...) with .text(...)Peter Grassberger2016-05-075-15/+15
|
* Merge branch 'websocket'Peter Grassberger2016-05-072-3/+81
|\ | | | | | | | | | | Conflicts: www/js/apps.js www/js/auth.js
| * Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git into ↵Peter Grassberger2016-04-192-2/+18
| |\ | | | | | | | | | websocket
| * | fix websocket archiv source formatPeter Grassberger2016-04-131-2/+2
| | |
| * | websocket test (breaking commit)Peter Grassberger2016-04-013-3/+86
| | |
* | | add subpages to routerPeter Grassberger2016-05-064-25/+62
| | |
* | | init clockPeter Grassberger2016-04-212-6/+3
| | |
* | | replace apps with routerPeter Grassberger2016-04-205-182/+117
| | |
* | | rewrite auth and appsPeter Grassberger2016-04-205-115/+188
| | |
* | | improved rendering of show rhythmChristian Pointner2016-04-192-1/+6
| |/ |/|
* | make show rhythm fancierChristian Pointner2016-04-152-2/+18
|/
* fix addCart optionsPeter Grassberger2016-04-011-1/+1
|
* fix listCarts errorPeter Grassberger2016-04-011-1/+6
|
* Merge branch 'master' into rdxportjs-refactorPeter Grassberger2016-04-016-34/+116
|\ | | | | | | | | | | | | | | Conflicts: www/js/importer.js www/js/jingles.js www/js/musicpools.js www/js/shows.js
| * jingles, musicpools: fix renderUploadingPeter Grassberger2016-03-246-52/+77
| |
| * shows: fix renderUploadingPeter Grassberger2016-03-242-5/+62
| |
* | refactor rdxportjs (breaks stuff)Peter Grassberger2016-03-2411-312/+311
|/
* disable alerts, add onbeforeunload eventPeter Grassberger2016-02-221-4/+8
|
* Warn about running uploadsPeter Grassberger2016-02-224-1/+26
|
* add copyCut and addAndEditCart function to rdxport.rh.jsPeter Grassberger2016-02-221-1/+34
|
* destroy dropzone on cancel, success and modal hidePeter Grassberger2016-02-221-2/+11
|
* show import error in jingles and musicpoolsPeter Grassberger2016-02-224-29/+70
|
* importer: handle import errorsPeter Grassberger2016-02-224-15/+35
|
* shows: fix import position bugPeter Grassberger2016-02-221-1/+1
|
* jingles: fix upload progressbar not showingPeter Grassberger2016-02-194-24/+22
| | | | also set focus on upload button after fileadded
* importer: fix error on upload cancel bugPeter Grassberger2016-02-181-5/+6
|
* refactor importer: cancel import, shows import, etc.Peter Grassberger2016-02-106-427/+275
|
* rename rivendell instance to rdxportPeter Grassberger2016-02-109-40/+38
|
* shows rewrite (import still missing)Peter Grassberger2016-02-105-30/+321
|
* musicpools: replace spinnerPeter Grassberger2016-02-092-2/+3
|
* replace spinning icon with spinkit spinnerPeter Grassberger2016-02-093-6/+154
|
* beautify musicpoolsChristian Pointner2016-02-053-8/+13
|
* instant feedback for jingle action buttonsChristian Pointner2016-02-052-0/+9
|
* make jingle view great againChristian Pointner2016-02-056-15/+32
|
* jingles: add space between action buttonsPeter Grassberger2016-02-051-0/+2
|
* fix #uploadModal stylePeter Grassberger2016-02-051-15/+0
|
* badge vs labelChristian Pointner2016-02-051-1/+1
|
* fixed progress barsChristian Pointner2016-02-054-12/+12
|
* some fixes for uploadmodal - still not working...Christian Pointner2016-02-054-36/+44
|
* fixed logo image pathChristian Pointner2016-02-051-2/+2
|
* cleaned up stylesheets a littleChristian Pointner2016-02-052-1/+29
|