 Diogo Biazus
|
ba631757bb
|
Merge pull request #710 from diogob/rails_41
Rails 41
|
2014-06-06 10:18:53 -04:00 |
|
|
Diogo Biazus
|
f1ef18e4d9
|
Merge pull request #709 from pedromarins/privacy-policy
adding missing link to privacy_policy text
|
2014-06-06 09:10:13 -04:00 |
|
|
Adriano Benin
|
7a190c8e9c
|
refactor reports sql
|
2014-06-05 20:34:48 -03:00 |
|
|
Diogo Biazus
|
a3fb274ea6
|
Merge pull request #707 from adrianob/xsl_order
use same column order for xsl and csv
|
2014-06-05 17:56:51 -04:00 |
|
|
pedromarins
|
a057f9dc4f
|
adding link to text
|
2014-06-05 17:34:48 -03:00 |
|
|
Adriano Benin
|
d0d84a779b
|
use same column order for xsl and csv
|
2014-06-05 17:32:15 -03:00 |
|
|
Adriano Benin
|
404100715c
|
more translation fixes
|
2014-06-05 17:12:16 -03:00 |
|
|
Diogo Biazus
|
fd791a9cfd
|
added comments pointing to issue in github on fix_render_to_string initializer
|
2014-06-05 13:19:48 -04:00 |
|
|
Diogo Biazus
|
40c0c156ea
|
fixed problem with render_to_string in rails 4.1
|
2014-06-05 13:18:02 -04:00 |
|
|
pedromarins
|
6b1b4a4f65
|
text and style changes missing
|
2014-06-05 12:22:18 -03:00 |
|
|
Diogo Biazus
|
c38f4182c0
|
Merge pull request #704 from pedromarins/privacy-policy
fixing small details on desktop and mobile presentation
|
2014-06-05 10:42:45 -04:00 |
|
|
Diogo Biazus
|
f6dc569a53
|
added hack to make state_machine work with rails. let's consider migrating to aasm
|
2014-06-04 21:27:19 -04:00 |
|
|
pedromarins
|
55a5ac1453
|
adding links to text
|
2014-06-04 16:16:39 -03:00 |
|
|
Antônio Roberto Silva
|
c5def95cc5
|
Merge pull request #702 from adrianob/translation_fixes
Translation fixes
|
2014-06-04 14:57:03 -03:00 |
|
|
Adriano Benin
|
55bacb770d
|
fix reward translations
|
2014-06-04 14:15:58 -03:00 |
|
|
pedromarins
|
4e32c255e3
|
fix bugs and add list to privacy policy text
|
2014-06-04 12:47:13 -03:00 |
|
|
Diogo Biazus
|
927918e29e
|
Merge pull request #700 from pedromarins/terms-of-use
header mobile menu
|
2014-06-03 11:19:17 -04:00 |
|
|
pedromarins
|
b6791fb926
|
privacy policy page
|
2014-06-03 09:51:13 -03:00 |
|
|
Antônio Roberto Silva
|
91a164d6f1
|
update to new monkeymail gem
|
2014-06-02 11:19:00 -03:00 |
|
|
Antônio Roberto Silva
|
d9e2ea4971
|
added catarse_monkeymail to improve the mailchimp integration
|
2014-05-29 15:56:07 -03:00 |
|
|
pedromarins
|
d47a3d8b83
|
extracting text from html to the locale file
|
2014-05-27 17:25:24 -03:00 |
|
|
pedromarins
|
38bbd3ad97
|
terms of use first commit page
|
2014-05-27 15:22:00 -03:00 |
|
|
pedromarins
|
d6aa8e54f5
|
new header version
|
2014-05-26 17:54:18 -03:00 |
|
|
adrianob
|
bd0246dfe5
|
Merge pull request #686 from diogob/user_deactivation
User deactivation
|
2014-05-23 18:35:58 -03:00 |
|
|
Diogo Biazus
|
4fefe83a04
|
added user interface elements to allow users and admins to deactivate accounts through user profile [12091751]
|
2014-05-23 14:36:46 -04:00 |
|
|
Diogo Biazus
|
253656d9d7
|
implemented user destroy action in users controller that will deactivate user account [12091751]
|
2014-05-23 12:57:44 -04:00 |
|
|
Diogo Biazus
|
f6434b1f31
|
Merge pull request #681 from adrianob/add_new_filter
add online projects filter to explore
|
2014-05-22 17:27:59 -04:00 |
|
|
Antônio Roberto Silva
|
343acde34a
|
Merge pull request #684 from adrianob/zendesk_links
Zendesk links
|
2014-05-22 17:50:00 -03:00 |
|
|
Adriano Benin
|
f90bf9eac8
|
change remaining links
|
2014-05-22 17:42:07 -03:00 |
|
|
Antônio Roberto Silva
|
152100673e
|
Merge pull request #683 from diogob/pt_locales_cleanup
Moving what was left in pt.yml to other files. Now pt.yml is a minimal f...
|
2014-05-22 15:35:56 -03:00 |
|
|
Diogo Biazus
|
4d8918b5ac
|
Merge pull request #682 from pedromarins/new-login/register
New login/register
|
2014-05-22 14:05:07 -04:00 |
|
|
Diogo Biazus
|
db7d1f019e
|
Moving what was left in pt.yml to other files. Now pt.yml is a minimal file and is needed only as a root translation file.
|
2014-05-22 13:46:21 -04:00 |
|
|
pedromarins
|
284ca58206
|
fix devise errors for blank fields
|
2014-05-22 14:26:14 -03:00 |
|
|
Adriano Benin
|
36d69b7055
|
add online projects filter to explore
|
2014-05-22 14:24:38 -03:00 |
|
|
Adriano Benin
|
7c55428485
|
change link in project new
|
2014-05-22 13:23:21 -03:00 |
|
|
Diogo Biazus
|
04ace03e7a
|
Merge pull request #679 from pedromarins/new-login/register
New login/register
|
2014-05-21 18:28:54 -04:00 |
|
|
pedromarins
|
571a1fc64d
|
fix use terms link on registration
|
2014-05-21 17:47:05 -03:00 |
|
|
Antônio Roberto Silva
|
80dfdf1761
|
use ENV PX DYNO when heroku is using dyno px
|
2014-05-21 17:20:44 -03:00 |
|
|
pedromarins
|
0562842b2f
|
password field with translation
|
2014-05-21 17:00:26 -03:00 |
|
|
Diogo Biazus
|
2c499afe97
|
Merge pull request #678 from adrianob/translation_fixes
Translation fixes
|
2014-05-21 15:51:08 -04:00 |
|
|
Diogo Biazus
|
596fed69ee
|
Merge pull request #677 from pedromarins/new-login/register
New login/register
|
2014-05-21 15:50:59 -04:00 |
|
|
Adriano Benin
|
acb49ddbb9
|
added some translations back
|
2014-05-21 16:40:55 -03:00 |
|
|
Adriano Benin
|
9e96aafd6b
|
fix some missing translations on rewards page
|
2014-05-21 16:25:05 -03:00 |
|
|
pedromarins
|
7bbf91c68e
|
password/new as on http://bootstrap-catarse.webflow.com/redefinir-senha
|
2014-05-21 15:37:15 -03:00 |
|
|
Diogo Biazus
|
e62c5b8ac0
|
moved header and footer translations to separate files
|
2014-05-20 16:23:17 -04:00 |
|
|
Diogo Biazus
|
5bccf902a2
|
cleaning pt.yml
|
2014-05-20 16:15:28 -04:00 |
|
|
Diogo Biazus
|
8c8bdb4609
|
moved formtastic translations to separate file, will remove this translations as soon as we have the new forms all using simple form
|
2014-05-20 16:14:30 -04:00 |
|
|
Diogo Biazus
|
4c26f4e11b
|
removing unused project locales and fixing how it works submit.
|
2014-05-20 15:07:08 -04:00 |
|
|
Diogo Biazus
|
76cd23abda
|
moved project contributions locales to separate file
|
2014-05-20 14:50:29 -04:00 |
|
|
adrianob
|
286931cf83
|
Merge pull request #673 from pedromarins/new-login/register
New login/register
|
2014-05-20 15:20:59 -03:00 |
|