Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 1 | -1/+14 |
| |\ | | | | | | | | | | 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 | 4 | -173/+109 |
| | | | |||||
* | | | rewrite auth and apps | Peter Grassberger | 2016-04-20 | 3 | -94/+163 |
| | | | |||||
* | | | improved rendering of show rhythm | Christian Pointner | 2016-04-19 | 1 | -1/+1 |
| |/ |/| | |||||
* | | make show rhythm fancier | Christian Pointner | 2016-04-15 | 1 | -1/+14 |
|/ | |||||
* | 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 | 3 | -4/+3 |
| | | | | 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 | 5 | -425/+252 |
| | |||||
* | rename rivendell instance to rdxport | Peter Grassberger | 2016-02-10 | 9 | -40/+38 |
| | |||||
* | shows rewrite (import still missing) | Peter Grassberger | 2016-02-10 | 4 | -29/+320 |
| | |||||
* | musicpools: replace spinner | Peter Grassberger | 2016-02-09 | 2 | -2/+3 |
| | |||||
* | replace spinning icon with spinkit spinner | Peter Grassberger | 2016-02-09 | 1 | -3/+7 |
| | |||||
* | beautify musicpools | Christian Pointner | 2016-02-05 | 2 | -5/+8 |
| | |||||
* | instant feedback for jingle action buttons | Christian Pointner | 2016-02-05 | 1 | -0/+3 |
| | |||||
* | make jingle view great again | Christian Pointner | 2016-02-05 | 3 | -10/+14 |
| | |||||
* | jingles: add space between action buttons | Peter Grassberger | 2016-02-05 | 1 | -0/+2 |
| | |||||
* | badge vs label | Christian Pointner | 2016-02-05 | 1 | -1/+1 |
| | |||||
* | fixed progress bars | Christian Pointner | 2016-02-05 | 3 | -10/+10 |
| | |||||
* | some fixes for uploadmodal - still not working... | Christian Pointner | 2016-02-05 | 3 | -6/+6 |
| | |||||
* | fixed clock colors | Christian Pointner | 2016-02-05 | 1 | -2/+2 |
| | |||||
* | fixed navbar and icons | Christian Pointner | 2016-02-05 | 3 | -15/+15 |
| | |||||
* | fixed login screen after bootstrap upgrade | Christian Pointner | 2016-02-05 | 1 | -2/+5 |
| | |||||
* | rename rivendell.js to rdxport.js | Peter Grassberger | 2016-02-05 | 4 | -63/+63 |
| | |||||
* | use bootstrap 3 (navbar is somewhat broken) | Peter Grassberger | 2016-02-04 | 3 | -15/+15 |
| | |||||
* | some importer changes | Peter Grassberger | 2016-02-02 | 1 | -18/+12 |
| | |||||
* | create importer globally in apps.js | Peter Grassberger | 2016-02-02 | 3 | -9/+5 |
| | |||||
* | musicpools: fix originDatetime and lastPlayDatetime render | Peter Grassberger | 2016-02-02 | 2 | -4/+8 |
| | |||||
* | musicpools: add progressbar | Peter Grassberger | 2016-02-02 | 3 | -40/+67 |
| | |||||
* | musicpools: add delete button to carts | Peter Grassberger | 2016-02-01 | 3 | -6/+31 |
| | |||||
* | musicgrid: fix no re-render bug, etc. | Peter Grassberger | 2016-01-31 | 2 | -5/+8 |
| | |||||
* | musicpools: show carts/cuts, actions still missing | Peter Grassberger | 2016-01-31 | 5 | -34/+101 |
| | |||||
* | move authLogin function to rivendel.rh.js, use more namespaces in jingles | PeterTheOne | 2016-01-29 | 4 | -38/+46 |
| |