Commit Graph

515 Commits

Author SHA1 Message Date
Robert Waltemath 28fda3c612 Corrected rake command for doc generation. 2012-10-18 09:54:59 +02:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
Robert Waltemath f0bf196934 order group recepient list ascending 2012-10-15 17:33:33 +02:00
Robert Waltemath 9ac913fd34 added Gem 'sqlite3' for quick setup to work 2012-10-15 17:31:12 +02:00
benni e9383e0d17 Remove searching shared articles by list.
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +02:00
benni 699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni 52e62f8ddb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
benni c0c41a7752 Fixed foodcoop/ordergroups and workgroups views. 2012-10-08 16:20:24 +02:00
benni ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni 1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni 31735f35ab Reenabled sidebar.. 2012-10-03 20:27:40 +02:00
benni 92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. 2012-10-03 20:08:54 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni 78cc423a46 Replaced prawnto plugin with rails31 compatible version. 2012-09-30 21:48:57 +02:00
benni 0a1c326f14 Upgraded to rails 3.2.8 2012-09-30 21:38:52 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni cd91436f7f Allow ignoring apple restriction for specific ordergroup. 2012-09-30 13:34:16 +02:00
benni ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00
benni d3abc03e56 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2012-08-27 10:08:20 +02:00
benni 610b851111 Removed unused test files. 2012-08-27 08:46:45 +02:00
benni 971e80b505 Fixed foodsoft rake tasks. 2012-08-27 08:38:43 +02:00
benni ea547c84f0 Added rake task to execute every rake task for every foodcoop. 2012-08-27 08:24:25 +02:00
benni 8c3d046cf4 Recommend using rails3 branch for beginners. 2012-08-25 12:26:20 +02:00
benni 8883d0dfaf Updated READMEs. Recommend using rails3 branch. 2012-08-25 12:24:57 +02:00
benni ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni 2860a3ca44 Fixed authentication when User is deleted during session. 2012-08-24 15:20:58 +02:00
benni 7bc23698d1 Updated README_DEVEL. 2012-08-24 15:20:33 +02:00
benni cd90439cc9 Updated readme for delayed_job. 2012-08-24 15:10:15 +02:00
benni 8f8d866bb9 Moved notification about negative account balance to background. 2012-08-24 15:04:54 +02:00
benni edadb7d8d1 Moved message delivering into background process. 2012-08-24 14:33:45 +02:00
benni af3875d46b Refactored order finishing. Delay user notifications. 2012-08-24 14:24:36 +02:00
benni b0c9580b53 Added delayed_job as new background queue manager. 2012-08-24 13:48:45 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni c936813967 Some fixes for mailer module. 2012-08-17 19:08:02 +02:00
benni 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni ef2ce98e46 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
benni 9ac747e9f3 Updated rails to 3.0.16 2012-07-27 18:12:10 +02:00
benni 8a74e7d77f Removed annoate and hirb Gemfiles.
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni dc0d1b3e46 Fixed bug in apples stats. 2012-07-22 21:12:53 +02:00
benni 5849473db4 Do not git ignore ruby version managers. Set ruby 1.9.3 2012-07-20 15:41:53 +02:00
benni 7c07fa1b54 Bumped new version: 3.1.1 2012-07-20 15:03:22 +02:00
benni 7cf0308adb Added rbenv version file to change ruby version. 2012-07-20 14:55:52 +02:00
bennibu 7e77d7804c Merge pull request #72 from davidrabel/global-article-update
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-20 01:37:27 -07:00
davidrabel cda3c37e20 Umlaute eingefügt 2012-07-19 15:37:17 +02:00