Software Público Brasileiro

01 Jul, 2015

4 commits

• 9549e2e0   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-07-01 10:43:50 -0300  
• 47e76e0b   Small fix on list of processed tasks Browse Dir »
  Victor Costa

  2015-07-01 10:43:28 -0300  
• 0cc41947   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/tasks_controller.rb
  	app/views/tasks/processed.html.erb
  	test/functional/tasks_controller_test.rb

  Victor Costa

  2015-07-01 10:22:39 -0300  
• 0abe320c   Refactor processed task filter Browse Dir »
  Victor Costa

  2015-07-01 10:18:46 -0300  

30 Jun, 2015

7 commits

• 334c1ebd   Filter processed tasks by who closes it Browse Dir »
  Victor Costa

  2015-06-30 15:09:27 -0300  
• c0bd7efb   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-30 11:54:24 -0300  
• e92fc4ac   Filter processed tasks by who closes it Browse Dir »
  Victor Costa

  2015-06-30 11:52:05 -0300  
• 3d9ba6b1   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 11:34:19 -0300  
• 6905648c   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 11:32:42 -0300  
• 786d3c66   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 10:52:31 -0300  
• e9c22c7f   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 10:35:35 -0300  

29 Jun, 2015

6 commits

• ef4c95d1   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-29 17:16:45 -0300  
• ac25637b   Small change on processed tasks view Browse Dir »
  Victor Costa

  2015-06-29 17:16:31 -0300  
• 4012f329   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-29 17:09:36 -0300  
• 05361395   Improve processed tasks view Browse Dir »
  Victor Costa

  2015-06-29 17:09:23 -0300  
• 4ac8b06a   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-29 16:45:17 -0300  
• e21366f1   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-29 16:42:56 -0300  

25 Jun, 2015

3 commits

• 556c20c3   folder: let word wrap work (do not short filenames) ... Browse Dir »

  This also removes short_filename as it is now unused

  Braulio Bhavamitra

  2015-06-25 17:04:29 -0300  
• 83c8e2dc   Search category with an autocomplete ... Browse Dir »

  (ActionItem3149)

  Braulio Bhavamitra

  2015-06-25 17:04:29 -0300  
• df75ad3f   Add last update column on cms listing ... Browse Dir »

  Conflicts:
  	app/views/cms/_view_items.html.erb
  	config/locales/en.yml

  Braulio Bhavamitra

  2015-06-25 17:04:28 -0300  

23 Jun, 2015

1 commit

• 5911b3bf   Revert "Disable piwik" ... Browse Dir »

  This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.

  Victor Costa

  2015-06-23 16:15:48 -0300  

19 Jun, 2015

1 commit

• 82fc99e4   Disable piwik Browse Dir »

  1
  Victor Costa

  2015-06-19 09:02:54 -0300  

18 Jun, 2015

5 commits

• d65a2fb4   Merge branch 'email_template' into production Browse Dir »
  Evandro Jr

  2015-06-18 14:52:40 -0300  
• b12ffc48   Fix for strings Browse Dir »
  Evandro Jr

  2015-06-18 14:51:53 -0300  
• 9dfdd02b   Merge branch 'email_template' into production Browse Dir »
  Evandro Jr

  2015-06-18 14:48:45 -0300  
• 845e9613   Make strings translateable Browse Dir »
  Evandro Jr

  2015-06-18 14:47:42 -0300  
• f93c29c5   Fix not found page Browse Dir »
  Victor Costa

  2015-06-18 14:27:50 -0300  

17 Jun, 2015

6 commits

• bc5ce53f   Merge branch 'production' of gitlab.com:participa/noosfero into production ... Browse Dir »

  Conflicts:
  	app/views/cms/_event.html.erb

  Evandro Jr

  2015-06-17 14:27:04 -0300  
• 8f14851f   Merge branch 'change_start_and_end_date_to_datetime' into production ... Browse Dir »

  Conflicts:
  	app/views/cms/_event.html.erb

  Evandro Jr

  2015-06-17 14:21:47 -0300  
• a522623b   Adds support to time (HH:MM) in Events Browse Dir »
  Evandro Jr

  2015-06-17 13:52:09 -0300  
• 01a73fbc   Merge branch 'email_template' into production ... Browse Dir »

  Conflicts:
  	Gemfile
  	public/proposal-app
  	public/stylesheets/application.css

  Victor Costa

  2015-06-17 11:01:44 -0300  
• 77d9cc0a   Revert "Merge branch 'change_start_and_end_date_to_datetime' into production" ... Browse Dir »

  This reverts commit dca569a4b682f150e8e9e3116ea7b14843651e44, reversing
  changes made to 364e52a3cfbc1b6a0943d99e31dba1880e1111fa.

  Victor Costa

  2015-06-17 11:00:26 -0300  
• 2df11dd7   Improve layout of email templates list Browse Dir »
  Victor Costa

  2015-06-17 10:48:36 -0300  

16 Jun, 2015

7 commits

• dca569a4   Merge branch 'change_start_and_end_date_to_datetime' into production Browse Dir »

  1
  Evandro Jr

  2015-06-16 18:18:28 -0300  
• 364e52a3   Merge branch 'master' into production ... Browse Dir »

  1

  Conflicts:
  	lib/noosfero/plugin.rb

  Victor Costa

  2015-06-16 18:16:44 -0300  
• 0d9bdbdf   Select task rejection email from template Browse Dir »
  Victor Costa

  2015-06-16 18:13:59 -0300  
• 5cdd7db7   folder: let word wrap work (do not short filenames) ... Browse Dir »

  This also removes short_filename as it is now unused

  Braulio Bhavamitra

  2015-06-16 17:19:04 -0300  
• a602848f   adds start time, end time and presenter Browse Dir »
  Evandro Jr

  2015-06-16 16:45:17 -0300  
• bff21134   Define multiple types for email templates Browse Dir »
  Victor Costa

  2015-06-16 15:10:16 -0300  
• 97829943   Search category with an autocomplete ... Browse Dir »

  (ActionItem3149)

  Braulio Bhavamitra

  2015-06-16 14:05:29 -0300