0
Commit Graph

13 Commits

Author SHA1 Message Date
Aaron Griffith
43629e928b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-09-06 10:29:15 -04:00
Aaron Griffith
40231598d8 command-line rendermodes can now be separated by ',', ':', or '/'
This should fix Issue #472.
2011-08-27 17:20:58 -04:00
Aaron Griffith
fe0d28630b Merge branch 'master' into rendermode-options
Conflicts:
	overviewer.py
2011-08-18 11:40:26 -04:00
Thomas Lake
46c960b37d Use advanced command line options
Options specified as 'advanced' were being silently discarded due to an
error in 8c87fa6bb5
2011-08-16 16:17:38 +01:00
Aaron Griffith
e618e949c9 more indentation fixes 2011-08-15 15:48:05 -04:00
Thomas Lake
0c523461fa Fix tabs/spaces mixup in 8c87fa6bb5 2011-08-15 17:16:48 +01:00
Thomas Lake
8c87fa6bb5 Add new option "--advanced-help". Options previously marked
configFileOnly are now marked as "advanced" and will not appear in
default help text.
2011-08-15 17:02:19 +01:00
Aaron Griffith
a7753486dc Merge branch 'master' into rendermode-options 2011-07-12 12:20:09 -04:00
Aaron Griffith
fde647bfdf Merge branch 'py-package'
Conflicts:
	setup.py
2011-07-10 18:14:20 -04:00
Aaron Griffith
e84ef2c1d2 Merge branch 'master' into py-package
Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js
2011-05-13 21:37:35 -04:00
Aaron Griffith
383b01859f Merge branch 'master' into py-package
Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css
2011-05-10 20:19:10 -04:00
Aaron Griffith
115c36ad5e Merge branch 'dtt-c-render' into py-package
Conflicts:
	overviewer.py
2011-04-01 22:00:45 -04:00
Aaron Griffith
42596416d9 sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
2011-03-29 13:49:50 -04:00