Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• 65fd875bab small fixes Patri 2014-10-29 22:18:12 +01:00
• 64351b6934 Stats move to new controller Patri 2014-10-29 22:04:06 +01:00
• e52b8d3023 merge branch 'master' into statistics_menu_for_admin Patri 2014-10-29 21:47:50 +01:00
• 17edb46f36 WIP to provoke ajax call from radio buttons Dani Macho 2014-10-29 21:42:38 +01:00
• e90f4b67a6 small fix in redirect after give time Patri 2014-10-29 21:33:40 +01:00
• f58d3f34da small fix to give time to organization Patri 2014-10-29 11:15:11 +01:00
• 14abe6e3e6 Commited conflicts Dani Macho 2014-10-26 12:38:12 +01:00
• aca3f64c31 Commited conflicts Dani Macho 2014-10-26 12:37:18 +01:00
• 8b03b5273f Added checkboxes to filter offers vs inquiries Dani Macho 2014-10-26 12:31:47 +01:00
• 93d5d779b9 layout changes, centering titles Dani Macho 2014-10-25 00:58:15 +02:00
• ef95ce3bd7 Added grouped view for tags and same used from admin menu Dani Macho 2014-10-25 00:48:09 +02:00
• 847f8096d0 change link in menu to proper index page. start looping to break tags alphabetically and in 3 columns Dani Macho 2014-10-22 22:29:59 +02:00
• b1281ffa9e Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:04:18 +02:00
• de7222ab8a Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:01:52 +02:00
• 7f078426c4 Added helper method to group tags alphabetically. Added a hardcoded literal to locale file Dani Macho 2014-10-19 13:47:10 +02:00
• fc1244c5d0 Added new navbar menu to admin tags Dani Macho 2014-10-19 12:25:39 +02:00
• 4c1f9ea53e Merge pull request #55 from coopdevs/changes_in_options_for_select Patri 2014-10-25 14:45:34 +02:00
• f7cc9ce0a4 merge branch 'master' into changes_options_for_select Patri 2014-10-25 14:26:37 +02:00
• 9fd3f264be Merge pull request #54 from danielmacho72/admin-tag-mgmt Patri 2014-10-25 14:25:00 +02:00
• 5da1a953ae layout changes, centering titles Dani Macho 2014-10-25 00:58:15 +02:00
• 25ca6a22f7 Added grouped view for tags and same used from admin menu Dani Macho 2014-10-25 00:48:09 +02:00
• cd407ec9d9 change link in menu to proper index page. start looping to break tags alphabetically and in 3 columns Dani Macho 2014-10-22 22:29:59 +02:00
• 997efe76bb small fix Patri 2014-10-22 16:59:38 +02:00
• 4434632bd4 not show members incatives Patri 2014-10-20 21:27:28 +02:00
• 331519931b default user selected Patri 2014-10-20 20:58:17 +02:00
• aea5643bf6 Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:04:18 +02:00
• e4172c6567 Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:01:52 +02:00
• b525c610a8 Added helper method to group tags alphabetically. Added a hardcoded literal to locale file Dani Macho 2014-10-19 13:47:10 +02:00
• 4df2b5e9a8 Added new navbar menu to admin tags Dani Macho 2014-10-19 12:25:39 +02:00
• a1b325a275 Do not send confirmation email when creating users Dani Macho 2014-10-19 11:25:09 +02:00
• d76a8ac3b7 Traducción a español de los mensajes de simple_form Dani Macho 2014-10-19 10:43:24 +02:00
• dd489759c3 Traducción a español del resto de mensajes de devise Dani Macho 2014-10-19 10:41:10 +02:00
• 14f1e3b82c Managed to use devise translation properly Dani Macho 2014-10-18 15:33:40 +02:00
• 25c996bb72 traducciones de devise que no aparecian Dani Macho 2014-10-18 14:50:35 +02:00
• 16d4893b53 use locale for Entrar word Dani Macho 2014-10-18 14:07:08 +02:00
• 752747fad7 No failures now running tests for inquiries controller. Organization was missing when fabricating inquiry Dani Macho 2014-10-18 13:57:51 +02:00
• 978f764ef3 Merge pull request #52 from coopdevs/select2 Patri 2014-10-16 18:26:15 +02:00
• 6305ccc553 merge branch 'master' into select2 Patri 2014-10-16 18:22:50 +02:00
• c250d7240d Merge pull request #49 from coopdevs/offers_as_dashboard_and_paginate_inquiries Saverio Trioni 2014-10-16 11:41:03 +02:00
• 2ca6eca8ef Merge pull request #48 from danielmacho72/tag-management Saverio Trioni 2014-10-16 11:39:44 +02:00
• c97e36f2bc Merge pull request #50 from coopdevs/edit_email Saverio Trioni 2014-10-16 11:37:30 +02:00
• ab3209f37b Merge pull request #51 from coopdevs/gravatar Saverio Trioni 2014-10-16 11:36:43 +02:00
• 2f8722cdfb link_to gravatar by clicking on the avatar Patri 2014-10-15 20:07:00 +02:00
• e859446265 not highlight unconfirmed emails Patri 2014-10-15 13:27:09 +02:00
• f93c387954 show unconfirmed mail Patri 2014-10-14 22:47:51 +02:00
• b5026fc373 Changed name for Controller Dani Macho 2014-10-12 21:17:59 +02:00
• 40f25e826c fixed defect where tags_manager was only called for offer in shared code. Fixed duplicate list too for typeahead Dani Macho 2014-10-11 23:28:12 +02:00
• 68e418e33e merge master into offers_as_dashboard_and_paginate_inquiries Patri 2014-10-10 17:56:26 +02:00
• 381bb474f4 small fix to show the category Patri 2014-10-10 17:51:26 +02:00
• 52aefd10f1 added tag tip in text box to enter commas Dani Macho 2014-10-10 09:48:28 +02:00
• 9590cde7d5 tags filtered as they are typed Dani Macho 2014-10-09 20:40:24 +02:00
• b173630531 now returns tags but trying to filter out based on param Dani Macho 2014-10-08 21:45:27 +02:00
• 4b7ae02507 allow admin to edit email Patri 2014-10-08 02:50:48 +02:00
• 4139a450e4 small fix Patri 2014-10-08 02:16:41 +02:00
• 6e09519ef0 using angular for typeahead. working with fixed array but not with asyncSelected Dani Macho 2014-10-07 03:21:53 +02:00
• 1c2478f309 paginate inquiries Xavi Vila 2014-10-04 21:57:47 +02:00
• a6ea708800 remove offers dropdown Xavi Vila 2014-10-03 18:42:02 +02:00
• d468cb5a42 some changes to include typeahead Dani Macho 2014-10-03 17:08:59 +02:00
• d4591cdd16 use 'select2' in give time view of users Patri 2014-10-01 00:25:09 +02:00
• d9fc676df9 use select2 in form of offers/inquiries Patri 2014-09-30 23:24:48 +02:00
• 553ee23e22 add select2 Patri 2014-09-30 23:21:49 +02:00
• c3fd9639eb added gsetgem to gitignore and rebase from refactored master from Saverio to fix Gemfile.lock changes I made Dani Macho 2014-09-30 00:07:39 +02:00
• 368ba4cdc1 Cleanup and refactor Saverio Trioni 2014-09-29 23:30:53 +02:00
• 375d01718c Redirect to the destination user. Saverio Trioni 2014-09-29 23:28:15 +02:00
• 34a8dd513c Update rspec to latest 2.x version to solve https://github.com/seattlerb/minitest/issues/286 Saverio Trioni 2014-09-29 22:48:24 +02:00
• 45af911164 Factored out login(user) from tests. Saverio Trioni 2014-09-29 22:42:13 +02:00
• 4dbdcc6955 Fixed give_time.html.haml to point to user_path in 3rd line Dani Macho 2014-09-28 00:54:40 +02:00
• ed976e535e Merge pull request #43 from danielmacho72/take-out-timeago Saverio Trioni 2014-09-28 00:01:13 +02:00
• ac3f53b993 I've take out timeago as string from users/show.html.haml in both offers and requests Dani Macho 2014-09-27 23:41:21 +02:00
• 675d776f5d showing offers list as a dashboard Xavi Vila 2014-08-19 18:21:16 +02:00
• a35a208de9 showing offers list as a dashboard Xavi Vila 2014-08-02 23:13:13 +02:00
• c434e35697 More fixes... Patri 2014-07-11 12:18:51 +02:00
• 9036bb428c Fixes Patri 2014-07-10 15:13:55 +02:00
• 2188c7f269 rake-based after-deploy hook - gems are not available outside it Saverio Trioni 2014-07-10 14:48:13 +02:00
• e40ef033eb Merge pull request #38 from coopdevs/date_of_birth_in_form Saverio Trioni 2014-07-10 11:58:25 +02:00
• c52ce3fc09 Merge remote-tracking branch 'timeoverflow/master' into date_of_birth_in_form Saverio Trioni 2014-07-10 11:58:09 +02:00
• f06f41a77b Merge pull request #39 from coopdevs/description_user_form Saverio Trioni 2014-07-10 11:56:44 +02:00
• 02539e3fd6 Merge pull request #40 from coopdevs/payment_related_to_offer Saverio Trioni 2014-07-10 11:56:25 +02:00
• 790a4d5c05 Inverse order for list of type of swaps Patri 2014-07-09 20:51:04 +02:00
• 94f1e26946 Translations Patri 2014-07-09 20:35:27 +02:00
• 14544b54ac Link new report to navbar Patri 2014-07-09 20:35:06 +02:00
• 13aa473cb5 Added 'Types of swaps' to statistics Patri 2014-07-09 20:33:31 +02:00
• 7877895478 Small fix to show member_id in the report of offers and inquiries Patri 2014-07-09 13:43:05 +02:00
• 831da2a349 Description's field in user profile Patri 2014-07-09 12:12:39 +02:00
• 3277e453c0 Small fix in the translation of the button Patri 2014-07-08 14:20:32 +02:00
• fc3fdd1cbf Added payment option to an offer in the user's profile Patri 2014-07-08 14:19:36 +02:00
• 9a1fe41ed6 Save the post id in the transfer when time is given to an offer Patri 2014-07-08 14:11:03 +02:00
• 5c7103f329 added 'without offers' report Patri 2014-06-19 22:20:52 +02:00
• 4833cf677c small fix to user the correct field last login 'current_sign_in_at' Patri 2014-06-19 22:16:01 +02:00
• 7649075b8c link new report on the menu Patri 2014-06-19 21:32:32 +02:00
• af766beb26 added 'last login' report Patri 2014-06-19 21:30:08 +02:00
• c3f8cff403 added module trackable from devise to save the date of last login 'last_sign_in_at' Patri 2014-06-19 21:27:45 +02:00
• 4dd6f097e0 fix datepicker form (not submit without ng-controller) Patri 2014-06-19 19:19:25 +02:00
• cb2b00b8c3 delete the old view of statistics Patri 2014-06-18 20:23:04 +02:00
• ff7f8a4086 dropdown menu for statistics Patri 2014-06-18 20:21:57 +02:00
• 669117ee74 separate statistics in different views Patri 2014-06-18 20:20:56 +02:00
• 4924dd231b Merge branch 'master' into date_of_birth_in_form Patri 2014-06-18 19:18:58 +02:00
• 61d0c476e1 Small fixes after merges Patri 2014-06-18 19:14:12 +02:00
• 5eff7bf8fb Merge branch 'changes_statistics' into statistics_menu_for_admin Patri 2014-06-18 19:09:45 +02:00
• e89ee85d8d Merge branch 'master' into statistics_menu_for_admin Patri 2014-06-18 18:59:06 +02:00