Skip to content

Release January 2018 / 1 #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 73 commits into from
Jan 30, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
c08d9ec
Force 100% width to select2 jQuery
sseerrggii Feb 27, 2017
72b7bad
Move #give_time from users to transfer controller
sauloperez Jul 28, 2017
9a1d6b0
Move #give_time from orgs to transfers controller
sauloperez Aug 16, 2017
808ed91
DRY #new by abstracting ivars into their methods
sauloperez Aug 16, 2017
69982ab
Autofix cops and change style of spec
sauloperez Aug 16, 2017
0aa4073
Simplify #create action
sauloperez Aug 16, 2017
0fa4668
Remove dead #give_time actions
sauloperez Aug 16, 2017
fa3adf4
Abstract transfers controller by passing account
sauloperez Aug 16, 2017
24e5d6a
Use @accountable instead of @user or @organization
sauloperez Aug 16, 2017
96f36b1
Refactor assigns' specs to check HTML instead
sauloperez Aug 17, 2017
b50d662
Replace ivars with locals in views
sauloperez Aug 18, 2017
bf6223b
Extract transfer sources select
sauloperez Aug 19, 2017
a624dbc
Remove differences between new, new_organization
sauloperez Aug 19, 2017
fc902af
Use transfers :new template only
sauloperez Aug 19, 2017
14eaad8
Extract option building into class + polymorphism
sauloperez Aug 24, 2017
be04d97
Extract TransferFactory and decouple view
sauloperez Aug 24, 2017
e97d467
Replace conditional with #find_by_id
sauloperez Sep 2, 2017
0130570
Implement pagination & search for users list
knoopx Oct 18, 2017
310db05
Remove angular traces
knoopx Oct 18, 2017
45f6320
FIX: Add data-toggle back to bootstrap drodown-toggles as angular is …
knoopx Oct 20, 2017
10d4ebb
FIX: Remove sort link on balance because its value depends on the act…
knoopx Oct 20, 2017
1275623
Add search button
knoopx Oct 20, 2017
5f4d70e
Add specs and docs to TransferSourceOptions
sauloperez Jan 4, 2018
7b51848
Inline AccountOptionTag to avoid wrong abstraction
sauloperez Jan 4, 2018
95230dc
Remove obsolete :give_time action views
sauloperez Jan 4, 2018
b319ed9
Fix doc
sauloperez Jan 4, 2018
b13b38e
Add test and doc to #display_id
sauloperez Jan 5, 2018
a95d9d2
Fix flash message dismiss button
Matt-Yorkley Jan 7, 2018
585c436
Tidy up inconsitent devise modal padding
Matt-Yorkley Jan 7, 2018
3fd6535
Add missing ul element to form errors
Matt-Yorkley Jan 7, 2018
28db11e
Tweak flash ul css
Matt-Yorkley Jan 7, 2018
947093a
Move flash messages into devise modals
Matt-Yorkley Jan 7, 2018
2fed22d
Upgrade from Rails 4.2.5.2 to 4.2.7.1
sauloperez Jan 11, 2018
1e1a66c
Upgrade rspec-rails from 3.4.0 to 3.5.2
sauloperez Jan 11, 2018
d8ecb08
Translate translations contribution to ES
sauloperez Jan 11, 2018
b7b4025
Create EN version of CONTRIBUTING
sauloperez Jan 11, 2018
f0bd2ba
Add a couple of screenshots to README
sauloperez Jan 11, 2018
cf6055b
Cleanup top-level README section
sauloperez Jan 11, 2018
2d5c52c
Merge pull request #285 from coopdevs/translate-contributing
sauloperez Jan 11, 2018
7ee0c9b
Merge pull request #286 from coopdevs/improve-readme
sauloperez Jan 11, 2018
29fe8dc
Merge pull request #246 from coopdevs/fix/select-user-width
sauloperez Jan 11, 2018
91b7d39
Merge pull request #282 from Matt-Yorkley/signup_flash
sauloperez Jan 11, 2018
3b7a06c
Remove old TODOs
sauloperez Jan 12, 2018
2602668
Merge pull request #287 from coopdevs/remove-old-todos
sauloperez Jan 12, 2018
6b456fd
Fix activeadmin's deprecation warning
sauloperez Jan 15, 2018
74bde75
Merge pull request #288 from coopdevs/remove-activeadmin-warning
sauloperez Jan 15, 2018
7a564c0
Remove dead #languages_list helper
sauloperez Jan 16, 2018
fe87533
Merge pull request #290 from coopdevs/remove-dead-helper
sauloperez Jan 18, 2018
b495ef0
Add specs for Account#update_balance
sauloperez Jan 18, 2018
36a1063
Refactor and doc Account#update_balance
sauloperez Jan 18, 2018
c80c92d
Merge pull request #291 from coopdevs/improve-update-balance
sauloperez Jan 18, 2018
b71dfb7
Add specs to TransferFactory
sauloperez Jan 5, 2018
47812a9
Replace give_time link from users#show page
sauloperez Jan 18, 2018
e40a0ff
Replace give_time link from organizations#show
sauloperez Jan 22, 2018
545ea44
Remove intermediate vars
sauloperez Jan 22, 2018
70efd91
Fix some rubocop violations
sauloperez Jan 22, 2018
7079e90
Move rails_12factor gem to prod group as in docs
sauloperez Jan 25, 2018
3f35d19
We don't need a pretty printer as dependency
sauloperez Jan 25, 2018
49f6955
Remove deprecated an unused gem
sauloperez Jan 25, 2018
12b06dc
Move dotenv-rails to dev and test group
sauloperez Jan 25, 2018
0a6169d
Remove commented out gem
sauloperez Jan 25, 2018
48cd947
Enable sorting by balance in users list
sauloperez Jan 22, 2018
eb80106
Merge branch 'develop' into refactor-users-index
sauloperez Jan 25, 2018
e0ab6cd
Post tags list ordered case insensitive
sseerrggii Nov 4, 2016
ed7f8c9
Add spec for case insensitive tag group
sauloperez Jan 25, 2018
c7a2d31
Don't show useless horizontal scrollbar in destkop
sauloperez Jan 26, 2018
277f83b
Merge pull request #241 from coopdevs/fix/tags-order
sauloperez Jan 26, 2018
ca5e813
Merge pull request #264 from coopdevs/move-give-time-action-to-transf…
sauloperez Jan 26, 2018
79e963a
Merge pull request #272 from knoopx/refactor-users-index
sauloperez Jan 26, 2018
78b5a8b
Merge pull request #283 from coopdevs/upgrade-to-rails4.2.7.1
sauloperez Jan 26, 2018
38555d7
Merge pull request #294 from coopdevs/cleanup-gemfile
sauloperez Jan 26, 2018
d4d0a5c
Fix translations not being picked up
sauloperez Jan 29, 2018
774f9db
Merge pull request #302 from coopdevs/fix-translation
sauloperez Jan 29, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ SpecialGlobalVars:
Enabled: false

StringLiterals:
EnforcedStyle: double_quotes
EnforcedStyle: single_quotes

VariableInterpolation:
Enabled: false
Expand Down
17 changes: 17 additions & 0 deletions CONTRIBUTING.en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Contribuciones

Did you find a bug? Do you want to collaborate?

Process:
* Open a thread in [discourse](http://community.coopdevs.org/) to make sure whether it's a bug or a feature :wink:
* Once we understand what the bug is about and know the steps to reproduce we will create an issue in GitHub linking to the Discourse thread.
* Create a pull request to solve the issue
* Report back to the discourse thread the bug has been solved linking to the pull request

Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started)

## Contributing with translations

- Edit the translations directly on the [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) project on Locale.
- **That's it!**
- The maintainer will then pull translations from the Locale project and push to Github.
11 changes: 7 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Read this in English:
[CONTRIBUTING.en.md](https://github.com/coopdevs/timeoverflow/blob/master/CONTRIBUTING.en.md)

# Contribuciones

¿Has encontrado algún bug? ¿Quieres colaborar?
Expand All @@ -10,8 +13,8 @@ Proceso:

Visita [la guia para empezar a desarrollar para timeoverflow](https://github.com/coopdevs/timeoverflow/wiki/Getting-started)

## Contributing with translations
## Contribuir con traducciones

- Edit the translations directly on the [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) project on Locale.
- **That's it!**
- The maintainer will then pull translations from the Locale project and push to Github.
- Modifica las traducciones directamente en el proyecto [coopdevs/timeoverflow](https://www.localeapp.com/projects/10031) en Locale.
- **Eso es todo!**
- El mantenedor obtendrá las nuevas tradcciones del proyecto de Locale y las publicará en Github.
14 changes: 7 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
source 'https://rubygems.org'
ruby '2.3.0'

gem 'rails', '4.2.5.2'
gem 'rails', '~> 4.2.7.1'
gem 'rails-i18n'
gem 'rails_12factor'
gem "rdiscount"
gem 'high_voltage', '~> 2.1.0'
gem 'activeadmin', github: 'activeadmin'
Expand All @@ -17,13 +16,10 @@ gem "http_accept_language"
gem 'thin'
gem 'unicorn'
gem 'foreman'
gem 'dotenv-rails'
gem 'kaminari'
gem "simple_form", ">= 3.0.0"
gem "awesome_print"
gem 'memcachier'
gem 'rollbar', '2.8.3'
gem 'travis-lint'
gem 'whenever', :require => false
gem 'prawn'
gem 'prawn-table'
Expand All @@ -50,15 +46,15 @@ group :development do
gem 'web-console', '2.1.3'
gem 'capistrano', '~> 3.1'
gem 'capistrano-rails', '~> 1.1'
# gem 'capistrano3-delayed-job', '~> 1.0'
gem 'airbrussh', require: false
gem "quiet_assets"
gem 'localeapp', '2.1.1', require: false
gem 'letter_opener', '1.4.1'
gem 'dotenv-rails', '1.0.2'
end

group :development, :test do
gem "rspec-rails", '~> 3.4.0'
gem "rspec-rails", '~> 3.5.2'
gem "capybara", '~> 2.4.4'
gem "byebug"
end
Expand All @@ -75,3 +71,7 @@ group :test do
gem 'fabrication'
gem 'faker'
end

group :production do
gem 'rails_12factor', '0.0.3'
end
Loading