Commit graph

536 commits

Author SHA1 Message Date
Julius
95efe554fc Add another option for mailing list subscription tip 2012-11-12 18:08:47 +01:00
Julius
1e725872da Add advise to modify secret token 2012-11-12 14:39:38 +01:00
Julius
c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +01:00
benni
f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
Julius
69c4fc5817 Add created_by_user_id to Order table 2012-11-12 11:37:26 +01:00
benni
1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni
dce79802e0 Fixed feedback. 2012-11-10 17:05:43 +01:00
benni
181695d1bd Small fixes for article_categories. 2012-11-10 16:51:30 +01:00
benni
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
Julius
cecad7db13 make it run... 2012-11-09 23:54:45 +01:00
benni
16de9124fe Fixes orders. 2012-10-30 00:20:47 +01:00
benni
8f7e21b918 Fixed stockit. 2012-10-29 18:28:17 +01:00
benni
27c719d8da Fixed article categories. 2012-10-29 17:35:50 +01:00
benni
fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
bennibu
4da1af614e Merge pull request #78 from balkansalat/rails3
Added sqlite database for development.
2012-10-27 06:33:22 -07:00
benni
ee3da51ad3 Fixed bug in new stockit article form. 2012-10-24 12:19:53 +02:00
benni
f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni
fd361090b4 Nice breadcrumb 2012-10-18 23:43:31 +02:00
Robert Waltemath
736ac91aef Added Gemfile.lock. 2012-10-18 10:09:32 +02:00
Robert Waltemath
dd3e5a0e4c Use sqlite database in development env only. 2012-10-18 10:08:29 +02:00
Robert Waltemath
f6cc41aad9 Told git to ignore generated doc. 2012-10-18 09:58:53 +02:00
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