Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'websocket2' into websocket | Peter Grassberger | 2016-06-27 | 9 | -2156/+427 | |
|\ | ||||||
| * | drop dropzone, add websocket uploads | Peter Grassberger | 2016-06-27 | 9 | -1920/+111 | |
| | | ||||||
| * | add socket reconnect | Peter Grassberger | 2016-06-27 | 3 | -21/+71 | |
| | | ||||||
| * | remove old upload functionality, fix progressbar | Peter Grassberger | 2016-06-27 | 7 | -412/+207 | |
| | | ||||||
| * | add websockets | Peter Grassberger | 2016-06-23 | 6 | -68/+303 | |
| | | ||||||
* | | add clock.now() | Christian Pointner | 2016-06-25 | 1 | -1/+9 | |
|/ | ||||||
* | changed <select> based music pool selector to bootstrap dropdown | Christian Pointner | 2016-06-23 | 5 | -25/+49 | |
| | ||||||
* | changed <select> based show selector to bootstrap dropdown | Christian Pointner | 2016-06-23 | 4 | -24/+34 | |
| | ||||||
* | sorting show and musicpool names for selector | Christian Pointner | 2016-06-22 | 3 | -3/+14 | |
| | ||||||
* | replace .html('') with .empty() and .html(...) with .text(...) | Peter Grassberger | 2016-05-07 | 5 | -15/+15 | |
| | ||||||
* | Merge branch 'websocket' | Peter Grassberger | 2016-05-07 | 2 | -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 Grassberger | 2016-04-19 | 2 | -2/+18 | |
| |\ | | | | | | | | | | websocket | |||||
| * | | fix websocket archiv source format | Peter Grassberger | 2016-04-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | websocket test (breaking commit) | Peter Grassberger | 2016-04-01 | 3 | -3/+86 | |
| | | | ||||||
* | | | add subpages to router | Peter Grassberger | 2016-05-06 | 4 | -25/+62 | |
| | | | ||||||
* | | | init clock | Peter Grassberger | 2016-04-21 | 2 | -6/+3 | |
| | | | ||||||
* | | | replace apps with router | Peter Grassberger | 2016-04-20 | 5 | -182/+117 | |
| | | | ||||||
* | | | rewrite auth and apps | Peter Grassberger | 2016-04-20 | 5 | -115/+188 | |
| | | | ||||||
* | | | improved rendering of show rhythm | Christian Pointner | 2016-04-19 | 2 | -1/+6 | |
| |/ |/| | ||||||
* | | make show rhythm fancier | Christian Pointner | 2016-04-15 | 2 | -2/+18 | |
|/ | ||||||
* | fix addCart options | Peter Grassberger | 2016-04-01 | 1 | -1/+1 | |
| | ||||||
* | fix listCarts error | Peter Grassberger | 2016-04-01 | 1 | -1/+6 | |
| | ||||||
* | Merge branch 'master' into rdxportjs-refactor | Peter Grassberger | 2016-04-01 | 6 | -34/+116 | |
|\ | | | | | | | | | | | | | | | Conflicts: www/js/importer.js www/js/jingles.js www/js/musicpools.js www/js/shows.js | |||||
| * | jingles, musicpools: fix renderUploading | Peter Grassberger | 2016-03-24 | 6 | -52/+77 | |
| | | ||||||
| * | shows: fix renderUploading | Peter Grassberger | 2016-03-24 | 2 | -5/+62 | |
| | | ||||||
* | | refactor rdxportjs (breaks stuff) | Peter Grassberger | 2016-03-24 | 11 | -312/+311 | |
|/ | ||||||
* | disable alerts, add onbeforeunload event | Peter Grassberger | 2016-02-22 | 1 | -4/+8 | |
| | ||||||
* | Warn about running uploads | Peter Grassberger | 2016-02-22 | 4 | -1/+26 | |
| | ||||||
* | add copyCut and addAndEditCart function to rdxport.rh.js | Peter Grassberger | 2016-02-22 | 1 | -1/+34 | |
| | ||||||
* | destroy dropzone on cancel, success and modal hide | Peter Grassberger | 2016-02-22 | 1 | -2/+11 | |
| | ||||||
* | show import error in jingles and musicpools | Peter Grassberger | 2016-02-22 | 4 | -29/+70 | |
| | ||||||
* | importer: handle import errors | Peter Grassberger | 2016-02-22 | 4 | -15/+35 | |
| | ||||||
* | shows: fix import position bug | Peter Grassberger | 2016-02-22 | 1 | -1/+1 | |
| | ||||||
* | jingles: fix upload progressbar not showing | Peter Grassberger | 2016-02-19 | 4 | -24/+22 | |
| | | | | also set focus on upload button after fileadded | |||||
* | importer: fix error on upload cancel bug | Peter Grassberger | 2016-02-18 | 1 | -5/+6 | |
| | ||||||
* | refactor importer: cancel import, shows import, etc. | Peter Grassberger | 2016-02-10 | 6 | -427/+275 | |
| | ||||||
* | rename rivendell instance to rdxport | Peter Grassberger | 2016-02-10 | 9 | -40/+38 | |
| | ||||||
* | shows rewrite (import still missing) | Peter Grassberger | 2016-02-10 | 5 | -30/+321 | |
| | ||||||
* | musicpools: replace spinner | Peter Grassberger | 2016-02-09 | 2 | -2/+3 | |
| | ||||||
* | replace spinning icon with spinkit spinner | Peter Grassberger | 2016-02-09 | 3 | -6/+154 | |
| | ||||||
* | beautify musicpools | Christian Pointner | 2016-02-05 | 3 | -8/+13 | |
| | ||||||
* | instant feedback for jingle action buttons | Christian Pointner | 2016-02-05 | 2 | -0/+9 | |
| | ||||||
* | make jingle view great again | Christian Pointner | 2016-02-05 | 6 | -15/+32 | |
| | ||||||
* | jingles: add space between action buttons | Peter Grassberger | 2016-02-05 | 1 | -0/+2 | |
| | ||||||
* | fix #uploadModal style | Peter Grassberger | 2016-02-05 | 1 | -15/+0 | |
| | ||||||
* | badge vs label | Christian Pointner | 2016-02-05 | 1 | -1/+1 | |
| | ||||||
* | fixed progress bars | Christian Pointner | 2016-02-05 | 4 | -12/+12 | |
| | ||||||
* | some fixes for uploadmodal - still not working... | Christian Pointner | 2016-02-05 | 4 | -36/+44 | |
| | ||||||
* | fixed logo image path | Christian Pointner | 2016-02-05 | 1 | -2/+2 | |
| | ||||||
* | cleaned up stylesheets a little | Christian Pointner | 2016-02-05 | 2 | -1/+29 | |
| |