Commit Graph

Select branches

Hide Pull Requests

develop

master

Mono Color

• 43e8105782 Add staging environment Enrico Stano 2018-01-30 19:32:57 +01:00
• 7f4371f643 Add rbenv support for Capistrano Enrico Stano 2018-01-30 19:32:08 +01:00
• 6660a79c26 Merge pull request #310 from coopdevs/fix/users-list-sorting Pau Pérez Fabregat 2018-01-30 17:28:15 +01:00
• 2d3bb1c096 Fix users list sorting Pau Perez 2018-01-30 15:03:11 +01:00
• 3708648168 Merge pull request #308 from coopdevs/fix/sort-users-by-member-uid Pau Pérez Fabregat 2018-01-30 14:13:12 +01:00
• dcdcac99c2 Merge pull request #305 from coopdevs/fix/time-balance Pau Pérez Fabregat 2018-01-30 14:13:00 +01:00
• 7cc5b58a89 Fix sort users by their member_uid Pau Perez 2018-01-30 14:06:44 +01:00
• 2bb9d432ac Fix time balance in users list Pau Perez 2018-01-30 13:27:46 +01:00
• a9f6661e4c Merge pull request #304 from coopdevs/fix/membership-in-users-list Pau Pérez Fabregat 2018-01-30 13:08:06 +01:00
• 83c575df08 Show data for membership in current organization Pau Perez 2018-01-30 12:57:38 +01:00
• 1db64429ea Merge pull request #303 from coopdevs/develop Pau Pérez Fabregat 2018-01-30 11:11:13 +01:00
• 774f9db3ef Merge pull request #302 from coopdevs/fix-translation Pau Pérez Fabregat 2018-01-29 14:55:54 +01:00
• d4d0a5c7a7 Fix translations not being picked up Pau Perez 2018-01-29 13:53:44 +01:00
• e4cda8b955 little application_helper cleanup: remove deprecated helper (ref. https://github.com/coopdevs/timeoverflow/commit/7a564c095f2f032b85a1ef41c610ed4fc09b498c) Marc Anguera Insa 2018-01-26 20:55:07 +01:00
• e4392b66ef ✂️ deprecated images Marc Anguera Insa 2018-01-26 20:52:36 +01:00
• faf646ec34 we do not need Bundler as a runtime dep, we added this in 13be10e when they added the BUNDLED WITH thing Marc Anguera Insa 2018-01-26 20:41:51 +01:00
• 919261086f Remove Thin app server dep. If I'm not wrong, this was a runtime dep because of our old infra (shelly cloud). We are now running pro with Unicorn and WEBrick should be enough for dev (https://schneems.com/2017/08/01/is-webrick-webscale/). Thin is nice, but it depends on eventmachine and this a big dep we can avoid. I also update the Procfile to run Unicorn on Heroku (https://devcenter.heroku.com/articles/rails-unicorn#procfile). Marc Anguera Insa 2018-01-26 20:30:52 +01:00
• 8eca2cea55 update sass-rails to 5.0.7 (closes #297) Marc Anguera Insa 2018-01-26 20:12:26 +01:00
• 05022525b4 quiet_assets is not necessary with sprockets-rails > 3.1 Marc Anguera Insa 2018-01-26 20:09:21 +01:00
• 75bd2b950f update to latest RSpec 3.7.2; rake is already part of railties Marc Anguera Insa 2018-01-26 20:04:54 +01:00
• 6772df1666 update to nokogiri 1.8.1 (fixes security warnings) Marc Anguera Insa 2018-01-26 20:01:33 +01:00
• a8d8acf53b Updating dependencies (cherry picked from commit f41ec64fabb32e3d65969b05e26fe0502d45635c) Victor Martinez 2017-10-18 18:41:00 +02:00
• 38555d7da9 Merge pull request #294 from coopdevs/cleanup-gemfile Pau Pérez Fabregat 2018-01-26 16:52:33 +01:00
• 78b5a8bac5 Merge pull request #283 from coopdevs/upgrade-to-rails4.2.7.1 Pau Pérez Fabregat 2018-01-26 16:52:08 +01:00
• 79e963a0d8 Merge pull request #272 from knoopx/refactor-users-index Pau Pérez Fabregat 2018-01-26 16:51:36 +01:00
• ca5e813e29 Merge pull request #264 from coopdevs/move-give-time-action-to-transfers-controller Pau Pérez Fabregat 2018-01-26 16:51:09 +01:00
• 277f83baad Merge pull request #241 from coopdevs/fix/tags-order Pau Pérez Fabregat 2018-01-26 16:50:26 +01:00
• c7a2d31250 Don't show useless horizontal scrollbar in destkop Pau Perez 2018-01-26 16:27:48 +01:00
• ed7f8c9327 Add spec for case insensitive tag group Pau Perez 2018-01-25 17:47:24 +01:00
• e0ab6cdbed Post tags list ordered case insensitive sseerrggii 2016-11-04 14:18:35 +01:00
• eb80106092 Merge branch 'develop' into refactor-users-index Pau Pérez Fabregat 2018-01-25 16:47:28 +01:00
• 48cd94705e Enable sorting by balance in users list Pau Perez 2018-01-22 18:15:58 +01:00
• 0a6169d344 Remove commented out gem Pau Perez 2018-01-25 09:55:08 +01:00
• 12b06dc676 Move dotenv-rails to dev and test group Pau Perez 2018-01-25 09:47:57 +01:00
• 49f6955d32 Remove deprecated an unused gem Pau Perez 2018-01-25 09:28:49 +01:00
• 3f35d190b3 We don't need a pretty printer as dependency Pau Perez 2018-01-25 09:25:13 +01:00
• 7079e90c02 Move rails_12factor gem to prod group as in docs Pau Perez 2018-01-25 09:22:56 +01:00
• 70efd91323 Fix some rubocop violations Pau Perez 2018-01-22 18:20:06 +01:00
• 545ea44b7e Remove intermediate vars Pau Perez 2018-01-22 14:32:46 +01:00
• e40a0ff75f Replace give_time link from organizations#show Pau Perez 2018-01-22 15:29:12 +01:00
• 47812a90f0 Replace give_time link from users#show page Pau Perez 2018-01-18 17:03:59 +01:00
• b71dfb7dfa Add specs to TransferFactory Pau Perez 2018-01-05 17:55:18 +01:00
• c80c92d0ca Merge pull request #291 from coopdevs/improve-update-balance Pau Pérez Fabregat 2018-01-18 10:08:40 +01:00
• 36a1063310 Refactor and doc Account#update_balance Pau Perez 2018-01-18 09:51:08 +01:00
• b495ef0614 Add specs for Account#update_balance Pau Perez 2018-01-18 09:44:48 +01:00
• fe87533032 Merge pull request #290 from coopdevs/remove-dead-helper Pau Pérez Fabregat 2018-01-18 08:42:01 +01:00
• 7a564c095f Remove dead #languages_list helper Pau Perez 2018-01-16 10:02:36 +01:00
• 74bde75340 Merge pull request #288 from coopdevs/remove-activeadmin-warning Pau Pérez Fabregat 2018-01-15 14:57:55 +01:00
• 6b456fdd84 Fix activeadmin's deprecation warning Pau Perez 2018-01-15 09:19:46 +01:00
• 2602668511 Merge pull request #287 from coopdevs/remove-old-todos Pau Pérez Fabregat 2018-01-12 12:05:58 +01:00
• 3b7a06c8cf Remove old TODOs Pau Perez 2018-01-12 08:39:33 +01:00
• 91b7d39686 Merge pull request #282 from Matt-Yorkley/signup_flash Pau Pérez Fabregat 2018-01-11 14:03:49 +01:00
• 29fe8dc683 Merge pull request #246 from coopdevs/fix/select-user-width Pau Pérez Fabregat 2018-01-11 13:38:10 +01:00
• 7ee0c9b6a4 Merge pull request #286 from coopdevs/improve-readme Pau Pérez Fabregat 2018-01-11 13:18:31 +01:00
• 2d5c52c2a7 Merge pull request #285 from coopdevs/translate-contributing Pau Pérez Fabregat 2018-01-11 13:15:20 +01:00
• cf6055ba78 Cleanup top-level README section Pau Perez 2018-01-11 13:09:27 +01:00
• f0bd2bac3f Add a couple of screenshots to README Pau Perez 2018-01-11 13:04:11 +01:00
• b7b40257a5 Create EN version of CONTRIBUTING Pau Perez 2018-01-11 12:50:00 +01:00
• d8ecb08664 Translate translations contribution to ES Pau Perez 2018-01-11 12:44:09 +01:00
• 1e1a66cb3b Upgrade rspec-rails from 3.4.0 to 3.5.2 Pau Perez 2018-01-11 12:19:35 +01:00
• 2fed22dc55 Upgrade from Rails 4.2.5.2 to 4.2.7.1 Pau Perez 2018-01-11 12:03:49 +01:00
• 947093a021 Move flash messages into devise modals Matt-Yorkley 2018-01-07 23:28:34 +00:00
• 28db11ed6e Tweak flash ul css Matt-Yorkley 2018-01-07 23:26:34 +00:00
• 3fd6535d54 Add missing ul element to form errors Matt-Yorkley 2018-01-07 22:53:24 +00:00
• 585c436a86 Tidy up inconsitent devise modal padding Matt-Yorkley 2018-01-07 22:51:35 +00:00
• a95d9d2beb Fix flash message dismiss button Matt-Yorkley 2018-01-07 22:49:29 +00:00
• b13b38e413 Add test and doc to #display_id Pau Perez 2018-01-05 09:06:13 +01:00
• b319ed9ea4 Fix doc Pau Perez 2018-01-04 16:34:07 +01:00
• 95230dcaf9 Remove obsolete :give_time action views Pau Perez 2018-01-04 16:31:18 +01:00
• 7b5184865a Inline AccountOptionTag to avoid wrong abstraction Pau Perez 2018-01-04 16:26:58 +01:00
• 5f4d70e79c Add specs and docs to TransferSourceOptions Pau Perez 2018-01-04 12:04:40 +01:00
• e41ca37927 Merge pull request #276 from coopdevs/develop Enrico Stano 2017-10-31 17:49:38 +01:00
• 13fa571a2d Merge pull request #275 from coopdevs/feature/new-language-eu sseerrggii 2017-10-31 17:24:36 +01:00
• 8cc7d2a40e Add Euskera language sseerrggii 2017-10-31 17:18:29 +01:00
• 81b874ce6c Update existing locales sseerrggii 2017-10-31 17:17:33 +01:00
• 127562353f Add search button Victor Martinez 2017-10-20 17:40:06 +02:00
• 10d4ebb8f6 FIX: Remove sort link on balance because its value depends on the active organization and it can’t be queried directly from the database Victor Martinez 2017-10-20 17:34:39 +02:00
• 45f6320c08 FIX: Add data-toggle back to bootstrap drodown-toggles as angular is no longer present Victor Martinez 2017-10-20 17:33:02 +02:00
• 310db059ab Remove angular traces Victor Martinez 2017-10-18 18:04:14 +02:00
• 0130570d55 Implement pagination & search for users list Victor Martinez 2017-10-18 17:33:08 +02:00
• bb72df4967 Merge pull request #271 from hasa93/develop Pau Pérez Fabregat 2017-10-17 15:20:12 +02:00
• cc0a69cd7a Add link to the English translation on the main README Hasanga Somaratne 2017-10-17 17:21:39 +05:30
• 9d470de042 Merge pull request #269 from rahul2240/englishreadme sseerrggii 2017-10-17 13:37:46 +02:00
• 59696363c5 Translate README to english rahul 2017-10-16 22:16:16 +05:30
• e97d4675f2 Replace conditional with #find_by_id Pau Perez 2017-09-02 19:57:55 +02:00
• be04d97cc7 Extract TransferFactory and decouple view Pau Perez 2017-08-24 19:55:53 +02:00
• 14eaad80d1 Extract option building into class + polymorphism Pau Perez 2017-08-24 19:22:07 +02:00
• fc902afacb Use transfers :new template only Pau Perez 2017-08-19 21:00:12 +02:00
• a624dbc7f4 Remove differences between new, new_organization Pau Perez 2017-08-19 13:45:30 +02:00
• bf6223b270 Extract transfer sources select Pau Perez 2017-08-19 13:31:21 +02:00
• b50d6623cf Replace ivars with locals in views Pau Perez 2017-08-18 16:21:09 +02:00
• 96f36b1461 Refactor assigns' specs to check HTML instead Pau Perez 2017-08-17 13:11:31 +02:00
• 24e5d6ad98 Use @accountable instead of @user or @organization Pau Perez 2017-08-16 21:54:43 +02:00
• fa3adf429f Abstract transfers controller by passing account Pau Perez 2017-08-16 21:34:49 +02:00
• 0fa4668fac Remove dead #give_time actions Pau Perez 2017-08-16 20:20:47 +02:00
• 0aa40730c6 Simplify #create action Pau Perez 2017-08-16 20:20:03 +02:00
• 69982abe8a Autofix cops and change style of spec Pau Perez 2017-08-16 20:11:26 +02:00
• 808ed91479 DRY #new by abstracting ivars into their methods Pau Perez 2017-08-16 19:43:11 +02:00
• 9a1d6b098a Move #give_time from orgs to transfers controller Pau Perez 2017-08-16 19:04:26 +02:00
• 72b7bad68f Move #give_time from users to transfer controller Pau Perez 2017-07-28 19:37:20 +02:00