Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• f4592f5e77 Code style: activeadmin inputs Saverio Trioni 2015-01-12 01:10:17 +01:00
• fbb7d89afa Code style: helpers (except for a soon-to-be-removed users_helper Saverio Trioni 2015-01-12 01:08:40 +01:00
• 11b307086e Code style: all controllers except statistics Saverio Trioni 2015-01-12 00:42:51 +01:00
• e01075c7b1 run specs against Ruby 2.2 Marc Anguera Insa 2015-01-10 15:15:05 +01:00
• 041996c8f7 remove deprecated/unused folders: script/ (moved to bin/) & doc/ (moved to sdoc gem) Marc Anguera Insa 2015-01-10 15:12:36 +01:00
• 70622f6cbe Upgrade to Rails 4.2; review app skeleton (closes #115) [WIP] Marc Anguera Insa 2015-01-09 19:52:14 +01:00
• 569f61962a Code style: More controllers adjusted Saverio Trioni 2015-01-08 11:38:07 +01:00
• 05c3d7e9ff Code style: further simplifications on statistics controller Saverio Trioni 2015-01-08 11:27:14 +01:00
• be3cde497d Code style: start to make rubocop happy on controllers Saverio Trioni 2015-01-08 01:07:02 +01:00
• 92fcf5a3de Code style: make rubocop happy with the app/admin directory Saverio Trioni 2015-01-08 00:08:48 +01:00
• a2097bb786 Merge pull request #114 from coopdevs/delete_flag_assets Patri 2015-01-07 19:09:12 +01:00
• 2ed7db4b60 delete unused flags assets Dani Macho 2015-01-03 02:39:02 +01:00
• f4279495aa Merge pull request #109 from HatsuMora/change_default_redirection Saverio Trioni 2014-12-22 17:22:13 +01:00
• 6338647bec Merge pull request #106 from jordipujollarena/tabla_users_sin_mail Saverio Trioni 2014-12-19 10:03:37 +01:00
• 3e0685a3af organization-url-clickable Jordi Pujol i Larena 2014-12-19 09:52:50 +01:00
• ad36f227fd Merge pull request #111 from coopdevs/delete_logfile Saverio Trioni 2014-12-16 21:38:22 +01:00
• 1ea73c31db remove unused logfile Marc Anguera Insa 2014-12-16 21:37:29 +01:00
• a154bddc6e Merge pull request #110 from coopdevs/allow_repeat_name Saverio Trioni 2014-12-16 21:19:17 +01:00
• 24ec9e0f8b user: allow to repeat username Marc Anguera Insa 2014-12-16 21:12:51 +01:00
• 87e05d9edf Merge pull request #108 from Marsupio/quitar_send_message Saverio Trioni 2014-12-16 21:04:43 +01:00
• 0e7e653ebd Merge pull request #97 from coopdevs/delete_members_cascade Saverio Trioni 2014-12-16 21:01:40 +01:00
• 00a7397586 send message button code deleted Marsupio 2014-12-16 20:56:32 +01:00
• bb70f79814 member: remove orphaned users after destroy last membership Marc Anguera Insa 2014-12-16 20:27:49 +01:00
• 3b4db380ee Change default redirection #2 Aldo Rincon Mora 2014-12-15 13:31:19 -05:00
• 5736c0c7a9 First commit of change redirection Aldo Rincon Mora 2014-12-15 12:27:33 -05:00
• c7e7f22b48 Merge pull request #2 from coopdevs/master Aldo Rincón Mora 2014-12-15 11:53:22 -05:00
• f606db64dc send message button commented out Marsupio 2014-12-15 16:39:15 +01:00
• 1464580d7c Merge branch 'master' into delete_members_cascade Marc Anguera Insa 2014-12-14 20:54:42 +01:00
• 1bd2b6682f añadida columna email valido a tabla usuarios v2 Jordi Pujol i Larena 2014-12-14 08:47:13 +01:00
• 17c91280fb añadida columna email valido a tabla usuarios Jordi Pujol i Larena 2014-12-13 17:38:56 +01:00
• a7a158c201 añadida columna valid_email Jordi Pujol i Larena 2014-12-13 17:27:55 +01:00
• 36928bd473 Merge pull request #107 from coopdevs/bug_import_csv Saverio Trioni 2014-12-13 02:58:21 +01:00
• 85e10a8839 bug to used local variables in other functions Patri 2014-12-13 00:41:03 +01:00
• d24946f9b2 mostrar usuarios sin mail Jordi Pujol i Larena 2014-12-12 13:35:10 +01:00
• 94ea8faaef Merge pull request #105 from coopdevs/tags_not_loaded_during_edit Saverio Trioni 2014-12-10 00:14:16 +01:00
• 746c057772 Merge pull request #99 from coopdevs/lang_chooser Saverio Trioni 2014-12-09 23:12:15 +01:00
• d5365a9e4f Fixed error. Now using prefilled option when calling tagsmanager during edit Dani Macho 2014-12-09 22:37:21 +01:00
• bc2eaf5858 Merge pull request #104 from coopdevs/fix_email_typos Saverio Trioni 2014-12-09 21:39:55 +01:00
• 83dde6fe8e Merge pull request #103 from coopdevs/fixes_stats Saverio Trioni 2014-12-09 21:39:30 +01:00
• fcfc20b01b Merge pull request #96 from coopdevs/fix_ci Saverio Trioni 2014-12-09 21:37:18 +01:00
• 7f6c743f57 fixed some typos in devise email templates Dani Macho 2014-12-09 21:28:59 +01:00
• 4ce4c504fa Merge branch 'master' into fixes_stats Patri 2014-12-08 02:08:02 +01:00
• 52e9620b7a pass rubocop Patri 2014-12-08 02:06:33 +01:00
• 02a35b6e91 include swaps without category and/or tags Patri 2014-12-08 01:57:53 +01:00
• c577b8c8f8 small fix to display stats Patri 2014-12-08 01:35:49 +01:00
• a005abff8f fix rubocop warnings Xavi Vila 2014-12-07 10:16:57 +01:00
• 285e34bf42 Merge remote-tracking branch 'upstream/master' into remove_inherited_resources Xavi Vila 2014-12-06 20:05:07 +01:00
• 6365390d94 Merge pull request #102 from coopdevs/vagrant_support Saverio Trioni 2014-12-05 16:51:08 +01:00
• 3e3820c1f8 Added Vagrant support Dani Macho 2014-12-04 18:29:37 +01:00
• cf15f89b75 include swaps without tags in stats Patri 2014-12-04 22:14:05 +01:00
• d40d9c4c4b Merge branch 'master' into fix_ci Marc Anguera Insa 2014-12-04 22:09:07 +01:00
• 6503ca79bb little code review; make hound ci happy Marc Anguera Insa 2014-12-04 22:05:29 +01:00
• 6131f4585c Merge branch 'master' into lang_chooser Marc Anguera Insa 2014-12-04 21:59:28 +01:00
• 68637730b7 Merge pull request #101 from coopdevs/wrong_email_body_for_cat Saverio Trioni 2014-12-04 19:07:07 +01:00
• 06d70f5170 renamed devise email .cat.html.erb files as .ca.html.erb instead Dani Macho 2014-12-04 18:33:39 +01:00
• 1096ed379a Merge pull request #100 from coopdevs/error_if_email_reused Daniel Macho 2014-12-04 18:15:04 +01:00
• 56392ce7e9 merge master Xavi Vila 2014-12-04 10:33:57 +01:00
• e91c9bdad6 Error shown now when trying to create a new user with an existing email address Dani Macho 2014-12-04 10:12:46 +01:00
• bf5201b11c run migrations before tests Marc Anguera Insa 2014-11-29 17:09:46 +01:00
• eb915ecde0 run Travis against Ruby 2.1 Marc Anguera Insa 2014-11-29 16:23:48 +01:00
• 01deb03e66 Merge pull request #98 from coopdevs/user_email_validation Daniel Macho 2014-12-03 16:46:37 +01:00
• 81619c2ec8 added spec/models/user_spec.rb Dani Macho 2014-12-03 02:42:41 +01:00
• f414460bf9 fake user email is created if blank email is provided. Fixed regex to make sure a valid email address is entered. User creation errors are properly showing in view Dani Macho 2014-12-03 02:22:20 +01:00
• eb789692aa improving language chooser, closes #92 Marc Anguera Insa 2014-12-03 01:39:55 +01:00
• dc41c02680 Added email validation format for user and related test. Relax format to allow dummy @example.com but at least having at signa and domain Dani Macho 2014-12-01 22:44:37 +01:00
• 7f3fe6059d Merge pull request #91 from coopdevs/localized_static_pages Saverio Trioni 2014-11-30 21:34:36 +01:00
• 7c2c4ce1ea Merge remote-tracking branch 'origin/master' into localized_static_pages Saverio Trioni 2014-11-30 21:33:30 +01:00
• fd6e66d0ba Merge branch 'delete_members' of https://github.com/markets/timeoverflow into delete_members_cascade Marc Anguera Insa 2014-11-30 15:08:19 +01:00
• f215c4d004 Merge pull request #95 from coopdevs/translators_fixes Daniel Macho 2014-11-30 11:05:25 +01:00
• d47f532af1 Merge pull request #94 from coopdevs/seeds_enhanced Daniel Macho 2014-11-30 11:04:51 +01:00
• 19ea441436 Merge pull request #93 from coopdevs/fix_users_tests Daniel Macho 2014-11-30 11:04:12 +01:00
• 183b752ca3 Corrections from catalan translators Dani Macho 2014-11-30 11:02:44 +01:00
• aa995beb6d added another company and normal users to seeds.db Dani Macho 2014-11-30 10:58:51 +01:00
• 71b04a479d fixed users_controller tests. Still pending corrections on global_controller Dani Macho 2014-11-30 10:55:41 +01:00
• d17c1c0328 No need for all thse hard-coded rediects Saverio Trioni 2014-11-30 05:09:51 +01:00
• edcd081f2b Provide correct integration from front-page and I18n. Saverio Trioni 2014-11-30 05:04:08 +01:00
• f45f9d7809 Merge pull request #89 from coopdevs/authorize_user_update Saverio Trioni 2014-11-30 04:26:10 +01:00
• 06b6357831 Make HoundCI happy. Saverio Trioni 2014-11-30 04:25:25 +01:00
• fa46e271d6 Pundit-based user authorization Saverio Trioni 2014-11-30 04:20:05 +01:00
• a432b27030 Merge pull request #88 from coopdevs/fix-haml-newline Saverio Trioni 2014-11-30 02:50:46 +01:00
• c4d95fdef7 Merge pull request #81 from coopdevs/translation_fixes Saverio Trioni 2014-11-30 02:50:21 +01:00
• 7574054bb2 HAML does not like newlines Saverio Trioni 2014-11-30 02:28:14 +01:00
• ed9f303099 Fix some locales Saverio Trioni 2014-11-30 02:26:52 +01:00
• cd3c57da95 Merge branch 'master' of github.com:coopdevs/timeoverflow Saverio Trioni 2014-11-30 02:08:25 +01:00
• 17201db2d7 Merge pull request #83 from markets/profile_links Saverio Trioni 2014-11-30 01:50:23 +01:00
• 28adaea5d5 Merge pull request #84 from coopdevs/tags_per_company Saverio Trioni 2014-11-30 01:49:02 +01:00
• b025aad499 Added TODO Saverio Trioni 2014-11-30 01:47:47 +01:00
• ebc122834c fixed error editing offers and inquiries. Tags shown per company Dani Macho 2014-11-29 16:09:20 +01:00
• 6067e897c2 alpha_grouped_index: clicking offer tags was redirecting to inquiries Saverio Trioni 2014-11-24 05:30:08 +01:00
• 988e9696bf user profile: add links to new inquiry/offer Marc Anguera Insa 2014-11-29 18:18:09 +01:00
• 21657d621a delete members on cascade Marc Anguera Insa 2014-11-29 16:35:32 +01:00
• 96dbdfb4bc Updated ruby version on cloud provider Saverio Trioni 2014-11-28 04:10:17 +01:00
• 91bf07c178 Ignore routing errors for known wordpress attacks Saverio Trioni 2014-11-28 04:06:10 +01:00
• 54a567593a Added safari icons - solves rollbar #23 and #48 Saverio Trioni 2014-11-28 03:52:40 +01:00
• e4671737d4 Merge pull request #82 from coopdevs/hotfix/stupid-me-NPE Saverio Trioni 2014-11-28 03:43:51 +01:00
• edd93ac428 Avoid very silly NPE Saverio Trioni 2014-11-28 03:42:28 +01:00
• e163b61f76 Merge pull request #80 from coopdevs/set_locale Daniel Macho 2014-11-28 03:26:12 +01:00
• 6df643e0be Merge pull request #79 from coopdevs/statistics_things Saverio Trioni 2014-11-28 03:10:12 +01:00
• 81eec1601c Set the locale from the context, plus some small fixes Saverio Trioni 2014-11-28 02:59:44 +01:00
• 838507b97a statistics things Patri 2014-11-20 18:58:22 +01:00