Commit Graph

86 Commits

Author SHA1 Message Date
Tom Carchrae 0c2e3331dc
apple icons to stop 404s (#130, PR #889) 2022-01-12 17:19:38 +01:00
wvengen 9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen 873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen 1e73c82205 remove unused files (complements bf0dc4af09) [ci skip] 2013-10-21 18:00:22 +02:00
wvengen bf0dc4af09 remove disfunctional dispatch cgis 2013-10-18 00:21:45 +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 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +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 1d6a31b9d4 Minor css changes due to haml/sass update. 2012-06-24 11:02:35 +02:00
benni 8141c06fa5 Some ajax loading callback. 2011-06-20 00:48:05 +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 f3773314a7 Fixed ordering view. 2011-06-13 16:23:56 +02:00
benni afb2c26ab3 Fixed orders form. 2011-06-10 13:53:51 +02:00
benni 172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni a47d4b1f0e Unobtrusive pagination_links_remote 2011-06-10 11:43:56 +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 772cf87c92 Fixed wiki module. 2011-05-18 15:29:38 +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 a4f71bd672 Updated haml and acts_as_paranoid. Removed sass templates. 2011-05-15 21:50: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 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 4eba5fbc9c First step for upgrading to rails 3.
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
Benjamin Meichsner 1b9ae83496 Few design improvements for order pages. 2010-02-11 23:22:50 +01:00
Benjamin Meichsner 7a77d1aa66 Caching of css and javascript for better speed results. 2010-02-09 21:06:24 +01:00
Benjamin Meichsner 05d88d6178 Few css changes for performance improvement. 2010-02-09 20:38:48 +01:00
Benjamin Meichsner 45039bf60f Replaced js article-info control with pure css. 2009-11-20 01:28:01 +01:00
Benjamin Meichsner 4d46f034e6 Added opacity to orderfooter. 2009-11-08 19:38:06 +01:00
Benjamin Meichsner 5e9ffa7cb1 Orderfooter design improvements. 2009-11-08 19:26:28 +01:00
sandoz b8e336b9e8 Minor layout change of order footer. 2009-11-01 19:27:48 +01:00
sandoz fd1eb8a1d7 Refactor orderfooter and quantity display
* Unit, others_quantitiy and other_tolerance is now in orderfooter
* We display the missing units in the article row now.
2009-11-01 18:33:14 +01:00
Benjamin Meichsner 646a6b11f5 Nice green +/- buttons for order page. 2009-10-20 23:05:41 +02:00
Benjamin Meichsner a4a48dc4fe Css fixes. 2009-10-18 14:19:02 +02:00
Benjamin Meichsner 65a0a30f5a Introduced order footer.
An fixed element to present article meta data and other stuff.
2009-10-17 22:50:33 +02:00
Benjamin Meichsner 036bc10282 Hide/show unavailable articles via js. 2009-10-17 20:33:36 +02:00
Benjamin Meichsner 1f629ff861 Hide ignored articles in order result.
* also added js-link to show them if wanted
2009-10-17 12:22:13 +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 7a23ec1cb1 Updating error messages. 2009-09-07 13:38:30 +02:00