Commit graph

12 commits

Author SHA1 Message Date
wvengen
c37ed74942 Merge branch 'master' into allow-no-nickname
Conflicts:
	app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
wvengen
e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen
33b27d2fa7 proper usage of jQuery.on(), and update javascript in views as well 2013-07-08 22:41:06 +02:00
wvengen
3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen
f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
Manuel Wiedenmann
640e9799aa i18n financial_transactions + controller 2013-02-11 10:21:39 +07:00
benni
f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +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
5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni
4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni
ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00