Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | websocket test (breaking commit) | Peter Grassberger | 2016-04-01 | 3 | -3/+86 |
| | |||||
* | Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git | Peter Grassberger | 2016-04-01 | 1 | -1/+2 |
|\ | |||||
| * | updatd sample apache config to inlcude websocket proxy for rhimportd | Christian Pointner | 2016-04-01 | 1 | -1/+2 |
| | | |||||
* | | 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 | 8 | -36/+118 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: www/js/importer.js www/js/jingles.js www/js/musicpools.js www/js/shows.js | ||||
| * | Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git | Peter Grassberger | 2016-03-24 | 2 | -2/+2 |
| |\ | |||||
| | * | fixed utf8 output for authtoken | Christian Pointner | 2016-03-23 | 1 | -1/+1 |
| | | | |||||
| | * | removed indirect deps | Christian Pointner | 2016-03-23 | 1 | -1/+1 |
| | | | |||||
| | * | better json lib for perl | Christian Pointner | 2016-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |
| | |||||
* | updated pflichtenheft | Christian Pointner | 2016-02-11 | 1 | -3/+16 |
| | |||||
* | 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 |
| | |||||
* | added missing dep for bootstrap in readme | Christian Pointner | 2016-02-05 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | fixed clock colors | Christian Pointner | 2016-02-05 | 1 | -2/+2 |
| | |||||
* | fixed navbar and icons | Christian Pointner | 2016-02-05 | 5 | -56/+29 |
| | |||||
* | fixed login screen after bootstrap upgrade | Christian Pointner | 2016-02-05 | 5 | -8/+21 |
| | |||||
* | add build.sh | Peter Grassberger | 2016-02-05 | 3 | -0/+18 |
| | |||||
* | rename rivendell.js to rdxport.js | Peter Grassberger | 2016-02-05 | 5 | -65/+65 |
| | |||||
* | remove old includes | Peter Grassberger | 2016-02-04 | 1 | -3/+0 |
| | | | | | | i should never push before testing. i should never push before testing. i should never push before testing. | ||||
* | switch all includes to bootstrap 3 | Peter Grassberger | 2016-02-04 | 1 | -4/+4 |
| | |||||
* | use bootstrap 3 (navbar is somewhat broken) | Peter Grassberger | 2016-02-04 | 4 | -50/+74 |
| | |||||
* | 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 |
| |