wellton/catarse
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Gráfico de Commits

  • b26b15ffe8 update catarse monkeymail master Antônio Roberto Silva 2014-06-06 15:22:16 -03:00
  • ba631757bb Merge pull request #710 from diogob/rails_41 Diogo Biazus 2014-06-06 10:18:53 -04:00
  • 803c5b56e8 updated travis to 2.1.2 Diogo Biazus 2014-06-06 09:23:42 -04:00
  • f1ef18e4d9 Merge pull request #709 from pedromarins/privacy-policy Diogo Biazus 2014-06-06 09:10:13 -04:00
  • 30da4a158c Merge pull request #708 from adrianob/refactor_report_sql Diogo Biazus 2014-06-06 09:09:47 -04:00
  • b1071e6fd8 fix on projects/edit form to be with the same style as the original form pedromarins 2014-06-06 08:48:20 -03:00
  • 7a190c8e9c refactor reports sql Adriano Benin 2014-06-05 20:34:48 -03:00
  • a3fb274ea6 Merge pull request #707 from adrianob/xsl_order Diogo Biazus 2014-06-05 17:56:51 -04:00
  • bdbb14b08b Merge pull request #706 from adrianob/more_translation_fixes Diogo Biazus 2014-06-05 17:56:34 -04:00
  • f59362d618 fix typo Adriano Benin 2014-06-05 17:42:13 -03:00
  • a057f9dc4f adding link to text pedromarins 2014-06-05 17:34:48 -03:00
  • d0d84a779b use same column order for xsl and csv Adriano Benin 2014-06-05 17:32:15 -03:00
  • 404100715c more translation fixes Adriano Benin 2014-06-05 17:12:16 -03:00
  • b6609fe231 migration to fix video_embed_url in existing projects (the new url will always contain the // before the host Diogo Biazus 2014-06-05 14:36:49 -04:00
  • f2e3821972 changed formtastic for simple_form Diogo Biazus 2014-06-05 13:58:45 -04:00
  • fd791a9cfd added comments pointing to issue in github on fix_render_to_string initializer Diogo Biazus 2014-06-05 13:19:48 -04:00
  • 40c0c156ea fixed problem with render_to_string in rails 4.1 Diogo Biazus 2014-06-05 13:18:02 -04:00
  • c6e623a2c8 removed nonexistent images from SASS Diogo Biazus 2014-06-05 13:17:49 -04:00
  • 332850f798 fixed another video spec. now URL always comes with // Diogo Biazus 2014-06-05 13:17:35 -04:00
  • 21347efa3f Merge pull request #705 from pedromarins/privacy-policy Diogo Biazus 2014-06-05 11:24:08 -04:00
  • 6b1b4a4f65 text and style changes missing pedromarins 2014-06-05 12:22:18 -03:00
  • c38f4182c0 Merge pull request #704 from pedromarins/privacy-policy Diogo Biazus 2014-06-05 10:42:45 -04:00
  • acd88d84d6 fixed video handler, now the // comes in the video_embed_url method Diogo Biazus 2014-06-05 09:15:54 -04:00
  • 78a7d27b32 Fixed has_and_belongs_to_many problem using has_many through instead. We already had an intermediary model. Diogo Biazus 2014-06-04 21:37:12 -04:00
  • f6dc569a53 added hack to make state_machine work with rails. let's consider migrating to aasm Diogo Biazus 2014-06-04 21:27:19 -04:00
  • ff52b668b0 changed .scoped for .all (scoped was removed in rails 4.1) Diogo Biazus 2014-06-04 21:26:48 -04:00
  • 12e74e7b3e Upgraded rails to 4.1.1, fixed moip-ruby version to avoid problems with MoIP API, changed feedzira to feedjira. Diogo Biazus 2014-06-04 21:26:01 -04:00
  • 62c6c157bf upgraded ruby version to 2.1.2 Diogo Biazus 2014-06-04 19:52:38 -04:00
  • 56e0ca0665 fixing small details on desktop and mobile presentation pedromarins 2014-06-04 16:17:15 -03:00
  • 55a5ac1453 adding links to text pedromarins 2014-06-04 16:16:39 -03:00
  • 2dfc4b0450 Merge pull request #703 from adrianob/channel_order Antônio Roberto Silva 2014-06-04 15:27:54 -03:00
  • c5def95cc5 Merge pull request #702 from adrianob/translation_fixes Antônio Roberto Silva 2014-06-04 14:57:03 -03:00
  • 7c88c8b119 Merge pull request #701 from pedromarins/privacy-policy Antônio Roberto Silva 2014-06-04 14:39:09 -03:00
  • af43c6b37f use same order as projects search for channel projects index Adriano Benin 2014-06-04 14:37:53 -03:00
  • 55bacb770d fix reward translations Adriano Benin 2014-06-04 14:15:58 -03:00
  • 154f9b8ce9 fix missing translation Adriano Benin 2014-06-04 13:55:36 -03:00
  • 4e32c255e3 fix bugs and add list to privacy policy text pedromarins 2014-06-04 12:47:13 -03:00
  • 927918e29e Merge pull request #700 from pedromarins/terms-of-use Diogo Biazus 2014-06-03 11:19:17 -04:00
  • b6791fb926 privacy policy page pedromarins 2014-06-03 09:51:13 -03:00
  • d45025345f header mobile menu pedromarins 2014-06-03 09:29:06 -03:00
  • d32aa8e700 Merge pull request #698 from devton/fix_payment_method_and_choice_for_mixpanel Diogo Biazus 2014-06-02 15:54:58 -04:00
  • 1496f1ea47 use self instead this Antônio Roberto Silva 2014-06-02 17:03:01 -03:00
  • 2ce69a1c29 Merge pull request #699 from devton/new_mailchimp_integration Diogo Biazus 2014-06-02 15:40:41 -04:00
  • 7c9a02095a Merge branch 'master' into new_mailchimp_integration Antônio Roberto Silva 2014-06-02 11:21:48 -03:00
  • 91a164d6f1 update to new monkeymail gem Antônio Roberto Silva 2014-06-02 11:19:00 -03:00
  • 6735d22bd8 use trackOnPage Antônio Roberto Silva 2014-06-02 10:11:04 -03:00
  • 64c810d92e Merge pull request #697 from devton/fix_cpf_blank_on_paypal Diogo Biazus 2014-05-30 11:04:19 -04:00
  • 8bbe8a2442 Merge pull request #696 from devton/refact_is_love Diogo Biazus 2014-05-30 11:03:31 -04:00
  • 81fe9850dc added payment method and choice on contribution show to cath via js on mixpanel track [12549367] Antônio Roberto Silva 2014-05-29 18:52:14 -03:00
  • 4b3c8ce9a5 Fix ajax to change the payment method name when user change the payment tab Antônio Roberto Silva 2014-05-29 18:50:15 -03:00
  • e855e6f025 When user go to paypal the CPF is a empty string and not a null value [12548778] Antônio Roberto Silva 2014-05-29 18:30:27 -03:00
  • 78f52e49fd update catarse monkey mail Antônio Roberto Silva 2014-05-29 18:11:22 -03:00
  • 0907c144a1 Merge pull request #695 from adrianob/use_jpeg Antônio Roberto Silva 2014-05-29 17:39:18 -03:00
  • 39d33824ab refact project_observer to use notify_owner and notify_to_backoffice methods Antônio Roberto Silva 2014-05-29 17:00:42 -03:00
  • 6ac86c830c use jpeg for thumbnails Adriano Benin 2014-05-29 16:45:49 -03:00
  • d9e2ea4971 added catarse_monkeymail to improve the mailchimp integration Antônio Roberto Silva 2014-05-29 15:56:07 -03:00
  • 38fd1d7462 Merge pull request #694 from pedromarins/terms-of-use Diogo Biazus 2014-05-29 10:53:47 -04:00
  • c998840e5a solving merge conflict on mais.sass pedromarins 2014-05-29 11:30:09 -03:00
  • 5fbc3b4abe Terms of use page with design revisions pedromarins 2014-05-28 14:17:15 -03:00
  • f670086248 Merge pull request #693 from devton/adjust_contribution_user_update Diogo Biazus 2014-05-28 12:02:10 -04:00
  • 928cef4997 when user don't fill the CPF on contribution like boleto or paypal we use the last user address data when update[12548778] Antônio Roberto Silva 2014-05-28 11:35:50 -03:00
  • 9991c58483 small revisions on terms of use page pedromarins 2014-05-27 18:09:25 -03:00
  • d47a3d8b83 extracting text from html to the locale file pedromarins 2014-05-27 17:25:24 -03:00
  • 71cc24b003 Merge pull request #691 from pedromarins/webflow-css-file Diogo Biazus 2014-05-27 15:20:12 -04:00
  • 3fcd2cc894 solving conflicts pedromarins 2014-05-27 15:19:26 -03:00
  • 38bbd3ad97 terms of use first commit page pedromarins 2014-05-27 15:22:00 -03:00
  • eb4984134f Merge pull request #690 from diogob/remove_by_engage_from_metatags Antônio Roberto Silva 2014-05-27 15:20:58 -03:00
  • 800071a05d creating a separated file for the new bootstrap version based on webflow pedromarins 2014-05-27 15:19:26 -03:00
  • 8ea9b16ce1 Merge pull request #689 from devton/fix_mixpanel_finished_contribution Diogo Biazus 2014-05-27 14:16:27 -04:00
  • 51aae038c7 Changed author meta tag from engage to catarse so that facebook shares will be 'by catarse' [12528659] Diogo Biazus 2014-05-27 14:12:41 -04:00
  • 255037f8ae use confirmed contribution to send payment methods things and back with the finished contribution to client side because the system skips when payments is made with credit card on mixpanel Antônio Roberto Silva 2014-05-27 14:15:29 -03:00
  • 5666c57a90 Merge pull request #688 from devton/remove_rewards_papertrail Diogo Biazus 2014-05-27 13:13:58 -04:00
  • 1d6b36f7b0 fix typo error Antônio Roberto Silva 2014-05-27 13:57:22 -03:00
  • 2e10f2c78b remove papertrail and log only the last changes in a column on rewards table Antônio Roberto Silva 2014-05-27 13:52:46 -03:00
  • d6aa8e54f5 new header version pedromarins 2014-05-26 17:54:18 -03:00
  • 361fc423f4 Merge pull request #687 from adrianob/order_channel_online Diogo Biazus 2014-05-23 17:56:34 -04:00
  • bd0246dfe5 Merge pull request #686 from diogob/user_deactivation adrianob 2014-05-23 18:35:58 -03:00
  • 1aec669a7c show online channel projects first Adriano Benin 2014-05-23 18:13:55 -03:00
  • 4fefe83a04 added user interface elements to allow users and admins to deactivate accounts through user profile [12091751] Diogo Biazus 2014-05-23 14:36:46 -04:00
  • e1e5b22df5 Merge branch 'master' of https://github.com/catarse/catarse Adriano Benin 2014-05-23 15:13:54 -03:00
  • 29a1e06a36 Merge pull request #685 from devton/contributions_report_to_owner_adjusts adrianob 2014-05-23 15:12:37 -03:00
  • 57820c4cdc use the user address data from user profile [12484697] Antônio Roberto Silva 2014-05-23 15:10:30 -03:00
  • 43cd051ebc fix link Adriano Benin 2014-05-23 15:08:48 -03:00
  • 253656d9d7 implemented user destroy action in users controller that will deactivate user account [12091751] Diogo Biazus 2014-05-23 12:57:44 -04:00
  • 5a98bbedea added destroy permission to users policy, this will allow users to deactivate their own profile and admins to deactivate anyone Diogo Biazus 2014-05-23 12:26:54 -04:00
  • dbd7ef8365 fixing admin users title Diogo Biazus 2014-05-23 12:10:43 -04:00
  • f6434b1f31 Merge pull request #681 from adrianob/add_new_filter Diogo Biazus 2014-05-22 17:27:59 -04:00
  • 343acde34a Merge pull request #684 from adrianob/zendesk_links Antônio Roberto Silva 2014-05-22 17:50:00 -03:00
  • f90bf9eac8 change remaining links Adriano Benin 2014-05-22 17:42:07 -03:00
  • 4eab2335f1 change links in channel notifications Adriano Benin 2014-05-22 17:08:02 -03:00
  • 152100673e Merge pull request #683 from diogob/pt_locales_cleanup Antônio Roberto Silva 2014-05-22 15:35:56 -03:00
  • 4d8918b5ac Merge pull request #682 from pedromarins/new-login/register Diogo Biazus 2014-05-22 14:05:07 -04:00
  • 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. Diogo Biazus 2014-05-22 13:46:21 -04:00
  • 117dbf9446 adding viewport for mobile pedromarins 2014-05-22 14:34:17 -03:00
  • 284ca58206 fix devise errors for blank fields pedromarins 2014-05-22 14:26:14 -03:00
  • 36d69b7055 add online projects filter to explore Adriano Benin 2014-05-22 14:24:38 -03:00
  • a64f4a1d44 Merge pull request #680 from devton/adjust_bug_on_project_edit Diogo Biazus 2014-05-22 13:08:09 -04:00
  • 05b841ea4e show password button hidden on mobile pedromarins 2014-05-22 13:42:09 -03:00
  • 7c55428485 change link in project new Adriano Benin 2014-05-22 13:23:21 -03:00
  • b4521835dc change links in warning texts Adriano Benin 2014-05-22 13:21:41 -03:00