Download as
Browse Code »

Commit 49224f6f5256fe07f165f69464b38405e71d8b47

Authored by Joenio Costa
2 parents f619be45 b18f899b
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'stable' 

Conflicts:
	db/schema.rb
	public/stylesheets/application.css
Showing 8 changed files with 51 additions and 4 deletions   Show diff stats
.mailmap
  Diff comments   View file @49224f6
1 1 Antonio Terceiro <terceiro@colivre.coop.br> <AntonioTerceiro@3f533792-8f58-4932-b0fe-aaf55b0a4547>
2 2 Antonio Terceiro <terceiro@colivre.coop.br> <terceiro@softwarelivre.org>
3 3 Aurelio A. Heckert <aurelio@colivre.coop.br> <AurelioAHeckert@3f533792-8f58-4932-b0fe-aaf55b0a4547>
  4 +Aurelio A. Heckert <aurelio@colivre.coop.br> <aurium@gmail.com>
4 5 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <DanielaFeitosa@3f533792-8f58-4932-b0fe-aaf55b0a4547>
5 6 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <danielafeitosa@colivre.coop.br>
6 7 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> <daniela@sede.colivre.coop.br>
... ...
AUTHORS
  Diff comments   View file @49224f6
... ... @@ -9,6 +9,7 @@ Developers
9 9 Antonio Terceiro <terceiro@colivre.coop.br>
10 10 Aurelio A. Heckert <aurelio@colivre.coop.br>
11 11 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
  12 +Daniel Cunha <daniel.ccunha@gmail.com>
12 13 Fernanda Lopes <nanda.listas+psl@gmail.com>
13 14 Grazieno Pellegrino <grazieno@gmail.com>
14 15 Italo Valcy <italo@dcc.ufba.br>
... ...
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @49224f6
... ... @@ -118,6 +118,25 @@
118 118 </div>
119 119 <% end %>
120 120  
  121 +<%
  122 + # AddThis Button
  123 + if block_given? && web2_conf['addthis']
  124 + opts = web2_conf['addthis']
  125 +%>
  126 +<div id="addThis">
  127 +<script type="text/javascript">
  128 + addthis_brand = '<%= escape_javascript( @environment.name ) %>';
  129 +<%=
  130 + str = ''
  131 + opts.each { |k, v|
  132 + str += ' addthis_'+ k +' = "'+ escape_javascript( v ) +"\";\n"
  133 + }
  134 + str
  135 +%></script>
  136 +<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><img src="/images/bt-bookmark.gif" width="53" height="16" border="0" alt="" /></a><script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
  137 +</div>
  138 +<% end %>
  139 +
121 140 <div class="comments">
122 141 <a name="comments_list"></a>
123 142 <% if @page.accept_comments? %>
... ...
db/migrate/20100822034415_change_external_feed_fetched_at_column_type.rb 0 → 100644
  Diff comments   View file @49224f6
... ... @@ -0,0 +1,13 @@
  1 +class ChangeExternalFeedFetchedAtColumnType < ActiveRecord::Migration
  2 + def self.up
  3 + change_table :external_feeds do |t|
  4 + t.change :fetched_at, :datetime
  5 + end
  6 + end
  7 +
  8 + def self.down
  9 + change_table :external_feeds do |t|
  10 + t.change :fetched_at, :date
  11 + end
  12 + end
  13 +end
... ...
db/schema.rb
  Diff comments   View file @49224f6
... ... @@ -9,7 +9,7 @@
9 9 #
10 10 # It's strongly recommended to check this file into your version control system.
11 11  
12   -ActiveRecord::Schema.define(:version => 20100811211216) do
  12 +ActiveRecord::Schema.define(:version => 20100822034415) do
13 13  
14 14 create_table "article_versions", :force => true do |t|
15 15 t.integer "article_id"
... ... @@ -184,7 +184,7 @@ ActiveRecord::Schema.define(:version =&gt; 20100811211216) do
184 184  
185 185 create_table "external_feeds", :force => true do |t|
186 186 t.string "feed_title"
187   - t.date "fetched_at"
  187 + t.datetime "fetched_at"
188 188 t.string "address"
189 189 t.integer "blog_id", :null => false
190 190 t.boolean "enabled", :default => true, :null => false
... ...
lib/noosfero.rb
  Diff comments   View file @49224f6
1 1 module Noosfero
2 2 PROJECT = 'noosfero'
3   - VERSION = '0.25.2'
  3 + VERSION = '0.25.3'
4 4  
5 5 def self.pattern_for_controllers_in_directory(dir)
6 6 disjunction = controllers_in_directory(dir).join('|')
... ...
lib/tasks/release.rake
  Diff comments   View file @49224f6
... ... @@ -58,8 +58,8 @@ EOF
58 58  
59 59 desc 'prepares a release tarball'
60 60 task :release => [ :check_tag, 'noosfero:doc:translate', 'noosfero:error-pages:translate', :authors, :check_repo ] do
61   - sh "git tag #{version}"
62 61 sh 'rake -f Rakefile.pkg'
  62 + sh "git tag #{version}"
63 63 puts "I: please upload the tarball to the website!"
64 64 puts "I: please push the tag for version #{version} that was just created!"
65 65 end
... ...
test/unit/external_feed_test.rb
  Diff comments   View file @49224f6
... ... @@ -128,4 +128,17 @@ class ExternalFeedTest &lt; ActiveSupport::TestCase
128 128 assert_equal 0, ExternalFeed.new.update_errors
129 129 end
130 130  
  131 + should 'save hour when feed was fetched' do
  132 + external_feed = create(:external_feed)
  133 +
  134 + now = Time.parse('2009-01-23 09:35')
  135 + Time.stubs(:now).returns(now)
  136 +
  137 + external_feed.finish_fetch
  138 + external_feed.reload
  139 +
  140 + assert_equal 9, external_feed.fetched_at.hour
  141 + assert_equal 35, external_feed.fetched_at.min
  142 + end
  143 +
131 144 end
... ...