Commit Graph

2315 Commits (a029e1ddceb70480aa3f55a1802d74248994913e)
 

Author SHA1 Message Date
CI a029e1ddce update locales from crowdin 8 years ago
Oliver Günther 861512f071
Merge remote-tracking branch 'origin/release/6.0' into dev 8 years ago
Oliver Günther bbd5de3bdb
Bump VERSION to 6.0.6 8 years ago
Jens Ulferts b2598392b3 adapt filter registration to changes in core 8 years ago
Oliver Günther 35ac440360
[24017] Fix reference to project for authorization check 8 years ago
ulferts 8cc71c6a18 Merge pull request #263 from ulferts/fix/optimize_eager_loaded_costs 8 years ago
Jens Ulferts 71a9cc03cf reload via method not via parameter 8 years ago
Jens Ulferts 26fd453ca4 handle spec permissions the new way 8 years ago
Jens Ulferts 379361bf45 fix spelling error 8 years ago
Jens Ulferts 250aafd6f4 remove observers by placing code in the observed models 8 years ago
Jens Ulferts 652d854567 bump rails to 5.0.0 8 years ago
Jens Ulferts 2758e52a85
use joins instead of subselects for eager loaded costs 8 years ago
ulferts 763e62c5d9 Merge pull request #261 from finnlabs/feature/costs_n_plus_1 8 years ago
Markus Kahl b9402a391b added missing singular for cost type in Chinese 8 years ago
Markus Kahl fb409061ae added missing scope again 8 years ago
Markus Kahl 0d079dd7a8 fix mysql2 gem missing on travis 8 years ago
Markus Kahl 6519592c67 use correct ruby version 8 years ago
Markus Kahl 3661bcb3f6 use current user if no user is given 8 years ago
Markus Kahl 863ffe3cf9 DRY'd up the code a little 8 years ago
Henriette Dinger 5f8a93308b Merge pull request #260 from HDinger/fix/23980-add-buttons-are-not-consistently-used 8 years ago
Markus Kahl 693aff4b8d prevent n+1 cost queries 8 years ago
Henriette Dinger 25fd0ee024 Remove obselete information from button 8 years ago
Henriette Dinger 4a994a571f Merge pull request #258 from HDinger/fix/23978-design-improvements-on-budget-page 8 years ago
Henriette Dinger c41a1b1ece Design improvements on budget pages 8 years ago
Henriette Dinger c47866fd27 Merge pull request #259 from HDinger/fix/bundler-on-travis 8 years ago
Henriette Dinger 4c0eed00b7 Fix bundler on travis 8 years ago
ulferts 47fd820217 Merge pull request #256 from ulferts/fix/invalid_user_inputs_on_rates 8 years ago
ulferts af4c455eef Merge pull request #255 from finnlabs/housekeeping/remove-prototype 8 years ago
Oliver Günther b0703d7462
Replace other views using subform directive 8 years ago
Jens Ulferts 84376b40cb
add required attribute to prevent user errors 8 years ago
Jens Ulferts 1119ca60c3
avoid 500 caused by inability to sort based on valid_from when that is empty 8 years ago
Oliver Günther d0f9d9a9ff
Clean up sass of costs 8 years ago
Oliver Günther 4e49c8800d
Rewrite rate and edit views 8 years ago
Oliver Günther cd8a1319c2
Replace prototype assets with rendered JS and directive 8 years ago
Oliver Günther 3afb9f637d
Merge remote-tracking branch 'origin/release/6.0' into dev 8 years ago
Oliver Günther 15d3111e99
Bump VERSION to 6.0.5 8 years ago
Oliver Günther 9abc746aec Merge pull request #254 from ulferts/fix/hide_empty_cost_attributes 8 years ago
Jens Ulferts e66b52f9b1
hide wp cost attributes if they are empty 8 years ago
Oliver Günther 657ec13a66 Merge pull request #253 from ulferts/refactor/project_authorization 8 years ago
Oliver Günther 5a7f5f0151
Merge origin/release/6.0 into dev 8 years ago
Jens Ulferts 427aeecc88
adapt to changes on Project.allowed_to in core 8 years ago
Henriette Dinger 35fdb8177b Merge pull request #252 from HDinger/fix/23450-aktuelle-position-nicht-im-Menue-gekennzeichnet 8 years ago
Henriette Dinger 03e625af18 Highlight menu entry 8 years ago
Henriette Dinger 09e847d0d4 Merge pull request #251 from HDinger/fix/23423-ein-und-ausblenden-von-seitenbereichen-mit-der-tastatur-nicht-moeglich 8 years ago
Henriette Dinger b25e5403d7 Make fieldset legends focusable 8 years ago
Oliver Günther c532bafbf7
Bump VERSION to 6.0.4 8 years ago
Oliver Günther f7d6b2e6e0 Bump VERSION to 6.0.3 8 years ago
Oliver Günther 25cf1682ed Merge pull request #250 from finnlabs/feature/enhanced_members_screen 8 years ago
Markus Kahl e779d76120 don't rely on project instance variable and use given option instead 8 years ago
Markus Kahl 5a23b394f8 only join rates if necessary 8 years ago