summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix upload progress dom updatePeter Grassberger2016-07-172-9/+38
|
* fix cancel uploadsPeter Grassberger2016-07-171-3/+6
|
* use DateTime in modelChristian Pointner2016-07-174-7/+7
|
* playout server live 5s in the future -> last-played-Datetime is off by 5sChristian Pointner2016-07-173-4/+4
|
* add multiple files uploadPeter Grassberger2016-07-154-11/+27
|
* cancel: don't close socket myselfPeter Grassberger2016-07-151-4/+0
|
* fix socket import errorsPeter Grassberger2016-07-154-20/+64
|
* fix jingles socket progressPeter Grassberger2016-07-151-2/+2
|
* fix error render, update cart-number and name on progressPeter Grassberger2016-07-154-57/+96
|
* fix useMetadata, set SHOW_IDPeter Grassberger2016-07-152-10/+10
|
* remove unused newCartNumber, send normalization and autotrim levelsPeter Grassberger2016-07-155-22/+16
|
* import errors are now somehow handled - still needs loveChristian Pointner2016-07-144-32/+15
|
* added normalization step to progress barChristian Pointner2016-07-132-2/+15
|
* fixed sorting for show and musicpool selectorChristian Pointner2016-07-012-4/+27
|
* speedup for local uploads over websocketsChristian Pointner2016-06-291-10/+13
|
* uploadModal: hide input, fix duplicate eventsPeter Grassberger2016-06-272-4/+8
|
* Merge branch 'websocket'Peter Grassberger2016-06-2710-2157/+428
|\ | | | | | | | | # Conflicts: # build.sh
| * Merge branch 'websocket2' into websocketPeter Grassberger2016-06-2710-2157/+428
| |\
| | * drop dropzone, add websocket uploadsPeter Grassberger2016-06-2710-1921/+112
| | |
| | * add socket reconnectPeter Grassberger2016-06-273-21/+71
| | |
| | * remove old upload functionality, fix progressbarPeter Grassberger2016-06-277-412/+207
| | |
| | * add websocketsPeter Grassberger2016-06-236-68/+303
| | |
* | | Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.gitPeter Grassberger2016-06-2719-378/+583
|\ \ \ | |/ /
| * | add clock.now()Christian Pointner2016-06-251-1/+9
| |/
| * changed <select> based music pool selector to bootstrap dropdownChristian Pointner2016-06-235-25/+49
| |
| * changed <select> based show selector to bootstrap dropdownChristian Pointner2016-06-234-24/+34
| |
| * sorting show and musicpool names for selectorChristian Pointner2016-06-223-3/+14
| |
| * moved to JSON::MaybeXSChristian Pointner2016-05-112-3/+5
| |
| * reverted to original archiv url format after rhimportd finally implementing ↵Christian Pointner2016-05-092-1/+9
| | | | | | | | it correctly
| * replace .html('') with .empty() and .html(...) with .text(...)Peter Grassberger2016-05-075-15/+15
| |
| * Merge branch 'websocket'Peter Grassberger2016-05-073-4/+82
| |\ | | | | | | | | | | | | | | | Conflicts: www/js/apps.js www/js/auth.js
| | * Merge branch 'master' of ssh://git@git.helsinki.at:2342/rhwebimport.git into ↵Peter Grassberger2016-04-193-4/+21
| | |\ | | | | | | | | | | | | websocket
| | * | fix websocket archiv source formatPeter Grassberger2016-04-132-3/+3
| | | |
| | * | websocket test (breaking commit)Peter Grassberger2016-04-013-3/+86
| | | |
| * | | add subpages to routerPeter Grassberger2016-05-064-25/+62
| | | |
| * | | init clockPeter Grassberger2016-04-212-6/+3
| | | |
| * | | replace apps with routerPeter Grassberger2016-04-205-182/+117
| | | |
| * | | rewrite auth and appsPeter Grassberger2016-04-205-115/+188
| | | |
| * | | improved rendering of show rhythmChristian Pointner2016-04-192-1/+6
| | |/ | |/|
| * | make show rhythm fancierChristian Pointner2016-04-152-2/+18
| | |
| * | added /upload proxy to apache sample configChristian Pointner2016-04-021-2/+3
| |/
* | add yui-compressor to build.shPeter Grassberger2016-06-261-4/+4
|/
* 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
| | |
generated by cgit v0.10.2 at 2024-07-01 13:01:24 (GMT)