Thiago Ribeiro / Noosfero

11 Feb, 2015

9 commits

5a66ff83 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-11 15:00:45 +0100
6d8ef0f1 Merge branch 'goodbye-prototype' into 'master' ... Browse Code »
```
Replace prototype calls to jquery/jrails

See merge request !427
```
Braulio Bhavamitra
2015-02-11 14:00:35 +0000
360702f5 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-11 14:33:51 +0100
174c9bb9 Port migration to rails3 Browse Code »

Braulio Bhavamitra
2015-02-11 10:33:04 -0300
592a3c64 Replace prototype calls/callbacks to jquery/jrails Browse Code »

Braulio Bhavamitra
2015-02-11 09:21:21 -0300
3c46f30a access_control: Rename file (fix tests) Browse Code »

Braulio Bhavamitra
2015-02-11 08:26:38 -0300
c1cedff5 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-11 12:17:27 +0100
f8fab09f Use true instead of 't' in SQL where clauses Browse Code »

Braulio Bhavamitra
2015-02-11 08:16:29 -0300
3522d915 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-11 01:08:46 +0100

10 Feb, 2015

29 commits

cf1e8aa6 Resolve missed code conflicts Browse Code »

Braulio Bhavamitra
2015-02-10 21:07:19 -0300
4c4fae53 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 20:20:09 +0100
984386a4 Merge branch 'metadata-plugin' into 'master' ... Browse Code »
```
Changes on metadata plugin

Discussed on !359

See merge request !444
```
Braulio Bhavamitra
2015-02-10 19:19:54 +0000
e5021790 metadata: fix application_controller test Browse Code »

Braulio Bhavamitra
2015-02-10 16:18:11 -0300
af30de84 metadata: Don't rescue errors Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:30 -0300
041494a8 metadata: Use alternate languages from article Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:30 -0300
6569e61a metadata: Use ALL_CAPS Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:29 -0300
8a1be65d metadata: Support key attr specification (fix tests) Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:29 -0300
ee532d16 metadata: Move to gettext locales Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:29 -0300
922a2682 metadata: Make config file generic Browse Code »

Braulio Bhavamitra
2015-02-10 16:17:29 -0300
e282aa63 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 20:04:12 +0100
4bee61ee Merge branch 'product-tabs-for-plugins' into 'master' ... Browse Code »
```
Product's tabs for plugins

Reopened from !21

See merge request !442
```
Braulio Bhavamitra
2015-02-10 19:03:53 +0000
25e630d7 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 19:56:28 +0100
b403cda3 Merge branch 'ai896' into 'master' ... Browse Code »
```
Customize template on controllers with use_custom_design

See merge request !93
```
Braulio Bhavamitra
2015-02-10 18:56:20 +0000
46fd3cac Customize template with use_custom_design Browse Code »

Braulio Bhavamitra
2015-02-10 15:49:30 -0300
a57217fb Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 19:22:51 +0100
e0ecc687 Merge branch 'ai2933' into 'master' ... Browse Code »
```
Index lat/lng on articles

http://noosfero.org/Development/ActionItem2933

See merge request !46
```
Braulio Bhavamitra
2015-02-10 18:22:39 +0000
c126ad06 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 19:22:07 +0100
00b69cdc Merge branch 'ai2809' into 'master' ... Browse Code »
```
Use materialized path for parents lookup

http://noosfero.org/Development/ActionItem2809

See merge request !7
```
Braulio Bhavamitra
2015-02-10 18:21:43 +0000
6e6bfcf4 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 19:09:22 +0100
980d4cac Merge branch 'ai2936' into 'master' ... Browse Code »
```
Allow _ in profiles identifiers

http://noosfero.org/Development/ActionItem2936

See merge request !63
```
Braulio Bhavamitra
2015-02-10 18:09:12 +0000
fce0864c Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 15:34:57 +0100
eeb785d2 Merge branch 'hide_translation' into 'master' ... Browse Code »
```
Hide translation

Hide translation on article and event creation if there is no languages defined in environment

See merge request !443
```
Victor Costa
2015-02-10 14:34:33 +0000
1f552f33 Merge remote-tracking branch 'origin/master' Browse Code »

Weblate
2015-02-10 10:00:45 +0100
fd398cc0 Merge branch 'count-products' into 'master' ... Browse Code »
```
Count products test fix

Just a small fix on test: environment.enable method.

See merge request !462
```
Braulio Bhavamitra
2015-02-10 09:00:32 +0000
3ea5c796 Merge remote-tracking branch 'origin/master' ... Browse Code »
```
Conflicts:
	po/de/noosfero.po
	po/es/noosfero.po
```
Weblate
2015-02-10 07:43:53 +0100
20af4df2 count products test fix Browse Code »

Eduardo Passos
2015-02-10 00:26:51 -0300

c8957baf Merge branch 'awesome' into 'master' ... Browse Code »

awesome: Update to version 4.3.0 and make update process easier

For update just replace the `scss` and `fonts` folder with the new version, no merge is necessary as before.

See merge request !461

2015-02-10 01:30:19 +0000

87aaba82 Merge branch 'count-products' into 'master' ... Browse Code »
```
Count products enterprise

Method to count Enterprise's visible and enabled products.

See merge request !460
```
Braulio Bhavamitra
2015-02-10 01:28:01 +0000

09 Feb, 2015

2 commits

0c57e403 awesome: Update to version 4.3.0 and make update process easier ... Browse Code »
```
We now extend the vanilla scss and extend on another file.

Conflicts:
	public/designs/icons/awesome/style.css
```
Braulio Bhavamitra
2015-02-09 22:24:17 -0300
f6ef9a7f Display products counter only for enabled enterprises Browse Code »

Eduardo Passos
2015-02-09 21:21:36 -0300