Charles Oliveira / noosfero

25 Jul, 2015

1 commit

ef70a151 mergin with article_datetime branch Browse Dir »

Leandro Santos
2015-07-25 11:10:04 -0300

24 Jul, 2015

2 commits

e881f6c1 Adapting views and helpers to datime format Browse Dir »

Leandro Santos
2015-07-24 18:27:24 -0300
08bbc6ff change event start date and ende date to datetime Browse Dir »

Leandro Santos
2015-07-24 13:09:25 -0300

17 Jul, 2015

5 commits

aaac6d01 Merge branch 'keep_filters_after_close_tasks' into production Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:58:29 -0300
7fef010c removing debug line Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:58:01 -0300
347d0ca2 Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:23:37 -0300
0c93a29d merge with master - changed to keep tasks filter after tasks close action Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:23:11 -0300
0a6daa95 changed to keep the filter applyed to tasks after action close Browse Dir »

Ábner Silva de Oliveira
2015-07-17 15:16:44 -0300

16 Jul, 2015

1 commit

fa6ea4bd Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	app/views/admin_panel/index.html.erb
```
Victor Costa
2015-07-16 14:53:46 -0300

15 Jul, 2015

3 commits

331869b0 Manage environment email templates Browse Dir »

Victor Costa
2015-07-15 19:33:23 -0300
3af4c864 Fix email template content type Browse Dir »

Victor Costa
2015-07-15 18:14:40 -0300
fc9326ee Send activation code with email template Browse Dir »

Victor Costa
2015-07-15 15:11:17 -0300

07 Jul, 2015

2 commits

20c6f6e1 Merge branch 'email_template' into production Browse Dir »

Victor Costa
2015-07-07 10:18:02 -0300
0f9307fe Move email template selection to task partials Browse Dir »

Victor Costa
2015-07-07 10:16:19 -0300

06 Jul, 2015

2 commits

933d3771 Merge branch 'email_template' into production ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	test/functional/tasks_controller_test.rb
```
Victor Costa
2015-07-06 17:03:26 -0300
8a4dc901 Choose email template when accept a task Browse Dir »

Victor Costa
2015-07-06 17:00:43 -0300

03 Jul, 2015

1 commit

ea468c0e Merge branch 'block-admin-mail' into production ... Browse Dir »
```
Conflicts:
	app/models/event.rb
	app/models/profile.rb
	po/fr/noosfero.po
```
Victor Costa
2015-07-03 10:45:54 -0300

01 Jul, 2015

1 commit

06f96ca8 fix conflit with add_members_community Browse Dir »

Leandro Santos
2015-07-01 18:10:44 -0300

18 Jun, 2015

1 commit

0475e746 Revert "Issue #63 Language selection bug" ... Browse Dir »
```
This reverts commit 190a130ea45fb5911016be68cfb1038f762ea313.
```
Braulio Bhavamitra
2015-06-18 14:01:22 -0300

17 Jun, 2015

5 commits

410b9cba Fix event warning Browse Dir »

Victor Costa
2015-06-17 22:30:29 -0300
b84467b5 Merge branch 'use-profile-homepage' into 'master' ... Browse Dir »
```
Use profile homepage

The profile homepage is not used in some places

See merge request !555
```
Braulio Bhavamitra
2015-06-17 23:15:27 +0000

f45a5570 Merge branch 'language_selection_bug' into 'master' ... Browse Dir »

Issue #63 Language selection bug

- Fixed wrong language selected when accessing a translation page of an
  article.

See Issue #63 for more details.

See merge request !559

2015-06-17 23:05:04 +0000

5ee24034 Refactoring article content visualization ... Browse Dir »

  - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-17 15:19:06 -0300

b1e59638 Use profile homepage Browse Dir »

Braulio Bhavamitra
2015-06-17 13:15:33 -0300

16 Jun, 2015

3 commits

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -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
97829943 Search category with an autocomplete ... Browse Dir »
```
(ActionItem3149)
```
Braulio Bhavamitra
2015-06-16 14:05:29 -0300

12 Jun, 2015

3 commits

dbea8847 Refactor deprecated code for date to use rails method ... Browse Dir »

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:33:36 -0300

b8629708 Add date format option for articles from the environment ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:03:20 -0300

769eb2c5 Add new visualization option for blog posts. ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:03:20 -0300

11 Jun, 2015

2 commits

b49fa908 Adding bigger icons when displaying folders ... Browse Dir »
```
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
```
André Guedes
2015-06-11 16:43:09 -0300

bbcc0618 Improvments on folder visualization ... Browse Dir »

- Refactoring CSS to better display folder itens
- Creating method to display uploaded file names with extension in upper
  case

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2015-06-11 16:43:09 -0300

02 Jun, 2015

1 commit

b39a1a37 merging with master Browse Dir »

Leandro Santos
2015-06-02 14:15:49 -0300

01 Jun, 2015

1 commit

bc60b106 Remove the 8 wrapper divs from the main content ... Browse Dir »

It is now replaced with a single div with class 'main-content'.

This *might* break some old themes, but we need to start getting rid of
these absurds at some point.

2015-06-01 16:45:57 -0300

29 May, 2015

1 commit

75fba59a Merge branch 'sniffer-plugin' into 'master' ... Browse Dir »

Adds Sniffer Plugin

This merge request adds the sniffer plugin, a plugin to help enterprises find consumers and suppliers for their products or product categories of interest. I used micro commits for changes on noosfero core or other plugins that needed fixes to work with this new plugin, plus a single commit that adds the sniffer plugin.

See merge request !585

2015-05-29 09:40:25 +0000

28 May, 2015

5 commits

7ebda177 Adds optional html options to control_panel_buttons hotspot ... Browse Dir »
```
  Plugins can set aditional html options like id, class or data
  attributes for control panel buttons.
```
Larissa Reis
2015-05-28 23:46:13 -0300
b4c42da1 Adds helper for displaying a profile's city and state ... Browse Dir »
```
Signed-off-by: Larissa Reis <larissa@colivre.coop.br>
```
Aurélio A. Heckert
2015-05-28 23:46:13 -0300
48493481 Handle optional fields for not logged users in login form Browse Dir »

Arthur Esposte
2015-05-28 20:44:41 -0300

1c125da7 chat fixes and new features ... Browse Dir »

* try to reconnect if connection fails
* fix ordering
* reconnect if connection is lost but user status is not offline
* remove some anchors
* keep track of buddies order on the client
* tweak notification to work on chromium
* respect async request order
* focus on window when notification clicked
* deal with window visibility
* add chat-buttons
* fix recent_conversations
* fix sorting and join room on opening
* remove obsolete code
* adjusting indentation (sorry but I needed too...)
* fix load_conversation
* return identifier as key on avatars action
* fix typo
* add timeout to notification
* deal properly with offline messages
* fix notification sound
* clear unread after loading conversation on background
* ignore message from room
* add unread messages counter on chat-label
* as for notification permission as soon as the chat connects
* add profile_info_action to open chat
* using jid to save message instead of identifier
* add profile_info_action to open chat
* as for notification permission as soon as the chat connects
* add unread messages counter on chat-label

Squashed and Signed-off-by: Joenio Costa <joenio@colivre.coop.br>

2015-05-28 18:09:56 -0300

4c1e0c9f admin-panel: refactoring of manage organizations ... Browse Dir »

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>

2015-05-28 12:49:23 -0300