Commit graph

200 commits

Author SHA1 Message Date
Manuel Wiedenmann
e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann
42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
wvengen
e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
wvengen
afda844380 initial English locale translation 2013-01-31 11:03:32 +01:00
Benjamin Meichsner
44ef0a9807 Added bullet gem to track unusued eager loading. 2013-01-26 16:16:50 +01:00
Benjamin Meichsner
0683738003 Removed html ids from navigation. 2013-01-26 16:16:06 +01:00
benni
e509e28fd0 Force access over ssl in production mode. 2012-12-26 14:12:48 +01:00
benni
d347e2404b Added whenever to manage cronjobs. 2012-12-26 14:03:35 +01:00
benni
2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni
344abf5a26 Deployment stuff. Ignore capistrano. Faster precompiling. 2012-12-22 18:38:49 +01:00
benni
bae09624b7 Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
benni
620ec946f1 Merge branch 'master' into master-rails3-merging
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
benni
ecc31641aa Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +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
0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni
552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +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
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
ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni
7bc23698d1 Updated README_DEVEL. 2012-08-24 15:20:33 +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
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
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
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +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
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
eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +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
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
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
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
03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni
ca15bb1102 Include session_store in git repo, but not the secret token. 2011-05-14 16:51:10 +02:00
benni
0757be8319 Updated rails i18n translations. 2011-05-14 16:34:10 +02:00
benni
e589ad5274 Updated rails i18n translations. 2011-05-13 22:44:18 +02:00
benni
197516b7fc Fixed language and flash divs. 2011-05-11 17:41:43 +02:00
benni
2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni
bdb177dfa6 Fixed bug in routes.rb 2011-05-11 14:21:06 +02:00
benni
e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni
eab16e337e Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
benni
b71fcdf371 Do not load exception notifier in development mode. 2011-05-11 11:20:10 +02:00
benni
d09d3922c1 Upgraded exception notifier plugin. 2011-05-11 11:03:36 +02:00
benni
8679356ccf Updated development.rb.SAMPLE. 2011-05-11 10:13:56 +02:00
benni
dbe86b4f0f Modified new session store initializers. 2011-05-11 10:11:47 +02:00
benni
4eba5fbc9c First step for upgrading to rails 3.
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
benni
bea145f33d Upgrade rails to 2.3.11. 2011-05-10 23:29:36 +02:00
benni
be85296ddb Enabled hirb for better console formatting. 2011-05-07 21:14:11 +02:00
benni
face58ebef Updated README_DEVEL. 2011-05-06 20:38:39 +02:00
benni
50a45cfa7d Updated config/boot.rb to rails 2.3.10 2011-05-06 20:07:54 +02:00
benni
0df0519947 Upgrade to rails 2.3.10. 2011-05-06 19:52:50 +02:00
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