NoosferoGov / noosfero

14 Nov, 2014

2 commits

0c7bc489 Merge branch 'virtuoso_integration' into stable Browse File »

Victor Costa
2014-11-14 14:33:14 -0300
a71491ff virtuoso: roadie needs nokogiri ~> 1.6.0 Browse File »

Victor Costa
2014-11-14 14:32:46 -0300

10 Nov, 2014

1 commit

2e3c97a0 Merge branch 'fix_notification_mail' into stable Browse File »

Victor Costa
2014-11-10 10:07:22 -0300

08 Nov, 2014

1 commit

7992de9d Gemfile: simplify loading plugins' Gemfiles Browse File »

Antonio Terceiro
2014-11-08 21:27:21 -0200

07 Nov, 2014

1 commit

5edd4a78 Revert dependency on test-unit Browse File »

Antonio Terceiro
2014-11-07 16:38:39 -0200

05 Nov, 2014

2 commits

ef7a02c2 Fix plugins_tests task Browse File »

Victor Costa
2014-11-05 14:50:53 -0300
f7beff57 Merge branch 'fix_plugin_tests' into stable Browse File »

Victor Costa
2014-11-05 13:59:47 -0300

04 Nov, 2014

1 commit

209616d6 Fix plugins_tests task Browse File »

Victor Costa
2014-11-04 10:00:31 -0300

03 Nov, 2014

1 commit

bb4b158d Fix merge with fix_lazy_queries branch Browse File »

Victor Costa
2014-11-03 12:24:08 -0300

31 Oct, 2014

2 commits

b09f337e Merge branch 'api' into stable ... Browse File »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-10-31 17:04:52 -0300
cf2b8ce4 Merge branch 'master' into api ... Browse File »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-10-31 17:04:15 -0300

30 Oct, 2014

2 commits

a0ef4f25 Merge branch 'fix_lazy_queries' into stable ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
```
Victor Costa
2014-10-30 15:31:52 -0300
a1ec80fb Added support to bullet gem in development Browse File »

Victor Costa
2014-10-30 15:24:23 -0300

28 Oct, 2014

1 commit

cde58fc4 Merge branch 'master' into stable Browse File »

Victor Costa
2014-10-28 09:34:50 -0300

27 Oct, 2014

1 commit

ac785d88 Pin locale version for Rubygems users ... Browse File »
```
This is the proper fix for !325
```
Antonio Terceiro
2014-10-27 18:41:35 -0200

01 Oct, 2014

1 commit

d9c13a65 Merge branch 'master' into api ... Browse File »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-10-01 14:04:23 -0300

30 Sep, 2014

1 commit

2efb80a2 Merge branch 'master' into rails3_stable ... Browse File »
```
Conflicts:
	Gemfile
	Gemfile.lock
```
Victor Costa
2014-09-30 12:06:48 -0300

29 Sep, 2014

1 commit

f323c51d Improve interoperability with non-Debian environments ... Browse File »

Instead of freezing the Debian-specific dependency tree in Gemfile.lock,
let's specify the Debian versions with ~> in Gemfile, and let other
systems provide specific versions in the best way they can.

2014-09-29 13:46:51 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse File »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

09 Sep, 2014

1 commit

85bd2779 gettext: fix string extraction and runtime usage ... Browse File »
```
Closes #307

Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
```
Victor Costa
2014-09-09 16:22:24 -0300

01 Sep, 2014

1 commit

85411b0c hotfix for gettext tranlation Browse File »

Leandro Santos
2014-09-01 14:29:08 -0300

29 Aug, 2014

1 commit

7d5483f1 Merge branch 'master' into rails3_stable ... Browse File »
```
Conflicts:
	app/helpers/layout_helper.rb
	db/schema.rb
```
Victor Costa
2014-08-29 11:35:34 -0300

28 Aug, 2014

1 commit

13d07d9d Revert "Gemfile: add gettext_rails" ... Browse File »
```
This reverts commit e0f459cd1cd5e0d3dddbc071cc653c28da183aa1.
```
Antonio Terceiro
2014-08-28 10:00:42 -0700

21 Aug, 2014

2 commits

2598c37e Merge branch 'master' into rails3_stable Browse File »

Victor Costa
2014-08-21 18:45:21 -0300
e0f459cd Gemfile: add gettext_rails Browse File »

Antonio Terceiro
2014-08-21 18:18:11 -0300

15 Aug, 2014

1 commit

cec25930 Merge branch 'rails3' into rails3_stable ... Browse File »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300

13 Aug, 2014

1 commit

05d99f0e Gemfile: de-duplicate rake ... Browse File »
```
newer versions of bundler will bitch about that.
```
Antonio Terceiro
2014-08-13 18:11:37 -0300

11 Aug, 2014

2 commits

458348bf Merge branches 'AI3268_template_management' and 'rails3_stable' into rails3_stable Browse File »

Leandro Santos
2014-08-11 15:21:28 -0300
d8b65b46 Fix the use of exception notification Browse File »

Victor Costa
2014-08-11 10:44:26 -0300

04 Aug, 2014

2 commits

be6c3d11 re-add dependency on rest-client ... Browse File »
```
Now make sure it will be installed together with the Debian package
```
Antonio Terceiro
2014-08-04 16:49:42 -0300
04971f7f Remove unused dependency Browse File »

Antonio Terceiro
2014-08-04 15:19:18 -0300

29 Jul, 2014

2 commits

e562726f Merge branch 'rails3' into rails3_stable ... Browse File »
```
Conflicts:
	Gemfile
```
Victor Costa
2014-07-29 18:18:06 -0300
a08e4ad6 Removes dependency of SystemTimer from ruby-bosh ... Browse File »
```
Check later if a newer gem (like xmpp4r) is more suitable than ruby-bosh.
```
Victor Costa
2014-07-29 18:14:57 -0300

26 Jun, 2014

3 commits

804762ae Merge branches 'rails3' and 'rails3_stable' into rails3_stable Browse File »

Leandro Santos
2014-06-26 17:13:41 -0300
ca21945c add require false to mocha gem to avoid lots of unexpected invocation Browse File »

Leandro Santos
2014-06-26 16:12:11 -0300
892f430c removing eventmachine from Gemfile.lock and adding mocha lib to Gemfile test group Browse File »

Leandro Santos
2014-06-26 12:02:35 -0300

16 May, 2014

1 commit

cc2c9624 rails3: fix grape initialization Browse File »

Victor Costa
2014-05-16 13:49:46 -0300

29 Apr, 2014

1 commit

d4faecd1 rails3: development + packaging updates ... Browse File »

Some specific points:

- ./script/quick-start not works from start to end on a clean Debian
  wheezy system
- Gemfile: remove checking for programs since the Gemfile is not really
  the right place to do this
- Gemfile.lock: lock gem versions against Debian wheezy.  This assumes
  package versions in Debian wheezy + some backported packages available
  at http://people.debian.org/~terceiro/noosfero-wheezy-backports/
- db:data:minimal: add an explicit contact email to the new environment.
  This fixes a long standing issue: when installing Noosfero on a brand
  new system, exim MTA will choke on a malformed sender address, and
  abort the entire installation.
- added a simple Vagrantfile for development purposes

Pending:

- provide proper backports for packages and drop the temporary
  http://people.debian.org/~terceiro/noosfero-wheezy-backports/

2014-04-29 10:28:36 -0300

25 Mar, 2014

1 commit

f64b9db6 rails3: added dalli gem as memcached client Browse File »

Victor Costa
2014-03-25 11:56:12 -0300

26 Feb, 2014

1 commit

46a6f863 rails3: load gemfile from plugins Browse File »

Victor Costa
2014-02-26 10:48:25 -0300