Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Commit graph

  • 9919183cb0 Fixed missing group_order_article in group_order show. benni 2012-12-16 16:50:09 +01:00
  • 0fcd5abb3a Fixed strange RecordReadOnly exception in task done. benni 2012-12-16 14:13:54 +01:00
  • cabcd201a6 Improvements for Ordergroup.avg_jobs_per_euro. benni 2012-12-16 13:56:47 +01:00
  • b86172bc62 Performance improvements for ordergroup.update_stats! benni 2012-12-16 13:48:15 +01:00
  • 8074fedefd Added libs for nice error output and benchmarker support. benni 2012-12-16 13:47:45 +01:00
  • 0edd29dfd4 Merge branch 'master' into master-to-rails3 benni 2012-12-14 18:10:46 +01:00
  • 35ec54b4f4 Merge pull request #80 from balkansalat/master bennibu 2012-12-12 09:01:22 -08:00
  • d9681eaf30 Added validation for article_price. Avoid unit_quantity of 0. benni 2012-12-11 10:59:50 +01:00
  • bae09624b7 Avoid deleting categories which still have articles. benni 2012-12-11 10:53:01 +01:00
  • 620ec946f1 Merge branch 'master' into master-rails3-merging benni 2012-12-11 10:32:59 +01:00
  • 1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). Robert Waltemath 2012-11-28 10:13:54 +01:00
  • ddcb4a9b2d Moved acts_as_configurable to gemfile. benni 2012-11-24 16:49:19 +01:00
  • 7e6ac8c924 Moved acts_as_tree to gemfile. benni 2012-11-24 16:41:34 +01:00
  • 7fc0462fc4 Upgrade to rails 3.2.9. Moved acts_as_versioned to gem. benni 2012-11-24 16:36:40 +01:00
  • 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 benni 2012-11-24 15:27:48 +01:00
  • ecc31641aa Changed header to copy old foodsoft style. benni 2012-11-24 15:23:12 +01:00
  • e1cb866935 Remove html5 support for IE Browsers. benni 2012-11-24 13:53:19 +01:00
  • ce7f8dc698 update ruby version to current stable. benni 2012-11-24 13:44:50 +01:00
  • 1822b330d1 Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap Robert Waltemath 2012-11-15 09:53:36 +01:00
  • 8c0af4bd87 Documented config/initializers/session_store.rb Robert Waltemath 2012-11-14 09:52:32 +01:00
  • 2bd52b9270 Corrected config hash index to ':mailing_list_subscribe' Robert Waltemath 2012-11-13 10:18:40 +01:00
  • a8d61d2591 Removed environment.rb to avoid overwriting it on update. Robert Waltemath 2012-11-13 10:12:06 +01:00
  • c032fdca6e Merge remote-tracking branch 'upstream/master' Robert Waltemath 2012-11-13 08:55:50 +01:00
  • d086fe7cc7 Fix task validation again #16; mark assignment validation TODO Julius 2012-11-12 21:31:04 +01:00
  • e561ddb064 Fix task validation #16 Julius 2012-11-12 20:14:06 +01:00
  • 95efe554fc Add another option for mailing list subscription tip Julius 2012-11-12 18:08:47 +01:00
  • 1e725872da Add advise to modify secret token Julius 2012-11-12 14:39:38 +01:00
  • c17ff281c3 Save and display creator of Order Julius 2012-11-12 14:24:49 +01:00
  • f4f10b1e4c Introduced actionbar. Some fixes for balancing page. benni 2012-11-12 13:13:01 +01:00
  • 69c4fc5817 Add created_by_user_id to Order table Julius 2012-11-12 11:37:26 +01:00
  • 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. benni 2012-11-12 09:03:23 +01:00
  • dce79802e0 Fixed feedback. benni 2012-11-10 17:05:43 +01:00
  • 181695d1bd Small fixes for article_categories. benni 2012-11-10 16:51:30 +01:00
  • 0236fb5a60 Fixed finance module to work with bootstrap design. benni 2012-11-10 16:44:05 +01:00
  • cecad7db13 make it run... Julius 2012-11-09 23:54:45 +01:00
  • 16de9124fe Fixes orders. benni 2012-10-30 00:20:47 +01:00
  • 8f7e21b918 Fixed stockit. benni 2012-10-29 18:28:17 +01:00
  • 27c719d8da Fixed article categories. benni 2012-10-29 17:35:50 +01:00
  • fc1c173718 Fixed articles module. benni 2012-10-28 18:03:50 +01:00
  • 4da1af614e Merge pull request #78 from balkansalat/rails3 bennibu 2012-10-27 06:33:22 -07:00
  • ee3da51ad3 Fixed bug in new stockit article form. benni 2012-10-24 12:19:53 +02:00
  • f30e57dd49 Fixed articles views. benni 2012-10-19 01:12:47 +02:00
  • fd361090b4 Nice breadcrumb benni 2012-10-18 23:43:31 +02:00
  • 736ac91aef Added Gemfile.lock. Robert Waltemath 2012-10-18 10:09:32 +02:00
  • dd3e5a0e4c Use sqlite database in development env only. Robert Waltemath 2012-10-18 10:08:29 +02:00
  • f6cc41aad9 Told git to ignore generated doc. Robert Waltemath 2012-10-18 09:58:53 +02:00
  • 28fda3c612 Corrected rake command for doc generation. Robert Waltemath 2012-10-18 09:54:59 +02:00
  • 9af26e1da6 Fixed deliveries. benni 2012-10-17 20:45:52 +02:00
  • 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. benni 2012-10-15 21:19:17 +02:00
  • f0bf196934 order group recepient list ascending Robert Waltemath 2012-10-15 17:33:33 +02:00
  • 9ac913fd34 added Gem 'sqlite3' for quick setup to work Robert Waltemath 2012-10-15 17:31:12 +02:00
  • e9383e0d17 Remove searching shared articles by list. benni 2012-10-13 22:19:01 +02:00
  • 699fb9b233 Fixed wiki pages. benni 2012-10-09 02:31:10 +02:00
  • acdb331e36 Improved tasks. benni 2012-10-08 21:52:03 +02:00
  • 52e62f8ddb Fixed messages. New styling for token input plugin. benni 2012-10-08 18:19:15 +02:00
  • c0c41a7752 Fixed foodcoop/ordergroups and workgroups views. benni 2012-10-08 16:20:24 +02:00
  • ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. benni 2012-10-08 15:24:32 +02:00
  • 1708df3f6c Fixed login, new_password and invitation views. benni 2012-10-08 11:51:56 +02:00
  • f20ae890dd Added twitter bootstrap layout. Adapt home page. benni 2012-10-06 17:14:57 +02:00
  • 31735f35ab Reenabled sidebar.. benni 2012-10-03 20:27:40 +02:00
  • 92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. benni 2012-10-03 20:08:23 +02:00
  • eb532babd6 Refactored pdf generation with newest prawn. benni 2012-10-02 02:50:48 +02:00
  • 78cc423a46 Replaced prawnto plugin with rails31 compatible version. benni 2012-09-30 21:48:57 +02:00
  • 0a1c326f14 Upgraded to rails 3.2.8 benni 2012-09-30 21:38:52 +02:00
  • 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. benni 2012-09-30 21:15:55 +02:00
  • cd91436f7f Allow ignoring apple restriction for specific ordergroup. benni 2012-09-30 13:34:16 +02:00
  • ff4ab44bcc Add option to restrict ordering when not enough apples. benni 2012-09-29 17:52:25 +02:00
  • d3abc03e56 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 benni 2012-08-27 10:08:20 +02:00
  • 610b851111 Removed unused test files. benni 2012-08-27 08:46:45 +02:00
  • 971e80b505 Fixed foodsoft rake tasks. benni 2012-08-27 08:38:43 +02:00
  • ea547c84f0 Added rake task to execute every rake task for every foodcoop. benni 2012-08-27 08:24:25 +02:00
  • 8c3d046cf4 Recommend using rails3 branch for beginners. benni 2012-08-25 12:26:20 +02:00
  • 8883d0dfaf Updated READMEs. Recommend using rails3 branch. benni 2012-08-25 12:24:57 +02:00
  • ec2e761e7f Fixed multi coop routing and changed config accessors. benni 2012-08-24 19:52:38 +02:00
  • 2860a3ca44 Fixed authentication when User is deleted during session. benni 2012-08-24 15:20:58 +02:00
  • 7bc23698d1 Updated README_DEVEL. benni 2012-08-24 15:20:33 +02:00
  • cd90439cc9 Updated readme for delayed_job. benni 2012-08-24 15:10:15 +02:00
  • 8f8d866bb9 Moved notification about negative account balance to background. benni 2012-08-24 14:48:53 +02:00
  • edadb7d8d1 Moved message delivering into background process. benni 2012-08-24 14:33:45 +02:00
  • af3875d46b Refactored order finishing. Delay user notifications. benni 2012-08-24 14:24:36 +02:00
  • b0c9580b53 Added delayed_job as new background queue manager. benni 2012-08-24 13:48:45 +02:00
  • 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders benni 2012-08-24 11:11:40 +02:00
  • c936813967 Some fixes for mailer module. benni 2012-08-17 19:08:02 +02:00
  • 6f7682d6a0 Fixed new user invite. benni 2012-08-06 12:00:40 +02:00
  • fc8418bc8e Some fixes in group forms. benni 2012-07-31 18:48:41 +02:00
  • f759552022 Fixed user settings. benni 2012-07-31 18:21:42 +02:00
  • ef2ce98e46 Performance improvement for stockit view. benni 2012-07-31 17:37:32 +02:00
  • 9ac747e9f3 Updated rails to 3.0.16 benni 2012-07-27 18:12:10 +02:00
  • 8a74e7d77f Removed annoate and hirb Gemfiles. benni 2012-07-27 18:07:42 +02:00
  • af3c07f031 Simplifiying balancing view part 2. Lets call it finished. benni 2012-07-27 18:03:46 +02:00
  • dc0d1b3e46 Fixed bug in apples stats. benni 2012-07-22 21:12:53 +02:00
  • 5849473db4 Do not git ignore ruby version managers. Set ruby 1.9.3 benni 2012-07-20 15:41:53 +02:00
  • 7c07fa1b54 Bumped new version: 3.1.1 benni 2012-07-20 15:03:22 +02:00
  • 7cf0308adb Added rbenv version file to change ruby version. benni 2012-07-20 14:55:52 +02:00
  • 7e77d7804c Merge pull request #72 from davidrabel/global-article-update bennibu 2012-07-20 01:37:27 -07:00
  • cda3c37e20 Umlaute eingefügt davidrabel 2012-07-19 15:37:17 +02:00
  • 2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. davidrabel 2012-07-18 22:16:08 +02:00
  • 7b7d50a235 Added database indexes. Performance boost for balance page. benni 2012-05-28 10:41:33 +02:00
  • 524d9b7c7a Fixed rake task to create weekly tasks. benni 2012-06-26 23:18:55 +02:00
  • 182742fbec Merge branch 'master' into rails3 benni 2012-06-24 21:59:46 +02:00