Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |
| | ||||||
* | 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 | |
| | ||||||
* | 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 | |
| | ||||||
* | musicpools: add progressbar | Peter Grassberger | 2016-02-02 | 4 | -41/+88 | |
| | ||||||
* | 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 | 6 | -34/+105 | |
| | ||||||
* | move authLogin function to rivendel.rh.js, use more namespaces in jingles | PeterTheOne | 2016-01-29 | 4 | -38/+46 | |
| | ||||||
* | fix login and logout | PeterTheOne | 2016-01-29 | 5 | -7/+22 | |
| | ||||||
* | musicpools: modify importer to create carts | PeterTheOne | 2016-01-29 | 4 | -17/+34 | |
| | ||||||
* | jingles: use Rivendell.Cart and Cut classes with Views, etc. | PeterTheOne | 2016-01-29 | 9 | -242/+229 | |
| | | | | | validate html, move rivendell.js init to apps.js, cleanup importer, add update event to fetch functions instead of success callback. | |||||
* | musicpools: use Rivendell.Cart and Cut classes, make them xml ready | PeterTheOne | 2016-01-28 | 4 | -87/+101 | |
| | ||||||
* | fix musicgrid bugs, create Rivendell.Group class, refactor | PeterTheOne | 2016-01-28 | 10 | -115/+189 | |
| | ||||||
* | musicpools: remove old events and debug logs | PeterTheOne | 2016-01-28 | 1 | -3/+1 | |
| | ||||||
* | move importer to own file, fix musicpool selector | PeterTheOne | 2016-01-28 | 5 | -192/+223 | |
| |