Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
867 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

62 Commits

Author SHA1 Message Date
wvengen f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner 762d529894 Added info link for apple restriction feature. 2013-03-09 18:14:53 +01:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
wvengen e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +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 f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +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 f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni dc0d1b3e46 Fixed bug in apples stats. 2012-07-22 21:12:53 +02:00
benni 182742fbec Merge branch 'master' into rails3 
Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
 2012-06-26 11:51:56 +02:00
benni f1b71a5588 Minor refactoring in stats partial. 2012-06-24 21:43:36 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni adbe93f39e Fixed open_orders partial. 2011-06-13 15:26:06 +02:00
benni c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00
benni ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni 1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +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 79f8836da0 Fixed some html safe strings. 2011-05-15 21:17:01 +02:00
benni 197516b7fc Fixed language and flash divs. 2011-05-11 17:41:43 +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 fc823bb6d6 Fixed wrong my-tasks-path on home page. 2010-03-28 16:56:24 +02: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
sandoz 662f8bf3d7 Round number of EUR per which you should to a job. 
* Just polishing for better user experience :-)
 2010-02-23 20:46:34 +01:00
Benjamin Meichsner e93dd9e046 Zeige Wert der Äpfel. 2010-02-09 23:56:16 +01:00
Benjamin Meichsner 74ed02e11e Fixed broken link on start navigation menu. 
Closes #53
 2009-11-10 14:15:06 +01:00
Benjamin Meichsner 8bba70594d Fixed bugs on my-ordergroup page and typos on invitation page. 2009-09-23 12:08:21 +02:00
root 68f8d00930 Fixed bug in stats on a fresh installation. 2009-08-04 12:32:25 +02:00
Benjamin Meichsner d9d800b41f Fixed bug in stats modul. Consider missing ordergroup. 2009-08-02 20:04:54 +02:00
Benjamin Meichsner d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner e71cacfe50 Fixed typing error and changed default foodcoop tab to /tasks 2009-04-20 13:58:22 +02:00
sandoz 00696c0e64 Replaced account balance by available funds on start page. 
* Closes #206

Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:35 +08:00
sandoz e3f9df0a0c Replaced account_balance by available_funds in ordergroup view. 
Signed-off-by: bennibu <benni@dresdener27.de>
 2009-04-07 18:08:33 +08:00
sandoz fea8c0993b Translation in profile.html.erb 
* Translated "cancal membership" and warning.
 2009-03-22 14:16:53 +01:00
sandoz 8d4acac081 Removed string "Benutzername: in home/profile.html.erb 
* I think it doubles it self to have the same string again on the next
 line. Hope you find it more beautiful too :-)
 2009-03-22 14:16:52 +01:00
sandoz ceec784e62 Translation in profile.html.erb 
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
 2009-03-22 14:16:52 +01:00
Benjamin Meichsner dd940fb414 Send messages directly instead of using controller filter. Litte improvements to the messages lists. 2009-03-09 13:02:43 +01:00
Benjamin Meichsner 857475af1b Revert "First parts of new 'web-app-theme'." This is fun stuff and should be managed in another branch. 
This reverts commit c04819e8c4.
 2009-02-18 12:01:51 +01:00
Benjamin Meichsner c04819e8c4 First parts of new 'web-app-theme'. 2009-02-18 11:41:03 +01:00
Benjamin Meichsner 24b66ee8d4 Small bugfix in shared view. Translations on start-page. 2009-02-06 21:18:20 +01:00