Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• e4118f20c9 Update README.md sseerrggii 2016-08-26 11:40:48 +02:00
• 5728946afc Update README.md sseerrggii 2016-08-26 11:40:13 +02:00
• 46623cac04 hound suggestions Sergi 2016-06-17 20:37:25 +02:00
• 77541a705f fix text wrap and responsive issues Sergi 2016-06-17 20:02:21 +02:00
• 16356b4a32 css for text wrap Sergi 2016-05-13 16:30:56 +02:00
• 0707631157 more-seed-data Sergi 2016-04-30 20:03:13 +02:00
• feb1c46853 Merge pull request #225 from coopdevs/feature/fixes-post-template-migration Saverio Trioni 2016-05-17 08:01:45 +02:00
• d576afd7e2 Templates: syntax error (missing do) Saverio Trioni 2016-05-17 08:01:01 +02:00
• d9781bfa2f Merge pull request #224 from coopdevs/feature/fixes-post-template-migration Saverio Trioni 2016-05-17 07:54:01 +02:00
• dbebf7554d Templates: systax errors in movements - wrong conversion to eRB Saverio Trioni 2016-05-17 07:52:53 +02:00
• 5f302452fd Merge pull request #223 from coopdevs/feature/fixes-post-template-migration Saverio Trioni 2016-05-17 07:47:34 +02:00
• d257ca3c1a Templates: syntax error (missing comma) Saverio Trioni 2016-05-17 07:46:52 +02:00
• e48f49f8b1 Merge pull request #222 from coopdevs/feature/fixes-post-template-migration Saverio Trioni 2016-05-17 07:40:39 +02:00
• 8ab2a7658a Hound: fix css style Saverio Trioni 2016-05-17 07:40:14 +02:00
• c7c3c77972 Heroku: please use ruby 2.3.0 Saverio Trioni 2016-05-17 07:37:02 +02:00
• 771b60f6fe Angular: avoid FOUC in user list Saverio Trioni 2016-05-17 07:36:37 +02:00
• 5e52b5aa12 Templates: use <%= raw array.to_json %> to output arrays in JS Saverio Trioni 2016-05-17 07:35:41 +02:00
• 2555867de6 Merge pull request #221 from coopdevs/feature/fix2-templates-i-should-test-locally-and-add-integration-tests Saverio Trioni 2016-05-16 13:46:02 +02:00
• b6ce411c66 Templates: syntax error Saverio Trioni 2016-05-16 13:45:18 +02:00
• 4aab38bdfb Merge pull request #220 from coopdevs/feature/fix2-templates-i-should-test-locally-and-add-integration-tests Saverio Trioni 2016-05-16 13:42:35 +02:00
• 96980af28c Templates: another template fix Saverio Trioni 2016-05-16 13:41:59 +02:00
• 5a16995bd0 Merge pull request #218 from coopdevs/feature/fix2-templates-i-should-test-locally-and-add-integration-tests Saverio Trioni 2016-05-16 13:29:58 +02:00
• 7b8e12ffa1 Templates: fix translations and partial paths Saverio Trioni 2016-05-16 13:29:28 +02:00
• 29e8427564 Merge pull request #217 from coopdevs/feature/fix-named-paths-in-menu Saverio Trioni 2016-05-16 13:09:48 +02:00
• ae3cfe6573 Templates: fix missing _path in url helpers in menu Saverio Trioni 2016-05-16 13:09:02 +02:00
• d5eada9877 Merge pull request #214 from coopdevs/feature/cleanup-templates-use-only-erb-part-1 Saverio Trioni 2016-05-16 12:58:18 +02:00
• 27ddb375d8 Merge pull request #216 from coopdevs/feature/fix-elasticsearch-not-ready-travis Saverio Trioni 2016-05-16 12:57:57 +02:00
• 20de5c5de2 Merge remote-tracking branch 'origin/develop' into feature/cleanup-templates-use-only-erb-part-1 Saverio Trioni 2016-05-16 06:13:55 +02:00
• 7f4a293bf7 Templates: Removed haml and slim gems Saverio Trioni 2016-05-16 05:49:02 +02:00
• 55b62cd0e3 Templates: Removed generated scaffold for simple_form Saverio Trioni 2016-05-16 05:48:42 +02:00
• b8ea829f7a Templates: Converted users views to eRB Saverio Trioni 2016-05-16 05:43:07 +02:00
• 3d3bb60237 Templates: Converted statistics to eRB Saverio Trioni 2016-05-16 05:08:00 +02:00
• 1538775eb7 Converted more views to eRB Saverio Trioni 2016-05-16 04:41:16 +02:00
• 1e60a625e1 Generated bootstrap3 erb views from kaminari (using generator) Saverio Trioni 2016-05-16 03:33:35 +02:00
• 95ca1967b9 Add small delay to travis test suite to ensure ES is ready Saverio Trioni 2016-05-16 02:47:47 +02:00
• f58fe9d2e6 Templates: fix Saverio Trioni 2016-05-14 20:40:29 +02:00
• 292c936fad Templates: converted posts templates to erb Saverio Trioni 2016-05-14 20:34:46 +02:00
• 4b625222b4 Templates: ✂️ Forgot to add blocks in link helpers Saverio Trioni 2016-05-14 19:48:42 +02:00
• e94f1974f9 Templates: Used link helpers and url helpers on menus Saverio Trioni 2016-05-14 19:38:08 +02:00
• 34fec819d1 Templates: added m helper Saverio Trioni 2016-05-14 19:37:44 +02:00
• df3abac17d Merge pull request #213 from coopdevs/feature/cleanup-deployment-stuff Saverio Trioni 2016-05-14 18:35:52 +02:00
• cfe3cd24f5 Templates: leftover angular syntax Saverio Trioni 2016-05-14 18:28:52 +02:00
• 200c58abc8 Deployment: remove shelly-dependencies gem Saverio Trioni 2016-05-14 18:26:15 +02:00
• 8a0a470397 Merge pull request #207 from coopdevs/fix-statitics-inactive-users Saverio Trioni 2016-05-14 02:11:43 +02:00
• c40ea3aa01 Templates: even more templates converted to eRB Saverio Trioni 2016-05-14 02:09:15 +02:00
• 0fecd89ede Templates: rewrite some templates in eRB Saverio Trioni 2016-05-14 01:36:08 +02:00
• 1d9f1cf1aa Deployment: update server config Saverio Trioni 2016-05-14 00:04:52 +02:00
• d5cdb45812 Deployment: remove shellycloud config Saverio Trioni 2016-05-14 00:02:39 +02:00
• 256bd2ead5 Merge pull request #210 from coopdevs/fix-markdown-show-user Saverio Trioni 2016-05-13 23:39:36 +02:00
• 74c3b3c87f Fix description show in user detail Sergi 2016-04-30 14:55:43 +02:00
• eea27f3808 Fix inactive user statistics Sergi 2016-04-30 13:06:14 +02:00
• e2c53f4ee3 Merge pull request #202 from coopdevs/post-with-markdown Saverio Trioni 2016-04-29 18:11:14 +02:00
• 3f62f47472 Merge pull request #203 from coopdevs/inquiries-list-with-date Saverio Trioni 2016-04-29 18:10:46 +02:00
• dcb6632d9e Merge pull request #205 from coopdevs/visual-improvements-of-movements-and-balance Saverio Trioni 2016-04-29 18:10:26 +02:00
• 7bbdd4d81f Add date at inquiries list Sergi 2016-04-24 20:39:49 +02:00
• dd602bde57 Add markdown at post description Sergi 2016-04-29 10:30:04 +02:00
• b1495d5bee green and red in hours positive or negative Sergi 2016-04-27 20:00:42 +02:00
• bf2e957e9c Merge pull request #206 from coopdevs/ruby-2-3-0 Saverio Trioni 2016-04-28 22:46:06 +02:00
• f9fe68b429 Same ruby version in rvm and travis Sergi 2016-04-28 20:07:39 +02:00
• fd7faaaab9 Merge pull request #200 from coopdevs/fix-organization-statement-list Saverio Trioni 2016-04-24 22:11:46 +02:00
• 2e8286c74a Merge pull request #201 from coopdevs/fix-post-description-style Saverio Trioni 2016-04-24 21:57:01 +02:00
• aa20054788 Move _movements.html.haml to app/views/shared Sergi 2016-04-23 08:11:35 +02:00
• da3e0a1225 Fix new line styles for post description Sergi 2016-04-22 16:09:26 +02:00
• 883500b4ab Adding Organization movements view same functionality like users movements view Sergi 2016-04-20 16:30:31 +02:00
• e48734e01d Merge pull request #199 from coopdevs/remove_col_users_for_noadmin Saverio Trioni 2016-04-18 12:38:48 +02:00
• 22fc70bfc4 Hide admin column actions for normal users Sergi 2016-04-15 17:15:50 +02:00
• 783a208bcb Merge pull request #198 from coopdevs/fix/haml-lint-gate Saverio Trioni 2016-04-15 20:13:58 +02:00
• e06cbb6d42 Remove unused haml-lint gem enricostano 2016-04-15 18:30:30 +02:00
• 44819d6ab9 Merge pull request #197 from coopdevs/feature/fix-security-alerts-from-gemnasium Saverio Trioni 2016-03-24 13:23:58 +01:00
• 94a545fdea Merge pull request #196 from coopdevs/feature/add-dependency-alert-to-readme Saverio Trioni 2016-03-24 12:55:48 +01:00
• d03ccbd598 Update rollbar (incompatibility with rake 11) and fix web-console version Saverio Trioni 2016-03-24 12:55:08 +01:00
• a3d8fc49f8 Updated gems with security alerts (rails, nokogiri, jquery) Saverio Trioni 2016-03-24 12:37:12 +01:00
• bfa8dca520 Merge pull request #194 from coopdevs/fix/database-yml Saverio Trioni 2016-03-24 12:24:01 +01:00
• 6e6c7f6345 Add dependency status badge Saverio Trioni 2016-03-24 12:02:16 +01:00
• ec4cce279d Link to the wiki Saverio Trioni 2016-03-24 11:47:12 +01:00
• c91fb66504 Use --skip-worktree to have local versions of files Saverio Trioni 2016-03-24 10:50:41 +01:00
• b4233a227e Add comment on how to keep local changes on tracked files Saverio Trioni 2016-03-24 10:41:09 +01:00
• f965a8c455 Merge pull request #193 from coopdevs/fix/session-security Enrico Stano 2016-03-24 10:26:01 +01:00
• 1722d635b0 Much simpler database config Saverio Trioni 2016-03-24 10:11:50 +01:00
• 8878a81774 Rails complains when the database.url key is not an url Saverio Trioni 2016-03-24 09:20:43 +01:00
• edd63c4e3e Merge pull request #191 from d2bit/travisci-speed-up Saverio Trioni 2016-03-24 09:11:12 +01:00
• 09694efa67 bundle just test env & use rake db:setup David BF 2016-03-22 18:15:44 +01:00
• c9250a4fbd Add session cookie expiration enricostano 2016-03-23 23:48:04 +01:00
• 6f12e3aecc Move secret token validation to secrets.yml enricostano 2016-03-23 23:47:10 +01:00
• ea2497ee61 Upgrade Devise gem enricostano 2016-03-23 23:46:08 +01:00
• e942ae898b Merge pull request #192 from coopdevs/feature/generic-database-yml Enrico Stano 2016-03-23 00:32:59 +01:00
• c876c23b0f Remove unused example DB config enricostano 2016-03-22 19:00:54 +01:00
• 09cd9bee2d Add production configuration to database.yml enricostano 2016-03-22 18:59:49 +01:00
• 747b165d4b Added reasonable defaults for database.yml Saverio Trioni 2016-03-22 18:05:06 +01:00
• e57a5e759f Merge pull request #189 from coopdevs/feature/fix-specs-for-offer-search Saverio Trioni 2016-03-18 18:06:58 +01:00
• fd8e48f3e6 🐕 Saverio Trioni 2016-03-18 18:02:11 +01:00
• 143a6e45dd More explicit test for results of search Saverio Trioni 2016-03-18 18:00:49 +01:00
• 255bf5d845 Fix spec for offers controller search Saverio Trioni 2016-03-18 17:16:11 +01:00
• ff63db03fa Paginate search results Saverio Trioni 2016-03-17 22:47:55 +01:00
• bc5f05f6dc An empty database.ym is maybe needed by some library Saverio Trioni 2016-03-03 01:27:36 +01:00
• b8fc45aad8 Unicorn Saverio Trioni 2016-03-03 00:58:55 +01:00
• bc4c91e0f4 Simplify capi config Saverio Trioni 2016-03-03 00:55:39 +01:00
• 31f2fb7db3 Moved database.yml. It's better to use just a DATABASE_URL environment variable Saverio Trioni 2016-03-03 00:25:27 +01:00
• 85f461b000 Merge pull request #185 from coopdevs/error_password_confirmation Saverio Trioni 2016-02-14 13:27:21 +01:00
• 3f76d298f9 error message when the password and confirmation password do not match Patri 2016-01-23 17:16:09 +01:00