Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
578 commits 22 branches 1 tag 31 MiB
Commit graph

216 commits

Author SHA1 Message Date
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
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
ef2ce98e46 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
benni
af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
davidrabel
2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. 2012-07-18 22:16:08 +02:00
benni
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni
6bd4bbec86 Deactivated broken links in balancing. 2012-05-12 11:18:46 +02:00
benni
c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00
benni
b295f62322 Updated finance/invoices 2012-04-20 18:33:47 +02:00
benni
4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
benni
88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni
38b5dcba1f Refactored ordering part two. Integrated stock order. 2011-06-19 19:56:04 +02:00
benni
eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni
45e0048490 Minor refactoring for ordering js data. 2011-06-13 16:45:37 +02:00
benni
5b2df07378 Fixed ordering before filter. 2011-06-10 13:58:50 +02:00
benni
9ad93e9c06 Catch exceptions when deleting ordegroups. 2011-06-10 13:33:10 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni
c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00
benni
a787b3cf24 Admin/users refactored. 2011-06-09 22:03:27 +02:00
benni
ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni
fc1d130113 Refactored stockit, delivery an stock_takings. 2011-05-27 14:09:01 +02:00
benni
3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni
013637a4fc Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +02:00
benni
1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni
9388e918a7 Implemented fancy box for ajax forms. Refactored articles modul. 2011-05-18 17:37:10 +02:00
benni
0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni
0b1682af7c Fixed suppliers module. 2011-05-18 15:52:06 +02:00
benni
772cf87c92 Fixed wiki module. 2011-05-18 15:29:38 +02:00
benni
d5552059ce Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
benni
6ac04d5e19 Fixed foodcoop/ordergroups view. 2011-05-18 11:47:00 +02:00
benni
2ee30fee16 Refactored home/ordergroup. 2011-05-16 11:00:52 +02:00
benni
1cf63fc40b Some fixes to home view. 2011-05-16 10:34:14 +02:00
benni
06f2cc2007 Fixed and refactored foodcoop/workgroups. 2011-05-16 00:34:43 +02:00
benni
c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
benni
6c98c7c755 Some fixes for task module. 2011-05-15 22:06:54 +02:00
benni
5d028ccf3a Added new autocomplete for task assignments. 
Introduced the cool jquery token plugin.
 2011-05-14 19:41:46 +02:00
benni
2e56bfe895 Some fixes for tasks. 2011-05-14 19:02:52 +02:00
benni
2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni
e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni
2d7d0d3b94 Updated actionmailer classes and API. 2011-05-11 10:54:02 +02:00
Benjamin Meichsner
be321798a7 Fixed some links in tasks module. 2010-06-10 23:25:13 +02:00
Benjamin Meichsner
b71e809f34 Fixed ajax bug on categories page. 2010-05-28 12:01:19 +02:00
Benjamin Meichsner
a8a243b5fa Avoid exception on blank comments. 2010-05-28 11:55:12 +02:00
Benjamin Meichsner
571548dfbc Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
Benjamin Meichsner
9a54d8504c Secured users session, considering foodcoop token. 2010-03-22 01:38:23 +01:00
Benjamin Meichsner
18e8a11b7d Removed unnecessary config params. Improved error handling. 2010-03-22 01:25:24 +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
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
Benjamin Meichsner
55d2976e98 Moved order stats and cleanup stuff into rake task. 
Closes #14
 2010-02-09 21:45:57 +01:00
Benjamin Meichsner
036bc10282 Hide/show unavailable articles via js. 2009-10-17 20:33:36 +02:00
Benjamin Meichsner
d0e04a05ec Removed unecessary weekly task templates. 2009-10-16 20:45:20 +02:00
sandoz
90f760858e Added site map and titel list to pages/all 
* pages/all now consists of three alternativ views: recent changes, site map and title list
 2009-10-06 22:24:51 +02:00
Benjamin Meichsner
c3ca3e23f9 Hide redirected pages in collection for parent ids. 2009-09-28 17:22:24 +02:00
Benjamin Meichsner
65e41efc18 Fixed problems when deleting redirected pages. 2009-09-28 17:18:09 +02:00
Benjamin Meichsner
6eba04d30d Better messages and redirect when a page is deleted. 2009-09-28 16:26:53 +02:00
Benjamin Meichsner
7c192bbad3 Redirect /pages/id to /wiki/permalink 2009-09-28 15:31:20 +02:00
Benjamin Meichsner
529956ea5a Merge branch 'wiki' 
Conflicts:
	app/helpers/pages_helper.rb
	public/stylesheets/main.css
	public/stylesheets/print.css
 2009-09-28 15:04:07 +02:00
Benjamin Meichsner
67661cb716 Added toc to wikipages. Patched wikicloth. 
* patched wikicloth to serve anchor links for sections
* added table of contents
* subpages list doesn't show up per default
 2009-09-28 14:57:11 +02:00
Benjamin Meichsner
aa341628a6 Fixed bug when ending the group membership on profile page. 2009-09-11 16:13:04 +02:00
Benjamin Meichsner
21f128ef1d Handle bad entries when creating new order articles in balancing 
controller.
 2009-09-07 13:31:03 +02:00
Benjamin Meichsner
a1ca9f368d Fixed bug when adding new article to a stock order (balancing 
controller)
 2009-09-07 10:57:49 +02:00
sandoz
8927a80246 You can change the page parent now at pages/edit. 
* Increased text area size for better layout with the new feature.
* Closes #39
 2009-08-22 23:04:51 +02:00
Benjamin Meichsner
e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner
27bec1f860 Remember per_page number when updating multiple articles. Closes #36 2009-08-13 17:23:14 +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
f4edfacd91 Fixed missing error message. 2009-08-13 16:09:06 +02:00
Benjamin Meichsner
a8c93c08b7 Added parent-child relationship to pages to visualize a breadcrump and subpages. 2009-08-12 18:41:25 +02:00
Benjamin Meichsner
83e741c1af Improved delivery creating/updating prozess. 2009-08-12 13:38:03 +02:00
Benjamin Meichsner
d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
Benjamin Meichsner
c7e37fc7b2 Added possibility to give feedbacks via ajax form. Closes #2 
* Feedback message will send to error_recipients, configured in app_config.yml
 2009-08-04 15:22:11 +02:00
Benjamin Meichsner
6761a41048 Hide articles with a stock amount of zero. Closes #17 2009-08-04 13:35:52 +02:00
Benjamin Meichsner
f0caabfb53 Check account balance after creating a transaction. 2009-08-04 13:13:46 +02:00
Benjamin Meichsner
116b1c4ed9 Fixed broken link on startpage for non ordergroup members. 2009-08-04 13:05: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
ecc1176020 Member search now includes the attribute 'nick'. Closes #18 2009-07-20 19:29:24 +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
255a4cd6c7 Fixed problems in interacting of acts_as_versioned and optimistic locking. 2009-05-20 15:26:53 +02:00
Benjamin Meichsner
7de45543c4 Added page-preview feature to wiki module. 2009-05-20 12:42:01 +02:00
Benjamin Meichsner
2af35e55bc Improved stockit overiew. Fixed article ordering by suppliers. 2009-05-17 16:50:13 +02:00
Benjamin Meichsner
a8e35bd421 Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery. 2009-05-17 16:11:39 +02:00
Benjamin Meichsner
43fc7b06f8 Upgrade foodsoft to rails 2.3.2. 2009-05-17 15:01:36 +02:00
Benjamin Meichsner
c03f3da21a Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items. 2009-05-15 17:58:02 +02:00
Benjamin Meichsner
053c665270 Added version control for wiki pages. 2009-05-15 17:32:45 +02:00
Benjamin Meichsner
7ba6bc3680 Added optimistic locking to wiki pages. 2009-05-15 13:54:42 +02:00
Benjamin Meichsner
8bfa83118c Update ordergroup values after deleting an ordered article. Closes #11 
* TODO: Implement callbacks to avoid such mistakes.
 2009-05-13 13:04:39 +02:00
Benjamin Meichsner
7e4409bc11 Few improvements to wiki module. 2009-05-07 18:15:14 +02:00
Benjamin Meichsner
4c57c57827 Changed default order of articles on balancing page. 2009-05-04 17:56:52 +02:00
Benjamin Meichsner
e8fa912e8c Removed contact data from ordergroups-page. Added names of users and date of last order. 2009-05-04 17:06:08 +02:00
Benjamin Meichsner
a3fbc2d37b Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-04-20 14:13:47 +02:00