Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ornicar/diem-project
Browse files Browse the repository at this point in the history
  • Loading branch information
@ornicar
ornicar committed Jun 8, 2010
2 parents 6ab5f6f + d5ef8fc commit c14ea38
Show file tree
Hide file tree
Showing 9 changed files with 243 additions and 6 deletions.
7 changes: 2 additions & 5 deletions apps/front/modules/dmWidget/templates/_dmWidgetGithubListIssues.php
View file
@@ -1,4 +1,4 @@
<?php use_helper('Text');
<?php use_helper('Text', 'Date');

/*
* An $issue is an array containing: http://develop.github.com/p/issues.html#list_a_projects_issues
Expand Down Expand Up @@ -29,10 +29,7 @@
format_date($issue['created_at'], 'd/MM H:mm').
' by '.
_link('http://github.com/'.$issue['user'])->text(escape($issue['user']))
).

// render issue text
_tag('p.issue_text', auto_link_text(escape($issue['body'])))
)

);
}
Expand Down
114 changes: 114 additions & 0 deletions lib/migration/doctrine/1269863841_version1.php
View file
@@ -0,0 +1,114 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version1 extends Doctrine_Migration_Base
{
public function up()
{
$this->removeColumn('dm_error', 'klass');
$this->removeColumn('dm_sent_mail', 'name');
$this->removeColumn('dm_sent_mail', 'header');
$this->removeColumn('dm_sent_mail', 'description');
$this->removeColumn('dm_mail_template_translation', 'title');
$this->addColumn('dm_error', 'php_class', 'string', '127', array(
'notnull' => '1',
));
$this->addColumn('dm_sent_mail', 'dm_mail_template_id', 'integer', '8', array(
));
$this->addColumn('dm_sent_mail', 'subject', 'string', '5000', array(
'notnull' => '1',
));
$this->addColumn('dm_sent_mail', 'body', 'clob', '', array(
'notnull' => '1',
));
$this->addColumn('dm_sent_mail', 'from_email', 'string', '5000', array(
'notnull' => '1',
));
$this->addColumn('dm_sent_mail', 'to_email', 'string', '5000', array(
));
$this->addColumn('dm_sent_mail', 'cc_email', 'string', '5000', array(
));
$this->addColumn('dm_sent_mail', 'bcc_email', 'string', '5000', array(
));
$this->addColumn('dm_sent_mail', 'reply_to_email', 'string', '5000', array(
));
$this->addColumn('dm_sent_mail', 'sender_email', 'string', '5000', array(
));
$this->addColumn('dm_sent_mail', 'strategy', 'string', '255', array(
));
$this->addColumn('dm_sent_mail', 'transport', 'string', '255', array(
));
$this->addColumn('dm_sent_mail', 'culture', 'string', '16', array(
));
$this->addColumn('dm_sent_mail', 'debug_string', 'clob', '', array(
));
$this->addColumn('dm_mail_template_translation', 'subject', 'string', '5000', array(
'notnull' => '1',
));
$this->addColumn('dm_mail_template_translation', 'cc_email', 'string', '5000', array(
));
$this->addColumn('dm_mail_template_translation', 'bcc_email', 'string', '5000', array(
));
$this->addColumn('dm_mail_template_translation', 'reply_to_email', 'string', '5000', array(
));
$this->addColumn('dm_mail_template_translation', 'sender_email', 'string', '5000', array(
));
$this->addColumn('dm_mail_template_translation', 'list_unsuscribe', 'string', '5000', array(
));
$this->changeColumn('dm_setting', 'type', 'enum', '', array(
'notnull' => '1',
'values' =>
array(
0 => 'text',
1 => 'boolean',
2 => 'select',
3 => 'textarea',
4 => 'number',
5 => 'datetime',
),
'default' => 'text',
));
$this->changeColumn('dm_mail_template_translation', 'body', 'clob', '', array(
'notnull' => '1',
));
$this->changeColumn('dm_mail_template_translation', 'from_email', 'string', '5000', array(
'notnull' => '1',
));
}

public function down()
{
$this->addColumn('dm_error', 'klass', 'string', '127', array(
'notnull' => '1',
));
$this->addColumn('dm_sent_mail', 'name', 'string', '255', array(
));
$this->addColumn('dm_sent_mail', 'header', 'string', '60000', array(
));
$this->addColumn('dm_sent_mail', 'description', 'string', '60000', array(
));
$this->addColumn('dm_mail_template_translation', 'title', 'string', '5000', array(
));
$this->removeColumn('dm_error', 'php_class');
$this->removeColumn('dm_sent_mail', 'dm_mail_template_id');
$this->removeColumn('dm_sent_mail', 'subject');
$this->removeColumn('dm_sent_mail', 'body');
$this->removeColumn('dm_sent_mail', 'from_email');
$this->removeColumn('dm_sent_mail', 'to_email');
$this->removeColumn('dm_sent_mail', 'cc_email');
$this->removeColumn('dm_sent_mail', 'bcc_email');
$this->removeColumn('dm_sent_mail', 'reply_to_email');
$this->removeColumn('dm_sent_mail', 'sender_email');
$this->removeColumn('dm_sent_mail', 'strategy');
$this->removeColumn('dm_sent_mail', 'transport');
$this->removeColumn('dm_sent_mail', 'culture');
$this->removeColumn('dm_sent_mail', 'debug_string');
$this->removeColumn('dm_mail_template_translation', 'subject');
$this->removeColumn('dm_mail_template_translation', 'cc_email');
$this->removeColumn('dm_mail_template_translation', 'bcc_email');
$this->removeColumn('dm_mail_template_translation', 'reply_to_email');
$this->removeColumn('dm_mail_template_translation', 'sender_email');
$this->removeColumn('dm_mail_template_translation', 'list_unsuscribe');
}
}
35 changes: 35 additions & 0 deletions lib/migration/doctrine/1269863842_version2.php
View file
@@ -0,0 +1,35 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version2 extends Doctrine_Migration_Base
{
public function up()
{
$this->createForeignKey('dm_sent_mail', 'dm_sent_mail_dm_mail_template_id_dm_mail_template_id', array(
'name' => 'dm_sent_mail_dm_mail_template_id_dm_mail_template_id',
'local' => 'dm_mail_template_id',
'foreign' => 'id',
'foreignTable' => 'dm_mail_template',
'onUpdate' => '',
'onDelete' => 'SET NULL',
));
$this->addIndex('dm_sent_mail', 'dm_sent_mail_dm_mail_template_id', array(
'fields' =>
array(
0 => 'dm_mail_template_id',
),
));
}

public function down()
{
$this->dropForeignKey('dm_sent_mail', 'dm_sent_mail_dm_mail_template_id_dm_mail_template_id');
$this->removeIndex('dm_sent_mail', 'dm_sent_mail_dm_mail_template_id', array(
'fields' =>
array(
0 => 'dm_mail_template_id',
),
));
}
}
18 changes: 18 additions & 0 deletions lib/migration/doctrine/1270252769_version3.php
View file
@@ -0,0 +1,18 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version3 extends Doctrine_Migration_Base
{
public function up()
{
$this->changeColumn('dm_contact', 'body', 'clob', '', array(
'notnull' => '1',
));
}

public function down()
{

}
}
19 changes: 19 additions & 0 deletions lib/migration/doctrine/1270582919_version4.php
View file
@@ -0,0 +1,19 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version4 extends Doctrine_Migration_Base
{
public function up()
{
$this->addColumn('dm_user', 'uid', 'string', '8', array(
'notnull' => '0',
'unique' => '1',
));
}

public function down()
{
$this->removeColumn('dm_user', 'uid');
}
}
18 changes: 18 additions & 0 deletions lib/migration/doctrine/1270588372_version5.php
View file
@@ -0,0 +1,18 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version5 extends Doctrine_Migration_Base
{
public function up()
{
$this->removeColumn('dm_user', 'uid');
}

public function down()
{
$this->addColumn('dm_user', 'uid', 'string', '8', array(
'unique' => '1',
));
}
}
18 changes: 18 additions & 0 deletions lib/migration/doctrine/1270929142_version6.php
View file
@@ -0,0 +1,18 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version6 extends Doctrine_Migration_Base
{
public function up()
{
$this->addColumn('dm_user', 'forgot_password_code', 'string', '8', array(
'unique' => '1',
));
}

public function down()
{
$this->removeColumn('dm_user', 'forgot_password_code');
}
}
18 changes: 18 additions & 0 deletions lib/migration/doctrine/1270930780_version7.php
View file
@@ -0,0 +1,18 @@
<?php
/**
* This class has been auto-generated by the Doctrine ORM Framework
*/
class Version7 extends Doctrine_Migration_Base
{
public function up()
{
$this->changeColumn('dm_user', 'forgot_password_code', 'string', '12', array(
'unique' => '1',
));
}

public function down()
{

}
}
2 changes: 1 addition & 1 deletion plugins/dmGithubPlugin
Submodule dmGithubPlugin updated 2 files
+2 −1 lib/dmWidgetGithubListCommitsView.php
+2 −1 lib/dmWidgetGithubListIssuesView.php

0 comments on commit c14ea38

Please sign in to comment.