Permalink
Browse files

Merge branch 'master' into menu-reorg

Conflicts:
	Changes
	lib/MojoMojo/I18N/ca.po
	lib/MojoMojo/I18N/de.po
	lib/MojoMojo/I18N/en.po
	lib/MojoMojo/I18N/es.po
	lib/MojoMojo/I18N/fr.po
	lib/MojoMojo/I18N/ja.po
	lib/MojoMojo/I18N/no.po
	lib/MojoMojo/I18N/pl.po
	lib/MojoMojo/I18N/ru.po
	root/static/themes/default/theme.css
  • Loading branch information...
2 parents dad8967 + badcc16 commit 847c6d276001c8fe1c7c6063fbce657af7d89447 @autarch autarch committed Aug 1, 2009
View
11 Changes
@@ -21,11 +21,20 @@
users. Added paging links so you can browse all of them
(Dave Rolsky)
- The users list now shows active users first (Dave Rolsky)
-v - Reorganized the navigation menus to try to group site-wide
+ - Reorganized the navigation menus to try to group site-wide
and page-specific options together. Top-level menu links
(like Recent and Tags) are now always site-wide. For
path-specific versions, go to the "Sub pages" view of a
path. (Dave Rolsky)
+ - Recent changes now shows user's names, not their logins (Dave Rolsky)
+ - Revised MultiMarkdown syntax help tips (Dave Rolsky)
+ - The edit page incorrectly labeled a button "Create and View"
+ for a page that only had one revision, when it should have
+ been labeled "Save and View" (Dave Rolsky)
+ - Removed the delete action, which was broken with Pg, and not
+ checking permissions (Dave Rolsky)
+ - mojomojo_spawn_db won't attempt deploy if db already exists
+ - exit MojoMojo on startup attempt if mojomojo_spawn_db.pl was not run
0.999031 2009-07-26 15:00:00
- Sane default for fastmmap sharefile.
View
@@ -73,6 +73,14 @@ MojoMojo->config(
MojoMojo->setup();
+# Check that we've spawned a DB.
+eval { MojoMojo->model('DBIC')->schema->resultset('MojoMojo::Schema::Result::Person')->count };
+if ($@ ) {
+ print "
+ ERROR. Looks like you need to DEPLOY A DATABASE.
+ Run: script/mojomojo_spawn_db.pl\n\n";
+ exit();
+}
MojoMojo->model('DBIC')->schema->attachment_dir( MojoMojo->config->{attachment_dir}
|| MojoMojo->path_to('uploads') . '' );
@@ -289,18 +289,6 @@ sub rollback : Global {
}
}
-=head2 delete
-
-This action will delete a page.
-
-=cut
-
-sub delete : Global {
- my ( $self, $c, $page ) = @_;
- $c->stash->{page}->delete;
- $c->forward('/page/view');
-}
-
=head1 AUTHOR
Marcus Ramberg <mramberg@cpan.org>
Oops, something went wrong.

0 comments on commit 847c6d2

Please sign in to comment.