Mezuro / Colab

22 Jun, 2015

1 commit

48a72079 Merge branch 'mezuro-integration' Browse Code »

Sergio Oliveira
2015-06-22 17:23:27 -0300

09 Jun, 2015

2 commits

05417135 Merge branch 'update_plugin_cronjob' into 'master' ... Browse Code »
```
Update plugin cronjob

Add proxydata cronjob to cronjob (on master).

See merge request !58
```
Sergio Oliveira
2015-06-09 09:30:41 -0300

c82d7c4e Merge branch 'fix_translation_manifest' into 'master' ... Browse Code »

Fix Colab translations

The directory "locale" was not included in MANIFEST.in file. Thus, the package does not contain translations. This Merge Request fixes this.

See merge request !61

2015-06-09 09:28:56 -0300

08 Jun, 2015

1 commit

febec9ac Merge branch 'Validation_colab_sprint_30' into 'master' ... Browse Code »
```
Validation colab sprint 30

See merge request !54
```
Alexandre Barbosa
2015-06-08 17:04:46 -0300

06 Jun, 2015

3 commits

2cd97c75 Refactored Mezuro's diazo selectors for JS compability ... Browse Code »

Shorter regexp for dropping bootstrap.min.js and a more generic one for JQuery
in a way that it should not change if Colab updates its JQuery version.

2015-06-06 17:57:41 -0300

9a3ee54c Including locale directory in MANIFEST.in file ... Browse Code »

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2015-06-06 14:22:39 -0300

2c2074ce Update cronjob for updating plugin data ... Browse Code »
```
Signed-off-by: Gustavo Jaruga Cruz<darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
```
Gust
2015-06-06 09:43:07 -0300

05 Jun, 2015

2 commits

8a1f0eab Fixed JS conflicts with Mezuro ... Browse Code »

bootstrap js dropped from colab so the menus works
jquery js dropped from colab so accordion can load

Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>

2015-06-05 16:58:57 -0300

88f276b1 Drops Mezuro's navbar. ... Browse Code »
```
Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
```
Rafael Manzo
2015-06-05 16:47:00 -0300

02 Jun, 2015

1 commit

7961b442 Fixed urls for Mezuro ... Browse Code »

Without this, Colab was unable to request assets or any other sub page from
Mezuro.

This is not the correct fix. The right place to set the url is on:
colab/plugins/mezuro/urls.py. But this is not working yet.

Notice that we've also identified a bug on the ReverseProxy, which is not
repecting the upstream port always trying to request from port 80.

Signed off by: Gustavo Jaruga <darksshades@hotmail.com>

2015-06-02 16:21:17 -0300

01 Jun, 2015

1 commit

c9e9c7f0 Initial crude integration with Mezuro ... Browse Code »
```
Signed off by: Gustavo Jaruga <darksshades@hotmail.com>
```
Rafael Manzo
2015-06-01 18:08:54 -0300

25 May, 2015

3 commits

9e24daab Merge branch 'master' of beta.softwarepublico.gov.br:softwarepublico/colab Browse Code »

Sergio Oliveira
2015-05-25 17:32:15 -0300
5a46a3dd Merge branch 'fix_settings' into 'master' ... Browse Code »
```
Fix settings

See merge request !51
```
Sergio Oliveira
2015-05-25 17:32:01 -0300
d0894a50 Fixed virtualenvwrapper for trusty64 Browse Code »

Sergio Oliveira
2015-05-25 17:19:49 -0300

07 May, 2015

1 commit

954b3abf Fix wrong validation messages. ... Browse Code »
```
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
carol15022
2015-05-07 09:09:18 -0300

06 May, 2015

4 commits

2197dbfa Merge branch 'cron_fix' into 'master' ... Browse Code »
```
Cron fix

Fixed cronjob to hourly clean up expired snippets instead of every minute from 1:00 AM till 1:59 PM.

See merge request !50
```
Lucas Kanashiro
2015-05-06 11:45:02 -0300
3623d89b Fixing code style Browse Code »

Gust
2015-05-06 11:33:55 -0300
22c83612 Change initconfig to create .py configfile Browse Code »

Gust
2015-05-06 11:02:56 -0300
e8536b6e Fix load settings Browse Code »

Gust
2015-05-06 09:25:05 -0300

20 Apr, 2015

1 commit

b796f170 Fixed cron for cleaning up expired snippets ... Browse Code »
```
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
```
Carlos Coêlho
2015-04-20 13:50:46 -0300

13 Apr, 2015

1 commit

07d30f85 Improved docs home page Browse Code »

Sergio Oliveira
2015-04-13 12:03:31 -0300

09 Apr, 2015

9 commits

09148eef Fixed code style Browse Code »

Sergio Oliveira
2015-04-09 19:15:07 -0300
50933773 Moved email validation to user creation form Browse Code »

Sergio Oliveira
2015-04-09 19:07:25 -0300
2bcbd241 Removed settings yaml Browse Code »

Sergio Oliveira
2015-04-09 18:01:45 -0300
beb229f0 Merge branch 'loggin_upon_existing_email' into 'master' ... Browse Code »
```
Loggin upon existing email

Done issue #47, waiting for review.
```
Sergio Oliveira
2015-04-09 15:16:44 -0300
0b481654 Updated form msg and used reverse link Browse Code »

Sergio Oliveira
2015-04-09 15:16:29 -0300
9ea23b85 Fixed code style Browse Code »

Sergio Oliveira
2015-04-09 15:16:29 -0300

4bfc0010 Loggin upon existing email done. ... Browse Code »

Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>

2015-04-09 15:16:29 -0300

c988cf2c Changed error message for already registered email. ... Browse Code »
```
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
```
Rodrigo Siqueira de Melo
2015-04-09 15:16:29 -0300
ab94e3df Merge branch 'settings_py' Browse Code »

Sergio Oliveira
2015-04-09 14:53:40 -0300

06 Apr, 2015

1 commit

fd31cbb7 Fix test environ variables, remove deprecated yaml ... Browse Code »
```
-Add YAML envron to ignore the local yaml at /etc/colab if it exists
```
Gust
2015-04-06 09:47:45 -0300

02 Apr, 2015

3 commits

f2fb9f28 Add user documentation for plugin configuration ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-04-02 11:49:34 -0300
d9c5a6a6 Rename proxied_apps variable to colab_apps ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-04-02 11:34:13 -0300

0df9cd6e Load menu from plugins settings dir ... Browse Code »

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>

2015-04-02 11:23:51 -0300

30 Mar, 2015

2 commits

d7c967cc Update User documentation for plugins ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-03-30 16:24:10 -0300
55cd90e7 Update test settings and settings module import ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-03-30 15:41:09 -0300

26 Mar, 2015

2 commits

b5a489a0 Handle .yaml plugins menu ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-03-26 17:54:58 -0300
fb7c8350 Add plugins.d ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-03-26 16:07:42 -0300

23 Mar, 2015

2 commits

8b4dd611 Ignore eggs directory in .gitignore ... Browse Code »
```
Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
```
Alexandre Barbosa
2015-03-23 18:38:34 -0300

8d3adc82 Import Colab configurations from py files. ... Browse Code »

YAML Settings file is deprecated now.

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2015-03-23 18:27:43 -0300