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
116b1c4ed9
Fixed broken link on startpage for non ordergroup members.
2009-08-04 13:05:37 +02:00
ce375e1637
Fixed bad link in tasks/workgroups. Closes #23
2009-08-04 12:57:19 +02:00
68f8d00930
Fixed bug in stats on a fresh installation.
2009-08-04 12:32:25 +02:00
d9d800b41f
Fixed bug in stats modul. Consider missing ordergroup.
2009-08-02 20:04:54 +02:00
6659fe90f3
Merge branch 'stats'
2009-08-02 19:57:19 +02:00
4545a5f17c
Fixed wrong url during last commits.
2009-08-02 19:56:08 +02:00
178fba7b30
Create restful invites controller and ajaxified the workflow.
2009-08-02 19:41:09 +02:00
5cf75ee32a
Moved foodcoop/members into new foodcoop/users restful controller.
2009-08-02 19:01:45 +02:00
0d910dfbbd
Moved foodcoop/workgroups into new namespace foodcoop. Closes #20
2009-08-02 18:42:52 +02:00
1a8026c5a7
Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful.
2009-08-02 18:12:13 +02:00
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
709425855e
Added validation for unit_quantity and localization for article attributes.
2009-07-21 15:09:55 +02:00
ecc1176020
Member search now includes the attribute 'nick'. Closes #18
2009-07-20 19:29:24 +02:00
d2efe64343
Fixed display bug in menu when using IE. Closes #15
2009-06-19 21:38:51 +02:00
55729e20f9
Create a redirect when editing the title of a page.
2009-06-11 23:51:26 +02:00
434fc4b2ff
Change wiki-parser again. Now wikitext is used.
2009-06-11 22:40:56 +02:00
eddf20b063
Added TOC (Table of contents) for wiki pages.
2009-06-11 17:59:21 +02:00
255a4cd6c7
Fixed problems in interacting of acts_as_versioned and optimistic locking.
2009-05-20 15:26:53 +02:00
2660d86b89
Added table of contents to wiki page.
2009-05-20 14:06:40 +02:00
d371839eba
Prefer textile over markup because markup doesn't support any tables. bähh.
2009-05-20 13:03:58 +02:00
7de45543c4
Added page-preview feature to wiki module.
2009-05-20 12:42:01 +02:00
0fb8ee214f
Added helpful links to submenu.
2009-05-20 11:54:18 +02:00
2af35e55bc
Improved stockit overiew. Fixed article ordering by suppliers.
2009-05-17 16:50:13 +02:00
0db7724f85
Hide StockArticles with negeative stock amount in new order. Closes #9
2009-05-17 16:43:48 +02:00
27ff4bbd9b
Removed price history for StockArticle.
2009-05-17 16:26:31 +02:00
e59ce8c313
Added deliveries counter to suppliers overview.
2009-05-17 16:18:14 +02:00
a8e35bd421
Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery.
2009-05-17 16:11:39 +02:00
43fc7b06f8
Upgrade foodsoft to rails 2.3.2.
2009-05-17 15:01:36 +02:00
c03f3da21a
Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items.
2009-05-15 17:58:02 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
7ba6bc3680
Added optimistic locking to wiki pages.
2009-05-15 13:54:42 +02:00
f83d2659de
Added better routing for wiki-root-path.
2009-05-15 13:53:45 +02:00
0d11e68bad
Added syntax help to wiki form.
2009-05-13 17:32:43 +02:00
8bfa83118c
Update ordergroup values after deleting an ordered article. Closes #11
...
* TODO: Implement callbacks to avoid such mistakes.
2009-05-13 13:04:39 +02:00
8b8a7c08cd
Fixed bug in ArticlePrice history. Closes #12
2009-05-13 12:52:35 +02:00
7e4409bc11
Few improvements to wiki module.
2009-05-07 18:15:14 +02:00
dafbb077b6
wiki-syntax: Use markup instead of textile.
2009-05-07 17:59:34 +02:00
4c57c57827
Changed default order of articles on balancing page.
2009-05-04 17:56:52 +02:00
e8fa912e8c
Removed contact data from ordergroups-page. Added names of users and date of last order.
2009-05-04 17:06:08 +02:00
ecc0340a70
Added message-link and notes to new foodcoop/ordergroups page.
2009-04-20 14:33:24 +02:00
a3fbc2d37b
Merge branch 'master' of git@github.com:bennibu/foodsoft
2009-04-20 14:13:47 +02:00
4db8184daa
Fixed some bugs in orders lists. Closes #3
2009-04-20 14:11:11 +02:00
e71cacfe50
Fixed typing error and changed default foodcoop tab to /tasks
2009-04-20 13:58:22 +02:00
fac0c05a46
Hide private messages on start page.
2009-04-20 13:54:39 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02:00
Benjamin Meichsner
Benjamin Meichsner
sandoz
Benjamin Meichsner
root