036bc10282
Hide/show unavailable articles via js.
2009-10-17 20:33:36 +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
7c192bbad3
Redirect /pages/id to /wiki/permalink
2009-09-28 15:31:20 +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
7a23ec1cb1
Updating error messages.
2009-09-07 13:38:30 +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
bbe8caa98a
Tweeked a bit the wiki layout.
2009-08-21 23:09:38 +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
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
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
aa5166bb16
Hübschified "Schnelle Formatierungshilfe"
2009-08-15 15:08:02 +02:00
9516f349ce
Improved wikipage sidebar.
2009-08-12 18:55:36 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +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
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
d2efe64343
Fixed display bug in menu when using IE. Closes #15
2009-06-19 21:38:51 +02:00
2660d86b89
Added table of contents to wiki page.
2009-05-20 14:06:40 +02:00
7de45543c4
Added page-preview feature to wiki module.
2009-05-20 12:42:01 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
7e4409bc11
Few improvements to wiki module.
2009-05-07 18:15:14 +02:00
582e4b1c1b
Beautified navigation on top of page.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:36 +08:00
7e0d65a413
Updated Error Pages. Added page for maintenance.
2009-03-24 17:57:34 +01:00
de105bea70
SASS: Changed padding of input, textacrea, select
...
* At membership list, the layout was slightly broken by the top-padding
* of an input-element after a div with a float:left.
2009-03-22 15:03:50 +01:00
b189bc31d0
Small hack to make button "+" and "-" to be same size.
...
* It would be better to put a specific class for de/increase buttons.
* Right now just adding min-width to input globally in SASS.
2009-03-22 14:16:04 +01:00
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
c04819e8c4
First parts of new 'web-app-theme'.
2009-02-18 11:41:03 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
936e6ef69a
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
2009-01-16 16:19:26 +01:00
e8d55e50c0
Complete refactoring of messaging module. From now messages are saved only once and send afterwards via a the 'send_emails'-rake-task.
2009-01-15 18:26:37 +01:00
2d5dc03b90
Groups are now workgroups. First part of moving groups-logic into admin-namespace.
2009-01-13 19:01:56 +01:00
1d85b880f2
Created namespace 'finance' and moved invoices into it.
2009-01-10 19:36:58 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
Benjamin Meichsner
sandoz
sandoz