summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'python3_fix' into nextAndrej Rode2018-06-241702-57090/+43270
|\
| * fec: update VOLK API callJohannes Demel2018-06-231-1/+1
| * volk: advance volk submodule pointerAndrej Rode2018-06-231-0/+0
| * python: Py3k compatAndrej Rode2018-06-239-17/+17
| * Merge branch 'python3_fix' into python3_mergeAndrej Rode2018-06-231008-42903/+25436
| |\
| | * grc: only add enabled blocks to flow_graph childrenAndrej Rode2017-12-041-1/+1
| | * grc: check evaluated parameter for correctnessAndrej Rode2017-12-041-4/+4
| | * grc: add default id: to top_blockAndrej Rode2017-12-041-0/+1
| | * grc: fix json cache dumping to work with python 3.5Andrej Rode2017-12-031-2/+2
| | * dtv/vocoder: remove stray *block_tree.ymlAndrej Rode2017-12-032-2/+0
| | * Added the Delete key to the delete actionHåkon Vågsether2017-11-091-0/+1
| | * Merge branch 'merges/next' into merges/python3Sebastian Koslowski2017-11-090-0/+0
| | |\
| | | * Merge branch 'merges/master' into merges/nextSebastian Koslowski2017-11-091-1/+2
| | | |\
| | | | * Merge branch 'merges/maint' into merges/masterSebastian Koslowski2017-11-091-1/+2
| | | | |\
| | | | | * grc: Escape xml chars in category names so that they display correctly in too...Paul Wicks2017-11-091-1/+2
| | * | | | grc: move some of the param checkers to separate fileSebastian Koslowski2017-11-096-131/+161
| | * | | | grc: refactor: move Param cls to core.paramsSebastian Koslowski2017-11-086-64/+96
| | * | | | grc: hide ImportError for dep checks in cmakeSebastian Koslowski2017-11-081-0/+1
| | * | | | grc: move port and param init to block builderSebastian Koslowski2017-11-083-82/+91
| | * | | | grc: disable auto-conversion and implement json cacheSebastian Koslowski2017-11-0810-73/+178
| | * | | | Merge branch 'merges/next' into merges/python3Sebastian Koslowski2017-10-267-45/+27
| | |\| | |
| | | * | | Merge branch 'merges/master' into merges/nextSebastian Koslowski2017-10-268-69/+78
| | | |\| |
| | | | * | grc: make props dialog dark-theme friendlySebastian Koslowski2017-10-263-14/+10
| | | | * | Merge branch 'github/pr/1495' into merges/masterSebastian Koslowski2017-10-267-55/+68
| | | | |\ \
| | | | | * | Added parent (aka 'transient for') references to most (if not all) dialog box...Ethan Trewhitt2017-10-257-55/+68
| | * | | | | Merge branch 'github/pr/1481' into merges/python3Sebastian Koslowski2017-10-26982-42307/+24562
| | |\ \ \ \ \
| | | * | | | | Added YAML blocks that needed manual editingHåkon Vågsether2017-10-1078-9489/+5491
| | | * | | | | Added auto-generated YAML blocksHåkon Vågsether2017-10-10904-32803/+19071
| | * | | | | | Merge branch 'merges/next' into merges/python3Sebastian Koslowski2017-10-2520-53/+172
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch 'merges/master' into merges/nextSebastian Koslowski2017-10-2520-53/+151
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | [grc] refactor #1418Sebastian Koslowski2017-10-251-74/+68
| | | | * | | | Merge branch 'github/pr/1418' into merges/masterSebastian Koslowski2017-10-2520-52/+155
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | moves gui_hint logic into parsing function, removes GuiHint class from Param....Spencer Ross2017-08-1920-135/+154
| | | | | * | | Fixes #1297, adds grc gui_hint collision detectionSpencer Ross2017-08-171-22/+106
| * | | | | | | modtool: modify str.translate() for python3 compatibilitySwapnil Negi2018-05-261-1/+2
| * | | | | | | Fixed pasting blocks from clipboardHåkon Vågsether2018-03-221-27/+16
| |/ / / / / /
| * | | | | | Merge remote-tracking branch 'skoslowski/merges/python3' into python3Johnathan Corgan2017-10-0510-43/+43
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [grc] fix conversion of <check> and rename them to assertsSebastian Koslowski2017-10-014-13/+13
| | * | | | | [grc] better path handling in generator (merges #1473)Håkon Vågsether2017-09-302-7/+5
| | * | | | | [grc] fixes from recent commits (merges #1473)Håkon Vågsether2017-09-302-4/+10
| | * | | | | [grc] python3: fix stream port indexes (fixes 4340e4fe836d525ce30cd0a884400b7...Sebastian Koslowski2017-09-302-4/+3
| | * | | | | [grc] additional fixes from merging bokeh-gui (#1434)Sebastian Koslowski2017-09-303-21/+18
| * | | | | | Merge branch 'next' into python3Johnathan Corgan2017-10-0518-150/+277
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| * | | | | Merge branch 'next' into python3Johnathan Corgan2017-09-251-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-09-250-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'skoslowski/python3' into python3Johnathan Corgan2017-09-256-2/+133
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'next' into python3Sebastian Koslowski2017-09-065-2/+130
| | |\ \ \ \ \ \ \
| | * | | | | | | | grc: gtk3: fix #1290Sebastian Koslowski2017-08-301-0/+3
| * | | | | | | | | Merge remote-tracking branch 'github/pr/1467' into python3Johnathan Corgan2017-09-224-5/+17
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix to make sure the port is a digitHåkon Vågsether2017-09-181-1/+2