benni
|
a787b3cf24
|
Admin/users refactored.
|
2011-06-09 22:03:27 +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
|
5bf6503a8f
|
Included new localize_input gem.
|
2011-05-20 00:19:58 +02:00 |
|
benni
|
3f133bb8c3
|
Added client side validations. Fixed shared sync.
|
2011-05-19 22:35:13 +02:00 |
|
benni
|
013637a4fc
|
Refactored shared article import. Added meta search gem.
|
2011-05-19 22:22:05 +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
|
0decbb36e1
|
Refactored article_categories.
|
2011-05-18 16:10:30 +02:00 |
|
benni
|
0b1682af7c
|
Fixed suppliers module.
|
2011-05-18 15:52:06 +02:00 |
|
benni
|
772cf87c92
|
Fixed wiki module.
|
2011-05-18 15:29:38 +02:00 |
|
benni
|
d5552059ce
|
Refactored messages modul, but refactoring is still neccessary.
|
2011-05-18 14:47:17 +02:00 |
|
benni
|
6ac04d5e19
|
Fixed foodcoop/ordergroups view.
|
2011-05-18 11:47:00 +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
|
06f2cc2007
|
Fixed and refactored foodcoop/workgroups.
|
2011-05-16 00:34:43 +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
|
79f8836da0
|
Fixed some html safe strings.
|
2011-05-15 21:17:01 +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
|
185376d53d
|
Some improved validations for task.
|
2011-05-14 16:34:10 +02:00 |
|
benni
|
8da229316c
|
Some improved validations for task.
|
2011-05-13 22:43:23 +02:00 |
|
benni
|
197516b7fc
|
Fixed language and flash divs.
|
2011-05-11 17:41:43 +02:00 |
|
benni
|
2eb714b603
|
Fixed missing js for login layout.
|
2011-05-11 15:24:34 +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
|
eab16e337e
|
Updated router. Temporarly replaced routing filter with rails internal.
|
2011-05-11 12:27:58 +02:00 |
|
benni
|
8db221ca5f
|
New validate_on/before syntax.
|
2011-05-11 11:17:02 +02:00 |
|
benni
|
2d7d0d3b94
|
Updated actionmailer classes and API.
|
2011-05-11 10:54:02 +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 |
|
benni
|
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 |
|
benni
|
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 |
|
benni
|
dcd2a514a6
|
Added duration to tasks. Annotated all models.
|
2011-05-07 20:50:39 +02:00 |
|
yep
|
383241621c
|
increased invite link lifetime from 2 days to 7 days.
|
2011-05-02 14:53:22 +02:00 |
|
benni
|
6c82d0e06a
|
Avoid setting page as parent id, which has current page as parent.
|
2011-03-09 13:36:02 +01:00 |
|
Benjamin Meichsner
|
80691c441b
|
Fixed bug on new delivery page.
|
2010-09-17 18:45:07 +02:00 |
|
Benjamin Meichsner
|
7742403bbe
|
Hide deleted stockarticles when creating new deliveries.
|
2010-07-24 20:28:37 +02:00 |
|
Benjamin Meichsner
|
f640c673de
|
Fixed bad when selecting same page as parent.
|
2010-07-08 10:57:42 +02:00 |
|
Benjamin Meichsner
|
5f51afb5ee
|
Fixed input control in balancing mode.
|
2010-07-01 16:12:02 +02:00 |
|
Benjamin Meichsner
|
fbf6a283a0
|
Fixed bug in orders index if order.ends.nil?
|
2010-06-19 12:25:35 +02:00 |
|
Benjamin Meichsner
|
db52c6e4ed
|
Fixed bug on wiki page.
|
2010-06-18 10:33:13 +02:00 |
|
Benjamin Meichsner
|
833862df93
|
Fixed bug on wiki page when an author was deleted.
|
2010-06-14 23:00:09 +02:00 |
|
Benjamin Meichsner
|
be321798a7
|
Fixed some links in tasks module.
|
2010-06-10 23:25:13 +02:00 |
|
Benjamin Meichsner
|
0e4b6107ba
|
Fixed wrong path in task form.
|
2010-06-10 12:55:06 +02:00 |
|
Benjamin Meichsner
|
74407a5912
|
Fixed paths in task-menu.
|
2010-06-01 16:18:20 +02:00 |
|
Benjamin Meichsner
|
b71e809f34
|
Fixed ajax bug on categories page.
|
2010-05-28 12:01:19 +02:00 |
|
Benjamin Meichsner
|
a8a243b5fa
|
Avoid exception on blank comments.
|
2010-05-28 11:55:12 +02:00 |
|
Benjamin Meichsner
|
3a85d4f49f
|
Fixed bug on ordergroups account managment page.
|
2010-05-28 11:50:18 +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
|
d6ee00db17
|
Fixed hard coded links in wiki pages.
|
2010-03-22 03:11:32 +01:00 |
|
Benjamin Meichsner
|
571548dfbc
|
Fixed routing bug on (ex) admin controller.
|
2010-03-22 01:58:37 +01:00 |
|
Benjamin Meichsner
|
9a54d8504c
|
Secured users session, considering foodcoop token.
|
2010-03-22 01:38:23 +01:00 |
|
Benjamin Meichsner
|
18e8a11b7d
|
Removed unnecessary config params. Improved error handling.
|
2010-03-22 01:25:24 +01:00 |
|
Benjamin Meichsner
|
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 |
|
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 |
|
Benjamin Meichsner
|
9cb367463c
|
Merge branch 'master' into routing-filter
|
2010-03-20 13:45:27 +01:00 |
|
Benjamin Meichsner
|
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 |
|
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
|
b9576dd669
|
Updated user validation. Fixed duplicates on 'nick'.
|
2010-02-16 09:53:24 +01:00 |
|
Benjamin Meichsner
|
1b9ae83496
|
Few design improvements for order pages.
|
2010-02-11 23:22:50 +01:00 |
|
Benjamin Meichsner
|
b5df80b7dd
|
Fixed bug in wiki "all pages" view.
|
2010-02-10 00:13:51 +01:00 |
|
Benjamin Meichsner
|
e93dd9e046
|
Zeige Wert der Äpfel.
|
2010-02-09 23:56:16 +01:00 |
|
Benjamin Meichsner
|
94d1a897e7
|
Fixed bug in stock orders (orderfooter commit).
|
2010-02-09 22:34:04 +01:00 |
|
Benjamin Meichsner
|
55d2976e98
|
Moved order stats and cleanup stuff into rake task.
Closes #14
|
2010-02-09 21:45:57 +01:00 |
|
Benjamin Meichsner
|
a6646d06a6
|
Fixed bug during css caching.
|
2010-02-09 21:40:02 +01:00 |
|
Benjamin Meichsner
|
48ee593d8d
|
Merge branch 'orderfooter'
|
2010-02-09 21:07:12 +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
|
164653dbfc
|
Limited page versions number to 20.
|
2009-12-01 20:20:41 +01:00 |
|
Benjamin Meichsner
|
45039bf60f
|
Replaced js article-info control with pure css.
|
2009-11-20 01:28:01 +01:00 |
|
sandoz
|
d31b40bd66
|
Show also articles to get because of tolerance.
* Closes #54
|
2009-11-15 12:44:32 +01:00 |
|
Benjamin Meichsner
|
74ed02e11e
|
Fixed broken link on start navigation menu.
Closes #53
|
2009-11-10 14:15: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
|
e4ef6556b8
|
Do not display tolerance column in stock order.
|
2009-11-01 18:57:55 +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
|
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 |
|
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
|
84610cc9a5
|
Fixed broken link. Closes #44
|
2009-10-17 18:53:01 +02:00 |
|
Benjamin Meichsner
|
0b6b5eb0b5
|
Improved noscript warning on login page.
Also add 'foodsoft' to title. closes #48
|
2009-10-17 18:42:07 +02:00 |
|
Benjamin Meichsner
|
1f218f77a0
|
Corrected message in order result. Closes #47
|
2009-10-17 18:25:33 +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
|
20c7c0ef02
|
Revert "Tasks should be default page in foodcoop module."
This reverts commit b5b27cee6e .
|
2009-10-17 11:53:17 +02:00 |
|
Benjamin Meichsner
|
b5b27cee6e
|
Tasks should be default page in foodcoop module.
|
2009-10-16 21:10:52 +02:00 |
|
Benjamin Meichsner
|
cf9fa69ac2
|
Minor improvements to task show view.
|
2009-10-16 21:06:55 +02:00 |
|
Benjamin Meichsner
|
d0e04a05ec
|
Removed unecessary weekly task templates.
|
2009-10-16 20:45:20 +02:00 |
|
Benjamin Meichsner
|
f34c307540
|
Merge branch 'master' of git@github.com:bennibu/foodsoft
|
2009-10-12 14:44:48 +02:00 |
|
Benjamin Meichsner
|
42d85c63be
|
Allow to have equal article and stockarticle.
* Modified validation to allow the same name.
|
2009-10-12 14:42:31 +02:00 |
|
sandoz
|
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 |
|
sandoz
|
305a4ac895
|
Don't show action "Create invoice" for stock order
|
2009-10-05 13:36:57 +02:00 |
|
Benjamin Meichsner
|
c3ca3e23f9
|
Hide redirected pages in collection for parent ids.
|
2009-09-28 17:22:24 +02:00 |
|
Benjamin Meichsner
|
65e41efc18
|
Fixed problems when deleting redirected pages.
|
2009-09-28 17:18:09 +02:00 |
|