Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• 7538a91705 Show any post to any user Saverio Trioni 2015-03-13 10:01:02 +01:00
• 37dbf63bdd Add parentheses for rubocop. Saverio Trioni 2015-03-09 22:45:56 +01:00
• 83be9acc16 Allow organization to have a nil web Saverio Trioni 2015-03-09 22:35:52 +01:00
• 972f5e90aa Merge pull request #145 from coopdevs/fix/no-filter-by-organization-in-posts Saverio Trioni 2015-03-09 22:30:02 +01:00
• 729a0b1d52 My English is not so good... Saverio Trioni 2015-03-09 22:19:13 +01:00
• 5f2f8e22bc merge to master Jordi Pujol i Larena 2015-03-09 22:10:24 +01:00
• 707ee5273c Make houndCI happy Saverio Trioni 2015-03-09 18:51:08 +01:00
• 428eb47221 Force filter by current organization Saverio Trioni 2015-03-09 18:48:21 +01:00
• c95b9d6058 Merge pull request #143 from carlesjove/member_tests Saverio Trioni 2015-03-09 11:18:41 +01:00
• fdb35405db added missing tests for Member Carles Jove i Buxeda 2015-03-09 11:09:16 +01:00
• 337ce8d27a Merge pull request #144 from carlesjove/mantain_schema Saverio Trioni 2015-03-09 11:00:05 +01:00
• e67d256ad9 mantain test schema Carles Jove i Buxeda 2015-03-09 10:58:31 +01:00
• 8dc2de54c5 update dependency has_scope Saverio Trioni 2015-03-05 12:09:07 +01:00
• b1e6f70a20 removed ruby 2.1 from travis Saverio Trioni 2015-03-05 11:20:42 +01:00
• d14a5b44da Merge pull request #118 from coopdevs/rails42 Saverio Trioni 2015-03-05 10:50:55 +01:00
• bef654cef4 Merge remote-tracking branch 'origin/master' into rails42 Saverio Trioni 2015-03-05 10:50:22 +01:00
• a7f692d4c1 Merge pull request #139 from carlesjove/add_shoulda Saverio Trioni 2015-03-05 00:41:21 +01:00
• 34e87cc83a add shoulda gem for tests Carles Jove i Buxeda 2015-03-04 23:11:14 +01:00
• fae1c67a57 mejorando test Jordi Pujol i Larena 2015-03-02 09:45:22 +01:00
• f064b964ac simplificación de código - rubocop Jordi Pujol i Larena 2015-02-27 12:01:02 +01:00
• 6e37e12253 simplificación de código Jordi Pujol i Larena 2015-02-27 09:30:32 +01:00
• 96cb2487e2 EM 1.0.4 was not good for heroku Saverio Trioni 2015-02-27 08:48:11 +01:00
• a616d74a21 update ruby Saverio Trioni 2015-02-27 08:41:58 +01:00
• fa3266a67b Merge branch 'master' into rails42 Saverio Trioni 2015-02-27 08:40:21 +01:00
• 44ea5b3040 Merge pull request #138 from coopdevs/remove_inherited_resources Saverio Trioni 2015-02-27 02:02:05 +01:00
• d98af5adfc Merge pull request #131 from Marsupio/mailers Saverio Trioni 2015-02-27 02:01:40 +01:00
• 216ff39bc3 small fixes Patri 2015-02-25 22:22:52 +01:00
• 4e08705506 small fix Patri 2015-02-25 21:14:03 +01:00
• 475b935e68 Merge branch 'master' into rails42 Marc Anguera Insa 2015-02-25 21:03:04 +01:00
• 4d9fa43f27 Merge pull request #137 from Marsupio/notify_transl Patri 2015-02-22 17:47:49 +01:00
• 01ddb2d585 merge branch master into notify_transl Patri 2015-02-20 23:28:24 +01:00
• ee4aa09a6a Merge pull request #136 from Marsupio/user_form_modify Patri 2015-02-20 23:18:21 +01:00
• 7d2c0992de rubocop Patri 2015-02-20 23:12:29 +01:00
• 1b927553a4 ✂️ Patri 2015-02-20 22:52:34 +01:00
• 908f0e2b35 gave it up... Marsupio 2015-02-20 22:07:28 +01:00
• 15df52fabf align parameters Marsupio 2015-02-20 21:27:12 +01:00
• 6747497088 delete 2 spaces Marsupio 2015-02-20 21:22:31 +01:00
• 9b272bd42e split too long lines Marsupio 2015-02-20 21:15:04 +01:00
• fe9fd049e7 pass test Patri 2015-02-20 18:19:06 +01:00
• 4b0ac615e4 members id and name added Marsupio 2015-02-20 18:18:42 +01:00
• 7b106bedc8 Merge branch 'remove_inherited_resources' of https://github.com/dormi/timeoverflow into remove_inherited_resources Patri 2015-02-20 17:06:29 +01:00
• 4339423712 rubocop Patri 2015-02-17 00:26:14 +01:00
• 37bbf93f03 Set up one server to use whenever in the Cloudfile Patri 2015-02-17 00:06:55 +01:00
• d751044a9e add translations TODO: Catalan Patri 2015-02-17 00:04:30 +01:00
• 59760316cf send mail every monday at 9am Patri 2015-02-17 00:02:36 +01:00
• 10ff8a78e9 active members Patri 2015-02-16 23:54:08 +01:00
• c17421cca7 fix labels create-modify Marsupio 2015-02-13 22:17:37 +01:00
• beee19e906 Merge pull request #135 from Marsupio/user_form_modify Saverio Trioni 2015-02-10 11:35:42 +01:00
• dbeb165cea Add another user button deleted from users modify form Marsupio 2015-02-10 11:31:13 +01:00
• 0908570182 Add another user button deleted from users modify form Marsupio 2015-02-10 11:26:40 +01:00
• 8de264da08 app/models/post.rb Patri 2015-02-10 01:21:12 +01:00
• e740dc0289 add scopes Patri 2015-02-09 23:35:35 +01:00
• db69a10e6b Merge pull request #134 from coopdevs/global_stats_num_users Patri 2015-02-09 23:16:05 +01:00
• 61fab5d374 Merge pull request #133 from coopdevs/required_field_category Patri 2015-02-09 23:14:30 +01:00
• 12bb807dc3 total number of users without disabled Patri 2015-02-09 23:13:40 +01:00
• 19e567a983 Update README.md sseerrggii 2015-02-09 19:27:46 +01:00
• d93525642e tests and rubocop ok Patri 2015-02-09 19:03:03 +01:00
• 6172230c07 rubocop Patri 2015-02-07 23:58:06 +01:00
• e32d385870 tests Patri 2015-02-07 23:36:23 +01:00
• 5eaf3dd0c4 Merge pull request #132 from coopdevs/bug_stats_inactive_users Patri 2015-02-07 23:20:29 +01:00
• ff21aea646 add style for fields that contain an error Patri 2015-02-07 01:57:34 +01:00
• 74f991d6d0 add translations Patri 2015-02-07 01:56:22 +01:00
• 0311e044dc required field in post Patri 2015-02-07 01:55:06 +01:00
• f4b45c64af filter active members Patri 2015-02-07 00:49:53 +01:00
• cc16e99290 used bcc recipients Patri 2015-02-03 11:33:51 +01:00
• 4da71e85a1 send mails with posts created at 1 week ago to users with ok emails Patri 2015-02-02 20:55:46 +01:00
• 085a490387 fix schedule.rb Marsupio 2015-02-01 20:43:07 +01:00
• 596ec73d69 Actualización Gemfile con whenever Marsupio 2015-01-29 23:27:09 +01:00
• b0c97cac03 Creación de ficheros base para el envio semanal del boletin Marsupio 2015-01-29 20:29:16 +01:00
• 023ca9ba9d Merge pull request #130 from coopdevs/fix_select_give_time Patri 2015-01-29 18:08:20 +01:00
• ff3be96216 delete id of organization and sort by member_uid insted of member.id Patri 2015-01-29 13:28:02 +01:00
• 36c3b3feb4 Merge pull request #129 from coopdevs/fix_select_category Patri 2015-01-28 21:54:45 +01:00
• 89ccc6aad3 Merge pull request #128 from coopdevs/fix_demographic_stats Patri 2015-01-28 21:52:22 +01:00
• 2e52b70035 double quotes instead of '' Patri 2015-01-28 21:46:44 +01:00
• 4734bb98b1 rubocop Patri 2015-01-27 19:10:34 +01:00
• 9326e1509d small fix in showing age label of demographic stats Patri 2015-01-27 19:07:58 +01:00
• e80362af69 Merge pull request #127 from coopdevs/fix_stats Saverio Trioni 2015-01-27 17:23:33 +01:00
• 658160c6c2 small fixes in statistics type of swap Patri 2015-01-27 17:18:10 +01:00
• 14e137dc44 corrección ingles Jordi Pujol i Larena 2015-01-22 12:35:28 +01:00
• c639094562 mensajes de error traducidos Jordi Pujol i Larena 2015-01-22 12:01:18 +01:00
• b343d405f2 añadido message Jordi Pujol i Larena 2015-01-21 08:30:30 +01:00
• fa1cfe4e6e prenultima revisión Jordi Pujol i Larena 2015-01-20 23:12:51 +01:00
• f0d7a5b32c simplificando codigo Jordi Pujol i Larena 2015-01-20 09:09:06 +01:00
• 7f770335ee Merge branch 'master' into rails42 Marc Anguera Insa 2015-01-18 14:59:39 +01:00
• 254033224d Merge pull request #117 from coopdevs/rubocop Saverio Trioni 2015-01-18 03:11:41 +01:00
• d3da125f5f Initialization line for rbenv. Saverio Trioni 2015-01-18 02:34:04 +01:00
• 7bada1a0b2 Added code editors to contributing guide Saverio Trioni 2015-01-18 01:50:08 +01:00
• faf2034e2e Create CONTRIBUTING.md Saverio Trioni 2015-01-18 01:41:34 +01:00
• 5cae90d3b5 Merge pull request #121 from Marsupio/submit_button_new_user Saverio Trioni 2015-01-18 00:33:16 +01:00
• ea93bc87c9 trailin whitespace removed Marsupio 2015-01-18 00:08:21 +01:00
• 6cc92295ae rubocop pasado Jordi Pujol i Larena 2015-01-17 23:02:08 +01:00
• 92306b41e1 organizations funcion control url, vistas y tests Jordi Pujol i Larena 2015-01-17 22:42:41 +01:00
• a51abf9c74 move i18n settings to config/application.rb (default place in new apps); activate I18n fallbacks for all environments: restores previous behaviour Marc Anguera Insa 2015-01-17 16:34:04 +01:00
• 07c7b2cfdb organization :: ensure_url + tests Jordi Pujol i Larena 2015-01-17 13:32:52 +01:00
• 27477cccbf botón formulario añadido Marsupio 2015-01-16 20:52:41 +01:00
• ccf7e0656a botón formulario añadido Marsupio 2015-01-16 18:27:16 +01:00
• d5329bdf7a organization a medias Jordi Pujol i Larena 2015-01-13 12:19:02 +01:00
• 984392c966 Code style : ✂️ (forgot question mark on methods) Saverio Trioni 2015-01-12 01:24:42 +01:00
• b9b98012d3 Code style: rubocop happy onp policies Saverio Trioni 2015-01-12 01:21:13 +01:00
• 96ac4ae993 Code style: rubocop happy on models Saverio Trioni 2015-01-12 01:19:23 +01:00