Commit graph

21 commits

Author SHA1 Message Date
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
David Rowe
5474c0634e Merge branch 'master' into 20277
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu
Also did a bit of Header cleanup
2015-01-18 07:14:52 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu
Added it in the DM
2015-01-18 06:50:34 -08:00
Atlante45
180de82e52 Remove warning 2015-01-18 06:16:53 -08:00
Thijs Wenker
d820df4972 ScriptModel destructor 2015-01-15 22:54:32 +01:00
Thijs Wenker
8feb51013b running script window treeview fully works 2015-01-12 00:41:38 +01:00
Thijs Wenker
d84a65a5f9 running scripts list -> treeview initial 2015-01-10 01:29:06 +01:00
Leonardo Murillo
a4965e7f60 No need for https when downloading assets 2014-10-23 13:59:08 -06:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Leonardo Murillo
0b7ff18970 Changes in non-Js code 2014-10-06 11:24:10 -06:00
Stephen Birarda
5be045d612 remove LocationManager and NamedLocation, replace with DataWebDialog 2014-09-22 16:55:44 -07:00
Stephen Birarda
48e45265a3 only add a directory to the filesystem watcher if not empty 2014-09-17 14:43:48 -07:00
Brad Hefta-Gaub
1b29b7c120 Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback
Removed json callback
2014-07-02 21:45:19 -07:00
Atlante45
45db5e2c40 Removed Xcode warnings 2014-07-02 15:57:11 -07:00
Atlante45
602015be66 Switched ScriptModel to NetworkAccessManager 2014-07-02 11:21:26 -07:00
Ryan Huffman
b108ea3140 Update script list to only label local files 2014-05-21 16:57:13 -07:00
Ryan Huffman
35151b5dad Add ScripsModel 2014-05-14 01:18:08 -07:00