cabcd201a6
Improvements for Ordergroup.avg_jobs_per_euro.
...
Tip #2 , Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
2012-12-16 13:56:47 +01:00
b86172bc62
Performance improvements for ordergroup.update_stats!
...
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
2012-12-16 13:48:15 +01:00
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
d9681eaf30
Added validation for article_price. Avoid unit_quantity of 0.
2012-12-11 10:59:50 +01:00
bae09624b7
Avoid deleting categories which still have articles.
2012-12-11 10:53:01 +01:00
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
ddcb4a9b2d
Moved acts_as_configurable to gemfile.
2012-11-24 16:49:19 +01:00
7e6ac8c924
Moved acts_as_tree to gemfile.
2012-11-24 16:41:34 +01:00
7fc0462fc4
Upgrade to rails 3.2.9. Moved acts_as_versioned to gem.
2012-11-24 16:36:40 +01:00
7c9d666909
Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3
...
Conflicts:
Gemfile
2012-11-24 15:27:48 +01:00
ecc31641aa
Changed header to copy old foodsoft style.
2012-11-24 15:23:12 +01:00
e1cb866935
Remove html5 support for IE Browsers.
2012-11-24 13:53:19 +01:00
2bd52b9270
Corrected config hash index to ':mailing_list_subscribe'
2012-11-13 10:18:40 +01:00
c032fdca6e
Merge remote-tracking branch 'upstream/master'
2012-11-13 08:55:50 +01:00
d086fe7cc7
Fix task validation again #16 ; mark assignment validation TODO
2012-11-12 21:31:04 +01:00
e561ddb064
Fix task validation #16
2012-11-12 20:14:06 +01:00
95efe554fc
Add another option for mailing list subscription tip
2012-11-12 18:08:47 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
1d9815731c
Removed fancybox. Fixed profile, my ordergroup and tasks.
2012-11-12 09:18:44 +01:00
dce79802e0
Fixed feedback.
2012-11-10 17:05:43 +01:00
181695d1bd
Small fixes for article_categories.
2012-11-10 16:51:30 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
16de9124fe
Fixes orders.
2012-10-30 00:20:47 +01:00
8f7e21b918
Fixed stockit.
2012-10-29 18:28:17 +01:00
27c719d8da
Fixed article categories.
2012-10-29 17:35:50 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
ee3da51ad3
Fixed bug in new stockit article form.
2012-10-24 12:19:53 +02:00
f30e57dd49
Fixed articles views.
2012-10-19 01:12:47 +02:00
fd361090b4
Nice breadcrumb
2012-10-18 23:43:31 +02:00
9af26e1da6
Fixed deliveries.
2012-10-17 20:45:52 +02:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
f0bf196934
order group recepient list ascending
2012-10-15 17:33:33 +02:00
e9383e0d17
Remove searching shared articles by list.
...
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +02:00
699fb9b233
Fixed wiki pages.
2012-10-09 02:31:10 +02:00
acdb331e36
Improved tasks.
2012-10-08 21:52:03 +02:00
52e62f8ddb
Fixed messages. New styling for token input plugin.
2012-10-08 18:19:15 +02:00
c0c41a7752
Fixed foodcoop/ordergroups and workgroups views.
2012-10-08 16:20:24 +02:00
ab81ef09d5
Replace will_paginate with kaminari. Fixed foodcoop/users page.
2012-10-08 15:24:32 +02:00
1708df3f6c
Fixed login, new_password and invitation views.
2012-10-08 11:51:56 +02:00
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +02:00
31735f35ab
Reenabled sidebar..
2012-10-03 20:27:40 +02:00
92649d3053
Removed acts_as_ordered. Fixed bug in group_orders archive.
2012-10-03 20:08:54 +02:00
eb532babd6
Refactored pdf generation with newest prawn.
2012-10-02 02:50:48 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
ff4ab44bcc
Add option to restrict ordering when not enough apples.
2012-09-29 17:52:25 +02:00
971e80b505
Fixed foodsoft rake tasks.
2012-08-27 08:38:43 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
2860a3ca44
Fixed authentication when User is deleted during session.
2012-08-24 15:20:58 +02:00
8f8d866bb9
Moved notification about negative account balance to background.
2012-08-24 15:04:54 +02:00
edadb7d8d1
Moved message delivering into background process.
2012-08-24 14:33:45 +02:00
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
c936813967
Some fixes for mailer module.
2012-08-17 19:08:02 +02:00
6f7682d6a0
Fixed new user invite.
2012-08-06 12:00:40 +02:00
fc8418bc8e
Some fixes in group forms.
2012-07-31 18:48:41 +02:00
f759552022
Fixed user settings.
2012-07-31 18:21:42 +02:00
ef2ce98e46
Performance improvement for stockit view.
2012-07-31 17:37:32 +02:00
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
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
dc0d1b3e46
Fixed bug in apples stats.
2012-07-22 21:12:53 +02:00
cda3c37e20
Umlaute eingefügt
2012-07-19 15:37:17 +02:00
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
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
f1b71a5588
Minor refactoring in stats partial.
2012-06-24 21:43:36 +02:00
7d54a416df
Allow changing number of automaticly created next weekly tasks.
2012-06-24 11:01:16 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
ad508b207b
Updated to rails 3.0.12. remove old gettext code.
2012-04-15 19:59:39 +02:00
b3c64ecb85
Fixed order views.
2011-06-20 00:26:17 +02:00
88b268cb0b
Refactoring of order comments.
2011-06-19 20:47:27 +02:00
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
eb4705857b
Ordering refactored: Made everything RESTful.
2011-06-19 15:30:33 +02:00
45e0048490
Minor refactoring for ordering js data.
2011-06-13 16:45:37 +02:00
f3773314a7
Fixed ordering view.
2011-06-13 16:23:56 +02:00
adbe93f39e
Fixed open_orders partial.
2011-06-13 15:26:06 +02:00
5b2df07378
Fixed ordering before filter.
2011-06-10 13:58:50 +02:00
afb2c26ab3
Fixed orders form.
2011-06-10 13:53:51 +02:00
9ad93e9c06
Catch exceptions when deleting ordegroups.
2011-06-10 13:33:10 +02:00
a27c0c67fc
Fixed some typos.
2011-06-10 13:31:01 +02:00
172db1d37e
Admin namespace beendet.
2011-06-10 13:22:15 +02:00
6ddef7267a
Refactored items_per_page. Start on admin/workgroups.
2011-06-10 12:18:55 +02:00
689cfcfe01
Fixed items_per_page helper.
2011-06-10 12:03:32 +02:00
a47d4b1f0e
Unobtrusive pagination_links_remote
2011-06-10 11:43:56 +02:00
c173cf4a6a
my_profile and admin/ordergroups.
2011-06-10 01:36:04 +02:00
a787b3cf24
Admin/users refactored.
2011-06-09 22:03:27 +02:00
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
5bf6503a8f
Included new localize_input gem.
2011-05-20 00:19:58 +02:00
3f133bb8c3
Added client side validations. Fixed shared sync.
2011-05-19 22:35:13 +02:00
013637a4fc
Refactored shared article import. Added meta search gem.
2011-05-19 22:22:05 +02:00
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
9388e918a7
Implemented fancy box for ajax forms. Refactored articles modul.
2011-05-18 17:37:10 +02:00
0decbb36e1
Refactored article_categories.
2011-05-18 16:10:30 +02:00
0b1682af7c
Fixed suppliers module.
2011-05-18 15:52:06 +02:00
772cf87c92
Fixed wiki module.
2011-05-18 15:29:38 +02:00
d5552059ce
Refactored messages modul, but refactoring is still neccessary.
2011-05-18 14:47:17 +02:00
6ac04d5e19
Fixed foodcoop/ordergroups view.
2011-05-18 11:47:00 +02:00
2ee30fee16
Refactored home/ordergroup.
2011-05-16 11:00:52 +02:00
1cf63fc40b
Some fixes to home view.
2011-05-16 10:34:14 +02:00
06f2cc2007
Fixed and refactored foodcoop/workgroups.
2011-05-16 00:34:43 +02:00
c87ead8da9
Added meta where and jquery observe field. Fixed members view.
2011-05-15 23:43:23 +02:00
6c98c7c755
Some fixes for task module.
2011-05-15 22:06:54 +02:00
79f8836da0
Fixed some html safe strings.
2011-05-15 21:17:01 +02:00
5d028ccf3a
Added new autocomplete for task assignments.
...
Introduced the cool jquery token plugin.
2011-05-14 19:41:46 +02:00
2e56bfe895
Some fixes for tasks.
2011-05-14 19:02:52 +02:00
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +02:00
185376d53d
Some improved validations for task.
2011-05-14 16:34:10 +02:00
8da229316c
Some improved validations for task.
2011-05-13 22:43:23 +02:00
197516b7fc
Fixed language and flash divs.
2011-05-11 17:41:43 +02:00
2eb714b603
Fixed missing js for login layout.
2011-05-11 15:24:34 +02:00
2a72263bd3
Replaced protoype with jquery. Some fixes in mailer class.
2011-05-11 15:14:39 +02:00
e40f865c45
Refactored login module. Implemented standard sessions controller.
2011-05-11 13:38:46 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
8db221ca5f
New validate_on/before syntax.
2011-05-11 11:17:02 +02:00
2d7d0d3b94
Updated actionmailer classes and API.
2011-05-11 10:54:02 +02:00
4eba5fbc9c
First step for upgrading to rails 3.
...
Check rake rails:upgrade:check for next steps.
2011-05-11 01:32:21 +02:00
46450cebef
New annotation, because of db switch to mysql.
...
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
c2496aa4fd
Consider task duration in ordergroup stats.
...
* Also added duration to task template in workgroup task_duration.
2011-05-07 21:54:00 +02:00
dcd2a514a6
Added duration to tasks. Annotated all models.
2011-05-07 20:50:39 +02:00
383241621c
increased invite link lifetime from 2 days to 7 days.
2011-05-02 14:53:22 +02:00
6c82d0e06a
Avoid setting page as parent id, which has current page as parent.
2011-03-09 13:36:02 +01:00
80691c441b
Fixed bug on new delivery page.
2010-09-17 18:45:07 +02:00
7742403bbe
Hide deleted stockarticles when creating new deliveries.
2010-07-24 20:28:37 +02:00
f640c673de
Fixed bad when selecting same page as parent.
2010-07-08 10:57:42 +02:00
5f51afb5ee
Fixed input control in balancing mode.
2010-07-01 16:12:02 +02:00
fbf6a283a0
Fixed bug in orders index if order.ends.nil?
2010-06-19 12:25:35 +02:00
db52c6e4ed
Fixed bug on wiki page.
2010-06-18 10:33:13 +02:00
833862df93
Fixed bug on wiki page when an author was deleted.
2010-06-14 23:00:09 +02:00
be321798a7
Fixed some links in tasks module.
2010-06-10 23:25:13 +02:00
0e4b6107ba
Fixed wrong path in task form.
2010-06-10 12:55:06 +02:00
74407a5912
Fixed paths in task-menu.
2010-06-01 16:18:20 +02:00
b71e809f34
Fixed ajax bug on categories page.
2010-05-28 12:01:19 +02:00
a8a243b5fa
Avoid exception on blank comments.
2010-05-28 11:55:12 +02:00
3a85d4f49f
Fixed bug on ordergroups account managment page.
2010-05-28 11:50:18 +02:00
7067294133
Fixed broken links/paths.
2010-05-25 23:36:05 +02:00
00d9f060cc
Merge branch 'routing-filter'
2010-05-25 23:16:49 +02:00
ca1c5d7db4
Start with I18n implementation.
2010-05-15 11:11:09 +02:00
fc823bb6d6
Fixed wrong my-tasks-path on home page.
2010-03-28 16:56:24 +02:00
d6ee00db17
Fixed hard coded links in wiki pages.
2010-03-22 03:11:32 +01:00
571548dfbc
Fixed routing bug on (ex) admin controller.
2010-03-22 01:58:37 +01:00
9a54d8504c
Secured users session, considering foodcoop token.
2010-03-22 01:38:23 +01:00
18e8a11b7d
Removed unnecessary config params. Improved error handling.
2010-03-22 01:25:24 +01:00
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
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
9cb367463c
Merge branch 'master' into routing-filter
2010-03-20 13:45:27 +01:00
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
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
b9576dd669
Updated user validation. Fixed duplicates on 'nick'.
2010-02-16 09:53:24 +01:00
1b9ae83496
Few design improvements for order pages.
2010-02-11 23:22:50 +01:00
b5df80b7dd
Fixed bug in wiki "all pages" view.
2010-02-10 00:13:51 +01:00
e93dd9e046
Zeige Wert der Äpfel.
2010-02-09 23:56:16 +01:00
94d1a897e7
Fixed bug in stock orders (orderfooter commit).
2010-02-09 22:34:04 +01:00
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
a6646d06a6
Fixed bug during css caching.
2010-02-09 21:40:02 +01:00
48ee593d8d
Merge branch 'orderfooter'
2010-02-09 21:07:12 +01:00
7a77d1aa66
Caching of css and javascript for better speed results.
2010-02-09 21:06:24 +01:00
05d88d6178
Few css changes for performance improvement.
2010-02-09 20:38:48 +01:00
164653dbfc
Limited page versions number to 20.
2009-12-01 20:20:41 +01:00
45039bf60f
Replaced js article-info control with pure css.
2009-11-20 01:28:01 +01:00
d31b40bd66
Show also articles to get because of tolerance.
...
* Closes #54
2009-11-15 12:44:32 +01:00
74ed02e11e
Fixed broken link on start navigation menu.
...
Closes #53
2009-11-10 14:15:06 +01:00
5e9ffa7cb1
Orderfooter design improvements.
2009-11-08 19:26:28 +01:00
b8e336b9e8
Minor layout change of order footer.
2009-11-01 19:27:48 +01:00
e4ef6556b8
Do not display tolerance column in stock order.
2009-11-01 18:57:55 +01:00
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
2309fbe76b
Reduced max articles per page for article matrix.
...
Sometimes the last column wasn't displayed correctly.
2009-10-20 23:13:08 +02:00
646a6b11f5
Nice green +/- buttons for order page.
2009-10-20 23:05:41 +02:00
a4a48dc4fe
Css fixes.
2009-10-18 14:19:02 +02:00
65a0a30f5a
Introduced order footer.
...
An fixed element to present article meta data and other stuff.
2009-10-17 22:50:33 +02:00
036bc10282
Hide/show unavailable articles via js.
2009-10-17 20:33:36 +02:00
84610cc9a5
Fixed broken link. Closes #44
2009-10-17 18:53:01 +02:00
0b6b5eb0b5
Improved noscript warning on login page.
...
Also add 'foodsoft' to title. closes #48
2009-10-17 18:42:07 +02:00
1f218f77a0
Corrected message in order result. Closes #47
2009-10-17 18:25:33 +02:00
1f629ff861
Hide ignored articles in order result.
...
* also added js-link to show them if wanted
2009-10-17 12:22:13 +02:00
20c7c0ef02
Revert "Tasks should be default page in foodcoop module."
...
This reverts commit b5b27cee6e
2009-10-17 11:53:17 +02:00
b5b27cee6e
Tasks should be default page in foodcoop module.
2009-10-16 21:10:52 +02:00
cf9fa69ac2
Minor improvements to task show view.
2009-10-16 21:06:55 +02:00
d0e04a05ec
Removed unecessary weekly task templates.
2009-10-16 20:45:20 +02:00
f34c307540
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-10-12 14:44:48 +02:00
42d85c63be
Allow to have equal article and stockarticle.
...
* Modified validation to allow the same name.
2009-10-12 14:42:31 +02:00
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
305a4ac895
Don't show action "Create invoice" for stock order
2009-10-05 13:36:57 +02:00
c3ca3e23f9
Hide redirected pages in collection for parent ids.
2009-09-28 17:22:24 +02:00
65e41efc18
Fixed problems when deleting redirected pages.
2009-09-28 17:18:09 +02:00
6eba04d30d
Better messages and redirect when a page is deleted.
2009-09-28 16:26:53 +02:00
de86fcadd3
Made blank parent_id for wikipages possible.
2009-09-28 15:41:00 +02:00
7c192bbad3
Redirect /pages/id to /wiki/permalink
2009-09-28 15:31:20 +02:00
eca24d30f2
Show up tabnav link for wikipages.
2009-09-28 15:05:00 +02:00
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
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
741815e24e
Fixed help for numbered lists in pages/_form
2009-09-28 13:53:56 +02:00
8bba70594d
Fixed bugs on my-ordergroup page and typos on invitation page.
2009-09-23 12:08:21 +02:00
aa341628a6
Fixed bug when ending the group membership on profile page.
2009-09-11 16:13:04 +02:00
8a37a0e746
Fixed bug in comments partial on missing users.
2009-09-11 16:10:18 +02:00
84a026a677
Fixed bug in new ordergroup stats feature.
2009-09-11 16:03:48 +02:00
21f128ef1d
Handle bad entries when creating new order articles in balancing
...
controller.
2009-09-07 13:31:03 +02:00
5a93ca1641
Added tax to stockit index view.
2009-09-07 11:29:56 +02:00
2cb0516e8c
Fixed some broken links on admin user page.
2009-09-07 11:21:12 +02:00
a1ca9f368d
Fixed bug when adding new article to a stock order (balancing
...
controller)
2009-09-07 10:57:49 +02:00
8276ff57f8
Fixed bug in messaging system.
2009-09-05 21:08:32 +02:00
8df679163e
Change line "edited by" in pages/show
...
* The line "Zuletzt bearbeitet" display now first the user and then the date.
* The user name is displayed in bold characters.
2009-08-25 23:30:49 +02:00
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
7ec5381ca0
Improved wiki layout for sidebar and version sections
...
* Added new helper function format_datetime_timespec
2009-08-22 18:14:56 +02:00
f7e24d26b4
Better layout with equal distance from each sides.
...
* Added css class middle_column
2009-08-21 23:37:05 +02:00
004ce464c1
Fix problem in breadcrumps, when no "Home"-page exists.
2009-08-21 20:59:50 +02:00
47d3232e4e
Fix problem in breadcrumps, when no "Home"-page exists.
2009-08-19 22:59:53 +02:00
42b5e7a73f
Cherrypick of sandoz last commit
...
Conflicts:
app/views/pages/all.html.haml
public/stylesheets/main.css
public/stylesheets/print.css
2009-08-16 10:13:50 +02:00
6866c4eada
Merge branch 'wiki' of git@github.com:bennibu/foodsoft into wiki
2009-08-16 01:15:47 +02:00
57023cd018
Neues Breadcrump-Layout
...
* Die Breadcrump-Links sind jetzt überdem Seiten-Titel.
* Breadcrumps sind jetzt auf allen Wiki-Ansichten: edit, show, new, versions, all
* Bei edit und version ist der Breadcrump-Teil zur aktuellen Seite auch eine Link.
* Bei all wird nur der Foodcoop-Wiki-Teil angezeigt.
2009-08-16 01:09:11 +02:00
b46d7ca19c
Abbrechen-Link in wiki/edit etwas robuster gemacht.
...
* wiki/edit zeigt jetzt auf @page und nicht mehr auf :back.
* Man kann durchaus direkt zu einer Edit-Seite surfen, dann kann :back Beliebiges sein.
2009-08-16 01:07:12 +02:00
73c1137715
Removed another new wiki page link.
2009-08-15 17:39:14 +02:00
fd99125136
Temporarly removing of wiki tab.
2009-08-15 17:38:10 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
6fae1e8b64
Begin with h2 for the wiki content.
2009-08-15 17:14:07 +02:00
aa5166bb16
Hübschified "Schnelle Formatierungshilfe"
2009-08-15 15:08:02 +02:00
8d243c8e60
Show supplier email in suppliers/show.haml
...
* Closes : #38
2009-08-15 12:29:08 +02:00
27bec1f860
Remember per_page number when updating multiple articles. Closes #36
2009-08-13 17:23:14 +02:00
fd97c1fc60
Made multi coop installation available as an option in app_config.yml.
2009-08-13 16:36:01 +02:00
f4edfacd91
Fixed missing error message.
2009-08-13 16:09:06 +02:00
d470c660d8
Fixed broken link in ordergroups view.
2009-08-13 00:38:12 +02:00
d5342f5ff9
Added warn message, when deleting a page.
2009-08-12 19:06:15 +02:00
d7b65a304e
Removed new page link in wiki menu.
2009-08-12 19:02:03 +02:00
469c2473ca
Fixed some bugs on version page.
2009-08-12 19:00:45 +02:00
9516f349ce
Improved wikipage sidebar.
2009-08-12 18:55:36 +02:00
3b766af2a6
Fixed wikicloth bug "missing last row". (Better: implemented a workaround)
2009-08-12 18:47:33 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
83e741c1af
Improved delivery creating/updating prozess.
2009-08-12 13:38:03 +02:00
16346e3529
Added note to deliveries. Closes #34
2009-08-12 13:09:10 +02:00
5e1fc73c29
Avoid creating of duplicate articles. (Tests on article.name) Closes #10
2009-08-12 12:33:07 +02:00
aedfcae03b
Added stock_article number to stockit view. Closes #33
2009-08-12 11:46:27 +02:00
3656dac3cb
Fixed display bug with new ajax_box.
2009-08-11 19:49:31 +02:00
49be55238b
Added rake task to notify workgroup members if not enough users assigned an upcoming task.
2009-08-11 18:10:14 +02:00
d8cdbe4abb
Added rake task for auto create of upcoming workgroup tasks (weekly tasks).
2009-08-11 17:22:08 +02:00
00619ccf55
Updated wiki format help.
2009-08-11 14:41:58 +02:00
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
7e2506baa2
Fixed haml bug.
2009-08-06 16:14:36 +02:00
f45509fc07
Merge branch 'tolerance_not_costly'
2009-08-05 17:02:12 +02:00
ad94006978
Hide ordergroup link for non ordergroup members.
2009-08-05 11:49:07 +02:00
0adce9d54c
First try making tolerance not costly.
...
A new configuration setting was introduced: tolerance_is_costly
If set to false, article tolerance values do not count for total article price as long as the order is not finished.
This reduces the negative effect on using tolerance for the user.
2009-08-04 23:44:11 +02:00
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
b84ec884bd
Highlight javascript dependencies. Closes #19
2009-08-04 13:49:14 +02:00
4d57bd2e73
Show current stock value on stockit page.
2009-08-04 13:41:28 +02:00
6761a41048
Hide articles with a stock amount of zero. Closes #17
2009-08-04 13:35:52 +02:00
f72dccae18
Added edit invoice link to balancing sheet. Closes #8
2009-08-04 13:25:59 +02:00
f0caabfb53
Check account balance after creating a transaction.
2009-08-04 13:13:46 +02:00
benni
Robert Waltemath
Julius
davidrabel
yep
Benjamin Meichsner
sandoz
Benjamin Meichsner
root