Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• 225c9094fa added gem and some needed updates because of version locks Saverio Trioni 2014-11-28 02:10:20 +01:00
• 4e841e7179 Merge pull request #76 from coopdevs/user_not_logged Saverio Trioni 2014-11-28 01:30:14 +01:00
• f5ed375512 Merge pull request #77 from coopdevs/csv_things Saverio Trioni 2014-11-28 01:16:13 +01:00
• f53ca8fb52 not send emails when we create users from csv Patri 2014-11-19 00:10:52 +01:00
• 7b29ed36b7 removed offers and inquiries link when not logged Saverio Trioni 2014-11-24 05:42:05 +01:00
• 3936093034 small fix in users list, order by member_id instead of user_id Patri 2014-11-24 13:48:14 +01:00
• e0e756ddf6 Merge pull request #73 from coopdevs/remove-registration-link Saverio Trioni 2014-11-24 04:40:55 +01:00
• ccd3f54281 Update _links.erb Aldo Rincón Mora 2014-11-21 20:34:41 -05:00
• 54760ac019 Merge pull request #72 from coopdevs/nouser_if_nologin-take-2 Saverio Trioni 2014-11-24 04:36:06 +01:00
• 6bf8276025 respect hound happiness or it will bark at us Saverio Trioni 2014-11-24 04:31:47 +01:00
• a8ed8670eb added hound rubocop config by default Saverio Trioni 2014-11-24 04:31:23 +01:00
• 66a986a2d7 Make rubocop and hound happy. Saverio Trioni 2014-11-24 04:28:22 +01:00
• 68b8160d69 remove user from shared post action show in case no user logged in. Added menus to access offers and inquiries even if not logged in Dani Macho 2014-11-19 09:31:44 +01:00
• d9970590c9 Merge pull request #71 from coopdevs/houndci Saverio Trioni 2014-11-24 04:07:46 +01:00
• a5e7ee2e68 moved linters config to the root so they are used not only by hound Saverio Trioni 2014-11-24 02:49:05 +01:00
• 1c5071a1ad Prefer double quoted strings when possible Saverio Trioni 2014-11-24 02:47:57 +01:00
• be6d4a97e1 ended up rewriting completely the taggable file, so rubocop is happy Saverio Trioni 2014-11-24 02:23:12 +01:00
• d00aac1806 fixed single style issue Saverio Trioni 2014-11-24 02:11:11 +01:00
• 4601124999 test commit to check if HoundCI is actually working Saverio Trioni 2014-11-24 01:44:41 +01:00
• 013692ec58 added HoundCI configuration Saverio Trioni 2014-11-24 01:34:23 +01:00
• 1424279121 add translations Patri 2014-11-20 11:09:18 +01:00
• d076092947 Merge branch 'master' into statistics_menu_for_admin Patri 2014-11-18 18:42:29 +01:00
• 077d22d148 Merge pull request #57 from coopdevs/sort_by_category Patri 2014-11-18 18:41:08 +01:00
• 475d5c7392 category selected ordered by name in create offers/inquiries Patri 2014-11-18 18:40:30 +01:00
• a678dccbbe Merge branch 'master' into sort_by_category Patri 2014-11-18 18:22:09 +01:00
• 58d47956c7 add translations Patri 2014-11-18 17:58:43 +01:00
• b3e21b1548 small fixes after merge Patri 2014-11-18 17:33:38 +01:00
• 161e230ba0 merge branc 'master' into statistics Patri 2014-11-18 17:11:22 +01:00
• 7be12276fd Merge pull request #62 from coopdevs/users_csv Patri 2014-11-18 15:52:02 +01:00
• ac9d1c7511 small fixes in csv and catch errors from members Patri 2014-11-18 15:39:41 +01:00
• bd94707e14 use ensure_reg_number_seq Patri 2014-11-18 10:37:09 +01:00
• 19f1ba39cb add translations Patri 2014-11-17 23:38:13 +01:00
• 0c77f7fb47 small fix Patri 2014-11-17 23:37:56 +01:00
• 3d12bc1327 show errors Patri 2014-11-17 22:53:14 +01:00
• 85f92be977 update reg_number_seq Patri 2014-11-17 21:40:55 +01:00
• a903ce3483 import users form csv Patri 2014-11-17 20:40:45 +01:00
• cfcdf6de4b Merge pull request #61 from coopdevs/languages_cont Daniel Macho 2014-11-17 10:25:49 +01:00
• 9ea32a5803 Added tests for users, some still failing Dani Macho 2014-11-16 17:35:03 +01:00
• eeac23d969 Added tests for offers Dani Macho 2014-11-16 16:49:51 +01:00
• 23e27c6c02 All tests are successful again Dani Macho 2014-11-16 16:39:13 +01:00
• 69317fc642 Added rspec tests using capybara Dani Macho 2014-11-16 15:13:16 +01:00
• 31efb0a072 fixed issue setting up right language Dani Macho 2014-11-16 12:44:10 +01:00
• 30700adced fixed comments on tests Dani Macho 2014-11-16 12:08:08 +01:00
• e2b4a4588c Created rspec tests for global controller and fixed two defects Dani Macho 2014-11-16 12:03:41 +01:00
• 9377c4647f red background inactive users. Add a user redirects to user list Dani Macho 2014-11-14 19:24:12 +01:00
• 380d3d5910 devise working in english and translations for home cat and engl Dani Macho 2014-11-14 18:54:36 +01:00
• 4887c437dc Let user choose language Dani Macho 2014-11-14 09:48:51 +01:00
• c42b4f3f0d added language selection in home. Created base static page per language Dani Macho 2014-11-13 22:43:41 +01:00
• 0a6f4cc382 fixes in devise.ca.yml Dani Macho 2014-11-13 21:29:57 +01:00
• c133b8fa74 correcciones de algunos textos en catalan y traduccion de en.yml Dani Macho 2014-11-13 09:18:59 +01:00
• db9374a8b9 Merge branch 'master' of https://github.com/coopdevs/timeoverflow Dani Macho 2014-11-12 21:23:06 +01:00
• 853061e775 Merge pull request #60 from coopdevs/defect_and_literals_to_locale Daniel Macho 2014-11-12 21:20:32 +01:00
• 69ef623109 small fix ca.yml Patri 2014-11-12 19:25:20 +01:00
• 52d05ebf32 merge branch 'master' into defect_and_literals_to_locale Patri 2014-11-12 19:00:01 +01:00
• 19dedb6c23 Update devise.ca.yml sseerrggii 2014-11-12 15:21:02 +01:00
• 9060d8b4d5 Create devise.ca.yml sseerrggii 2014-11-12 08:37:18 +01:00
• 96c6627ffa replace hardcoded literals with locale link Dani Macho 2014-11-11 23:24:41 +01:00
• 6321de43b7 fixed defect: button create offers under create inquiry Dani Macho 2014-11-11 20:59:46 +01:00
• 22da658839 Update ca.yml sseerrggii 2014-11-12 08:23:12 +01:00
• 79c367044f Create unlock_instructions.cat.html.erb sseerrggii 2014-11-12 07:50:43 +01:00
• 351fc910dd Update reset_password_instructions.es.html.erb sseerrggii 2014-11-12 07:47:48 +01:00
• ef73fc8a1c Create reset_password_instructions.cat.html.erb sseerrggii 2014-11-12 07:47:26 +01:00
• adfbe1208a Update confirmation_instructions.cat.html.erb sseerrggii 2014-11-12 07:43:02 +01:00
• 172a01b42c Create confirmation_instructions.cat.html.erb sseerrggii 2014-11-12 07:38:50 +01:00
• 90e5aef357 replace hardcoded literals with locale link Dani Macho 2014-11-11 23:24:41 +01:00
• 5ba49beace fixed defect: button create offers under create inquiry Dani Macho 2014-11-11 20:59:46 +01:00
• 9b6c129fd3 Merge pull request #59 from coopdevs/pending_translations Daniel Macho 2014-11-08 13:24:59 +01:00
• 5c04bb4568 resolving conflicts Xavi Vila 2014-11-08 10:09:28 +01:00
• 498b36900d Changed README.md to link to starter's guide Dani Macho 2014-11-07 00:18:31 +01:00
• dd861b312f Translated pending devise messages. Added helper function to show flash messages Dani Macho 2014-11-07 00:06:01 +01:00
• 0f61f748f7 Refactored how to get index_path using helper method. Categories now have link. Badge background to success in post details so tag link can be seen properly Dani Macho 2014-11-06 22:44:56 +01:00
• d98509859f Merge pull request #56 from danielmacho72/admin-tag-mgmt2 Daniel Macho 2014-11-06 21:55:36 +01:00
• 47cb692611 try to remove inherited resources Xavi Vila 2014-11-06 20:49:13 +01:00
• e269e4d2ac user list default sort by member_id Patri 2014-11-06 15:04:19 +01:00
• 4b4245a95f added tag link in post details too Dani Macho 2014-11-06 08:55:40 +01:00
• 46f9125ad7 Sorting tags in desc order. Link in list of tags goes to filtered view of posts. Search works for tags as well. Links added in tags to filter by tag Dani Macho 2014-11-06 01:17:58 +01:00
• cd0fc741a5 fixed layout issue with terms of service and use list for right tag panel Dani Macho 2014-11-03 22:33:05 +01:00
• 5630c38c2f AJAX to show list of offers and inquiries per tag Dani Macho 2014-11-02 22:58:12 +01:00
• fe632c4f6b Adding panel next with results Dani Macho 2014-11-02 14:24:46 +01:00
• 87983c0e1b Apply default filter of offers for Admin-tags menu Dani Macho 2014-11-02 12:59:43 +01:00
• b1b0dcb2df Added permitted params under tags controller Dani Macho 2014-11-02 12:52:29 +01:00
• 51084600dc Ajax behaviour to select offers vs inquiries in alpha list of tags Dani Macho 2014-11-02 12:26:16 +01:00
• 17ceeacb1a merging Dani Macho 2014-11-02 09:28:15 +01:00
• f23f071ac8 WIP to provoke ajax call from radio buttons Dani Macho 2014-10-29 21:42:38 +01:00
• 509286d38c Commited conflicts Dani Macho 2014-10-26 12:38:12 +01:00
• 45f71ed0b2 Added checkboxes to filter offers vs inquiries Dani Macho 2014-10-26 12:31:47 +01:00
• 92bfc8c2c6 layout changes, centering titles Dani Macho 2014-10-25 00:58:15 +02:00
• ce773e50de Added grouped view for tags and same used from admin menu Dani Macho 2014-10-25 00:48:09 +02:00
• fd7e5495b5 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
• 50269be07b Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:04:18 +02:00
• 65a7accd51 Added new controller and view to show tags grouped alphabetically Dani Macho 2014-10-19 14:01:52 +02:00
• ea906aab23 Added helper method to group tags alphabetically. Added a hardcoded literal to locale file Dani Macho 2014-10-19 13:47:10 +02:00
• 303a15f0d2 Added new navbar menu to admin tags Dani Macho 2014-10-19 12:25:39 +02:00
• 98b40e2ca3 Added unlicense to readme. Saverio Trioni 2014-11-01 06:29:18 +01:00
• e6ad041414 Create UNLICENSE Saverio Trioni 2014-11-01 06:28:03 +01:00
• 2375213f4a small fix in users list, order by member id instead of user id Patri 2014-10-31 23:16:50 +01:00
• fb11eb3b59 Link to GH-pages and remove nor about RUBYOPT=-Ku Saverio Trioni 2014-10-30 21:11:25 +01:00
• 586c374854 category select ordered by name Patri 2014-10-29 23:28:03 +01:00
• 67d672bc94 sort the list of offers by category Patri 2014-10-29 23:26:50 +01:00
• 970e077f68 add translations and ability to export graphs Patri 2014-10-29 22:49:52 +01:00