5235 Commits

Author SHA1 Message Date
Christopher Allan Webber
efc8f1a0d0 Let's specifically import string_list()s in the config_spec. 2011-06-18 14:08:58 -05:00
Christopher Allan Webber
c897283849 Merge branch 'master' into configobj
Conflicts:
	setup.py
2011-06-18 11:10:46 -05:00
cfdv
e8fda91bc2 fixes uneven whitespace, and conforms to a strong preference for
less than 80 characters per line
2011-06-17 22:26:17 -05:00
cfdv
4869343739 adds global link to user's home page in the base.html template
Issue #315 (add bio and website to user page)
  * enable profile edits
  * provide place in user's home page for details to appear
2011-06-17 22:11:25 -05:00
Christopher Allan Webber
5a994e37c2 We require lxml. Updating setup.py to reflect that. 2011-06-17 17:44:36 -05:00
Jef van Schendel
d81b39da4c Merge remote-tracking branch 'gitorious/master' 2011-06-17 23:11:20 +02:00
Christopher Allan Webber
d4ff1606c3 Merge remote branch 'remotes/cmoylan/test_auth_views_364' 2011-06-17 08:59:55 -05:00
Chris Moylan
757690cc2e logins are now somewhat tested 2011-06-17 00:15:24 -05:00
Chris Moylan
8af8e3c1a9 added vim swapfiles to gitignore 2011-06-16 22:14:27 -05:00
Christopher Allan Webber
e307eb42b6 Merge remote branch 'remotes/gullydwarf-cfdv/is330' 2011-06-16 21:37:03 -05:00
cfdv
4cf2287a11 adds link from gallery back to user page 2011-06-16 17:28:46 -05:00
cfdv
850746677f adds link to user gallery in mediagoblin_header_right of user page 2011-06-16 13:00:41 -05:00
cfdv
4b5f5a08d3 user_gallery controller calls render_to_reponse 2011-06-16 13:00:11 -05:00
cfdv
184f2240cb adds routing.py and view.py changes 2011-06-16 12:59:48 -05:00
Caleb Forbes Davis V
d49cf0e29c issue #330 - creates a user gallery template 2011-06-16 12:51:26 -05:00
Christopher Allan Webber
595944d464 Recommending --set-upstream when doing a git push to a feature branch.
This is nice because it means git will tell you when your branch is
ahead/behind by several commits, assuming you keep working on it.
2011-06-16 08:33:10 -05:00
Christopher Allan Webber
e2c6436e3e Configuration file loading via ConfigObj.
Uses ConfigObj to open the config file.  Also does validation via the
config spec, so defaults are provided, strings are interpolated, types
are converted.
2011-06-16 08:21:51 -05:00
Christopher Allan Webber
0fcfff5a3a Basic config "requirements" file.
Not used yet, but this will be used by ConfigObj to transform values,
set defaults, etc.
2011-06-15 21:17:55 -05:00
Christopher Allan Webber
f970e6e5df Require ConfigObj 2011-06-15 21:14:00 -05:00
Jef van Schendel
bb770e295c Merge remote-tracking branch 'gitorious/master' 2011-06-15 23:25:47 +02:00
Joar Wandborg
44e51d3464 Made changes according to http://bugs.foocorp.net/issues/363#note-5 2011-06-15 23:07:54 +02:00
Joar Wandborg
9e883ed3b2 Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-06-15 22:18:24 +02:00
Christopher Allan Webber
0e9dd2a286 Merge remote branch 'remotes/elrond/dev/workbench_class' 2011-06-14 17:17:03 -05:00
Elrond
b67a983a02 Move destroy_workbench to Workbench class
And add a lot of warnings, as the checks for "being part of
the main Manager" are all gone.
2011-06-14 20:39:14 +02:00
Elrond
8bfa533f8b Drop WorkbenchManager.localized_file()
As Workbench has the localized_file() method, use this
everywhere and drop the wrapper method from
WorkbenchManager.

The processing code already did that.
2011-06-14 20:01:39 +02:00
Christopher Allan Webber
3fd659e0eb Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 2011-06-13 21:02:16 -05:00
Christopher Allan Webber
a68ee5556e A super strict HTML cleaner method with mediocre tests. 2011-06-13 21:01:19 -05:00
Will Kahn-Greene
6729d65a32 Adds local toc sections
* Some of our chapters are pretty long and this should make it much
  easier for a user to find what they're looking for and jumping
  to it.  It's easier to read the section toc at the top of the
  chapter, than it is to read it in the sidebar.
2011-06-13 12:31:23 -04:00
Will Kahn-Greene
03db7d6c74 Updates version in docs 2011-06-13 12:25:15 -04:00
Christopher Allan Webber
1e85d28e01 Already mentioned, but clarifying that branches should be localized to
a feature/bugfix/issue.
2011-06-13 09:08:18 -05:00
Will Kahn-Greene
fb6924170d Tweaks git workflow structure
* minor tweaking of the headers of the git workflow to break
  things up and organize them a bit better
2011-06-12 22:46:25 -04:00
Will Kahn-Greene
909c639d07 Fixes git workflow
* overhauls the docs so they're (hopefully) clearer on the git
  workflow
* adds text about putting things in bugfix branches, documenting
  your work, and using the issue tracker
* adds a contrived example that uses aliens
2011-06-12 22:43:19 -04:00
Christopher Allan Webber
48a7ba1e1c Merge remote branch 'remotes/elrond/idea/simple_proc_media_clean'
Conflicts:
	mediagoblin/process_media/__init__.py
2011-06-12 17:42:26 -05:00
Elrond
52426ae01f Create a Workbench class and use it everywhere.
Some references to Workbench.dir look ugly, I'm happy to
hear suggestions there.
2011-06-13 00:39:41 +02:00
cfdv
34d35a2393 ensure color mode compatibility when making image thumbnails 2011-06-12 17:35:07 -05:00
Christopher Allan Webber
300c34e8ce First import of mg_globals as mgg, partly because I just wanted it to
be clear that it's okay to do by doing it *somewhere* :)
2011-06-12 17:28:54 -05:00
Christopher Allan Webber
6e7ce8d1af mediagoblin.globals->mediagoblin.mg_globals 2011-06-12 17:27:37 -05:00
Elrond
49285baf27 Let setup_globals check for known globals
To avoid typos in calling setup_globals(), only allow
globals, which are already known to the system.
Plugins should have their own globals.
2011-06-12 17:43:54 +02:00
Christopher Allan Webber
da579dec00 Merge remote branch 'remotes/elrond/idea/clean_celery_setup'
Conflicts:
	mediagoblin/celery_setup/from_celery.py
2011-06-12 09:16:12 -05:00
Christopher Allan Webber
2f968422e9 Merge remote branch 'remotes/elrond/idea/tests_kill_db' 2011-06-12 09:11:39 -05:00
Joar Wandborg
a48014d67a Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin 2011-06-12 14:37:49 +02:00
Christopher Allan Webber
68ffb13690 possibly_localize_file->localized_file... a bit less terribly long. 2011-06-11 21:23:32 -05:00
Christopher Allan Webber
ca030ab6cd Switch process_media over to using the workbench. 2011-06-11 21:20:39 -05:00
Christopher Allan Webber
fdc5003903 Don't bother returning whether or not we copied it or not, we can
figure that out by looking to see whether our storage is local or not.
2011-06-11 21:20:26 -05:00
Christopher Allan Webber
a32acafa0b Moving workbench out of process_media 2011-06-11 20:33:41 -05:00
Joar Wandborg
44e2da2fe6 Added Markdown rendering for media_entry 2011-06-12 03:24:31 +02:00
Christopher Allan Webber
d40f55e3d9 Merge branch 'master' into workbench 2011-06-11 19:49:44 -05:00
Christopher Allan Webber
894facc68d Import mediagoblin.globals as mg_globals so we can be sure things are
set up in the right order.
2011-06-11 19:48:49 -05:00
Christopher Allan Webber
7ecc58cc5c Have the application set up instances of the WorkbenchManager. 2011-06-11 19:47:02 -05:00
Christopher Allan Webber
f43ecb0fc4 test WorkbenchManager.possibly_localize_file() 2011-06-11 19:18:51 -05:00