Commit Graph

71 Commits

Author SHA1 Message Date
benni 20b7db306b Implemented bundler. No more confusiong with gem versions! 2011-01-30 22:59:32 +01:00
Benjamin Meichsner be321798a7 Fixed some links in tasks module. 2010-06-10 23:25:13 +02:00
Benjamin Meichsner 74407a5912 Fixed paths in task-menu. 2010-06-01 16:18:20 +02:00
Benjamin Meichsner 7067294133 Fixed broken links/paths. 2010-05-25 23:36:05 +02:00
Benjamin Meichsner 00d9f060cc Merge branch 'routing-filter' 2010-05-25 23:16:49 +02:00
Benjamin Meichsner ca1c5d7db4 Start with I18n implementation. 2010-05-15 11:11:09 +02:00
Benjamin Meichsner 571548dfbc Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
Benjamin Meichsner 18e8a11b7d Removed unnecessary config params. Improved error handling. 2010-03-22 01:25:24 +01:00
Benjamin Meichsner 61a87dacb6 Fixed routing bug in last commit. 2010-03-21 00:08:02 +01:00
Benjamin Meichsner f49c6493f4 Removed hard coded links from mailer and views.
* Not tested every mail template. Hopefully everything works ;-)
2010-03-20 14:49:46 +01:00
Benjamin Meichsner 2c1952d625 Removed hardcoded links from main tabnav.
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
2010-03-20 13:45:58 +01:00
Benjamin Meichsner 9cb367463c Merge branch 'master' into routing-filter 2010-03-20 13:45:27 +01:00
Benjamin Meichsner d11c619c82 Removed session key from version control.
* Maybe you have to delete your cookies after pulling this commit.
2010-03-20 02:46:06 +01:00
Benjamin Meichsner e7af7e82b5 Implemented routing filter for foodcoop select.
* Allows now a multi coop installation for one domain!
* SSL, we are coming...
* TODO: Remove all the hardcoded urls, check email-links etc.
2010-03-20 02:26:30 +01:00
sandoz 356d922eb4 New prawn gem breaks application.
* Require specific version.
2010-02-23 21:02:17 +01:00
Benjamin Meichsner 7a77d1aa66 Caching of css and javascript for better speed results. 2010-02-09 21:06:24 +01:00
Benjamin Meichsner 20c7c0ef02 Revert "Tasks should be default page in foodcoop module."
This reverts commit b5b27cee6e.
2009-10-17 11:53:17 +02:00
Benjamin Meichsner b5b27cee6e Tasks should be default page in foodcoop module. 2009-10-16 21:10:52 +02:00
Benjamin Meichsner e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner fd97c1fc60 Made multi coop installation available as an option in app_config.yml. 2009-08-13 16:36:01 +02:00
Benjamin Meichsner 5d9385cde4 Changed wiki parser to wikicloth.
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
Benjamin Meichsner 8c3c8a1f95 Extended config sample for the new tolerance_not_costly feature. 2009-08-05 12:15:37 +02:00
Benjamin Meichsner 178fba7b30 Create restful invites controller and ajaxified the workflow. 2009-08-02 19:41:09 +02:00
Benjamin Meichsner 5cf75ee32a Moved foodcoop/members into new foodcoop/users restful controller. 2009-08-02 19:01:45 +02:00
Benjamin Meichsner 0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner 1a8026c5a7 Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful. 2009-08-02 18:12:13 +02:00
Benjamin Meichsner 709425855e Added validation for unit_quantity and localization for article attributes. 2009-07-21 15:09:55 +02:00
Benjamin Meichsner 55729e20f9 Create a redirect when editing the title of a page. 2009-06-11 23:51:26 +02:00
Benjamin Meichsner 434fc4b2ff Change wiki-parser again. Now wikitext is used. 2009-06-11 22:40:56 +02:00
Benjamin Meichsner d371839eba Prefer textile over markup because markup doesn't support any tables. bähh. 2009-05-20 13:03:58 +02:00
Benjamin Meichsner 43fc7b06f8 Upgrade foodsoft to rails 2.3.2. 2009-05-17 15:01:36 +02:00
Benjamin Meichsner 053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner f83d2659de Added better routing for wiki-root-path. 2009-05-15 13:53:45 +02:00
Benjamin Meichsner dafbb077b6 wiki-syntax: Use markup instead of textile. 2009-05-07 17:59:34 +02:00
Benjamin Meichsner f450070dbf First steps for an own wiki.
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
2009-03-25 19:54:04 +01:00
Benjamin Meichsner ffc3adf907 Second (last) part of multiple foodcoop installation.
* When before_filter select_foodcoop is activated,
  the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
Benjamin Meichsner 1c24127928 First part of multiple foodcoop installation. 2009-03-24 17:01:10 +01:00
Benjamin Meichsner e4c394d881 New foodcoop configuration option. Use own mailinglist instead of messaging system. 2009-03-17 18:13:00 +01:00
Benjamin Meichsner 3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner a0e10141dc Translations and other little improvements. 2009-02-12 21:38:41 +01:00
Benjamin Meichsner 951d19db6a Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views! 2009-02-12 18:32:20 +01:00
Benjamin Meichsner 86b2b28dc9 Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices. 2009-02-11 18:09:04 +01:00
Benjamin Meichsner 24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00
Benjamin Meichsner c17b63b192 Second part of stock-integration.
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
Benjamin Meichsner 1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. 2009-02-05 16:40:02 +01:00
Benjamin Meichsner aec93d4b73 Fixed bugs from last commit and in ExceptionNotification-config. 2009-02-02 17:12:08 +01:00
Benjamin Meichsner 0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +01:00
Benjamin Meichsner aa47a24fda Refactoring of invitations. 2009-02-02 00:09:50 +01:00
Benjamin Meichsner d75c206db5 Fixed some wrong links in startpage. Added gettext-help for controllers. 2009-02-01 23:09:03 +01:00
Benjamin Meichsner 7f09bb55e4 Fixed some wrong links in admin-startpage and bugs in ordergroup-model. 2009-02-01 21:53:08 +01:00