summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* websocket test (breaking commit)Peter Grassberger2016-04-013-3/+86
|
* Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.gitPeter Grassberger2016-04-011-1/+2
|\
| * updatd sample apache config to inlcude websocket proxy for rhimportdChristian Pointner2016-04-011-1/+2
| |
* | fix addCart optionsPeter Grassberger2016-04-011-1/+1
| |
* | fix listCarts errorPeter Grassberger2016-04-011-1/+6
| |
* | Merge branch 'master' into rdxportjs-refactorPeter Grassberger2016-04-018-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.gitPeter Grassberger2016-03-242-2/+2
| |\
| | * fixed utf8 output for authtokenChristian Pointner2016-03-231-1/+1
| | |
| | * removed indirect depsChristian Pointner2016-03-231-1/+1
| | |
| | * better json lib for perlChristian Pointner2016-03-121-1/+1
| | |
| * | 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
|
* updated pflichtenheftChristian Pointner2016-02-111-3/+16
|
* 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
|
* added missing dep for bootstrap in readmeChristian Pointner2016-02-051-1/+1
|
* 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
|
* fixed clock colorsChristian Pointner2016-02-051-2/+2
|
* fixed navbar and iconsChristian Pointner2016-02-055-56/+29
|
* fixed login screen after bootstrap upgradeChristian Pointner2016-02-055-8/+21
|
* add build.shPeter Grassberger2016-02-053-0/+18
|
* rename rivendell.js to rdxport.jsPeter Grassberger2016-02-055-65/+65
|
* remove old includesPeter Grassberger2016-02-041-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 3Peter Grassberger2016-02-041-4/+4
|
* use bootstrap 3 (navbar is somewhat broken)Peter Grassberger2016-02-044-50/+74
|
* some importer changesPeter Grassberger2016-02-021-18/+12
|
* create importer globally in apps.jsPeter Grassberger2016-02-023-9/+5
|
* musicpools: fix originDatetime and lastPlayDatetime renderPeter Grassberger2016-02-022-4/+8
|