wvengen
|
c37ed74942
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/foodcoop/users/_users.html.haml
|
2013-10-29 19:15:52 +01:00 |
|
wvengen
|
64a597c689
|
use i18n-js
|
2013-10-04 15:01:10 +02:00 |
|
wvengen
|
e4f0a1e3ed
|
start of making nickname optional
|
2013-09-20 22:40:13 +02:00 |
|
wvengen
|
d397132f7b
|
be safe even with locale string
|
2013-07-07 02:31:42 +02:00 |
|
wvengen
|
8080cd6b7e
|
pass locale to datepicker, use gem for that
|
2013-07-07 01:47:22 +02:00 |
|
wvengen
|
39812bef99
|
finish layouts i18n, use help url from config, use html language from locale
|
2013-02-05 12:11:29 +01:00 |
|
benni
|
f6ff422405
|
Fixed missing line breaks in haml email templates.
|
2012-12-30 16:24:36 +01:00 |
|
benni
|
ecc31641aa
|
Changed header to copy old foodsoft style.
|
2012-11-24 15:23:12 +01:00 |
|
benni
|
e1cb866935
|
Remove html5 support for IE Browsers.
|
2012-11-24 13:53:19 +01:00 |
|
benni
|
f4f10b1e4c
|
Introduced actionbar. Some fixes for balancing page.
|
2012-11-12 13:13:01 +01:00 |
|
benni
|
0236fb5a60
|
Fixed finance module to work with bootstrap design.
|
2012-11-10 16:44:05 +01:00 |
|
benni
|
f30e57dd49
|
Fixed articles views.
|
2012-10-19 01:12:47 +02:00 |
|
benni
|
552c553b77
|
Fixed admin, orders, wiki views. Converted all erb to haml.
|
2012-10-15 21:19:17 +02:00 |
|
benni
|
1708df3f6c
|
Fixed login, new_password and invitation views.
|
2012-10-08 11:51:56 +02:00 |
|
benni
|
f20ae890dd
|
Added twitter bootstrap layout. Adapt home page.
|
2012-10-06 17:14:57 +02:00 |
|
benni
|
29a6cd8b62
|
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
|
2012-09-30 21:15:55 +02:00 |
|
benni
|
ec2e761e7f
|
Fixed multi coop routing and changed config accessors.
|
2012-08-24 19:52:38 +02:00 |
|
benni
|
5fb0bc2444
|
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
|
2012-08-24 11:11:40 +02:00 |
|
benni
|
c936813967
|
Some fixes for mailer module.
|
2012-08-17 19:08:02 +02:00 |
|
benni
|
6f7682d6a0
|
Fixed new user invite.
|
2012-08-06 12:00:40 +02:00 |
|
benni
|
eb4705857b
|
Ordering refactored: Made everything RESTful.
|
2011-06-19 15:30:33 +02:00 |
|
benni
|
ea6348bc5c
|
Refactored finance/ordergroups|transactions module.
|
2011-06-09 21:35:05 +02:00 |
|
benni
|
3f133bb8c3
|
Added client side validations. Fixed shared sync.
|
2011-05-19 22:35:13 +02:00 |
|
benni
|
9388e918a7
|
Implemented fancy box for ajax forms. Refactored articles modul.
|
2011-05-18 17:37:10 +02:00 |
|
benni
|
c87ead8da9
|
Added meta where and jquery observe field. Fixed members view.
|
2011-05-15 23:43:23 +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
|
03d84aed1d
|
Added simple form for easier form building.
|
2011-05-14 17:06:32 +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
|
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
|
7067294133
|
Fixed broken links/paths.
|
2010-05-25 23:36:05 +02:00 |
|
Benjamin Meichsner
|
571548dfbc
|
Fixed routing bug on (ex) admin controller.
|
2010-03-22 01:58:37 +01:00 |
|
Benjamin Meichsner
|
18e8a11b7d
|
Removed unnecessary config params. Improved error handling.
|
2010-03-22 01:25:24 +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
|
a6646d06a6
|
Fixed bug during css caching.
|
2010-02-09 21:40:02 +01:00 |
|
Benjamin Meichsner
|
7a77d1aa66
|
Caching of css and javascript for better speed results.
|
2010-02-09 21:06:24 +01: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
|
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
|
eca24d30f2
|
Show up tabnav link for wikipages.
|
2009-09-28 15:05:00 +02:00 |
|
Benjamin Meichsner
|
fd99125136
|
Temporarly removing of wiki tab.
|
2009-08-15 17:38:10 +02:00 |
|
Benjamin Meichsner
|
e75a42d509
|
Merge branch 'wiki'
|
2009-08-15 17:24:08 +02:00 |
|
Benjamin Meichsner
|
d7b65a304e
|
Removed new page link in wiki menu.
|
2009-08-12 19:02:03 +02:00 |
|
Benjamin Meichsner
|
a8c93c08b7
|
Added parent-child relationship to pages to visualize a breadcrump and subpages.
|
2009-08-12 18:41:25 +02:00 |
|
Benjamin Meichsner
|
3656dac3cb
|
Fixed display bug with new ajax_box.
|
2009-08-11 19:49:31 +02:00 |
|
Benjamin Meichsner
|
ad94006978
|
Hide ordergroup link for non ordergroup members.
|
2009-08-05 11:49:07 +02:00 |
|
Benjamin Meichsner
|
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 |
|