9badaca2f3
fix wiki page creation
2013-11-25 16:33:12 +01:00
5adb25caf5
copy wiki strings to plugin area
2013-11-19 18:33:54 +01:00
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
bb5a67033d
Merge pull request #194 from foodcoop-adam/plugin-move
...
Better support for plugins (engines) + move wiki to plugin
2013-11-12 03:46:15 -08:00
94a9603488
avoid running specs twice in test environment
2013-11-07 21:17:53 +01:00
fd3aa7ebc9
move dependency to wiki plugin
2013-11-06 13:43:04 +01:00
841cdad010
add missing routes to wiki plugin
2013-11-02 10:57:37 +01:00
fa0102fed5
fix gemspec after file rename
2013-11-01 20:32:30 +01:00
f507efcdb3
update foodsoft_wiki README [ci skip]
2013-10-30 09:51:24 +01:00
ea71d691e9
update foodsoft_wiki README
2013-10-30 09:50:06 +01:00
c3068c8d51
move foodsoft_wiki db migration to plugin
2013-10-30 09:43:38 +01:00
70c12b7c1f
move wiki functionality to plugin
2013-10-29 22:42:06 +01:00
6d0ba985aa
first version of the foodsoft_wiki plugin
2013-10-29 22:22:24 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
6632f5ed75
workaround migration bug introduced by 975bcdec3a
2013-09-30 11:01:15 +02:00
975bcdec3a
Avoid send messages so STDOUT in rake silen mode.
2013-09-25 11:57:22 +02:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
4c27a98e06
Fixed failing asset precompiling in production mode.
2013-09-18 18:19:41 +02:00
707f487128
update spec gems to make tests work again
2013-09-07 01:34:34 +02:00
7de57715f2
Merge branch 'master' into tests-rspec
...
Conflicts:
Gemfile
2013-09-07 01:11:24 +02:00
3792069fda
Fxed encoding error when uploading files with non-ascii characters.
2013-09-02 16:46:44 +02:00
a1d85d0dd7
Changed API of multicoops rake tasks. Use TASK=sample:task
...
Fixed running rake task without multicoops wrapper.
2013-09-02 14:19:44 +02:00
bb20e9abea
Merge branch 'master' into tests-rspec
...
Conflicts:
Gemfile
Gemfile.lock
2013-07-24 21:25:36 +02:00
6da2fdee6d
add travis-ci configuration
2013-07-24 13:21:52 +02:00
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
a7fd7a7936
Removed obsolete code of old workgroup-centric weekly task concept.
2013-06-22 18:14:11 +02:00
2c1d9aeb9c
finishes i18n set_locale with user settings
2013-06-14 02:39:25 +02:00
46b07a6136
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
...
Conflicts:
config/locales/de.yml
2013-06-12 10:00:11 +02:00
c8c810a0a4
added user setting to set_locale
2013-06-07 19:05:28 +02:00
0061e45198
removes routes locale constrain and fixes some bugs
2013-06-06 04:29:53 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
47405b5b19
fixes locales issue
2013-06-06 03:18:02 +02:00
c2c1961bd0
adds i18n support to routes and application controller; default_locale is set to :en
2013-05-31 18:42:28 +02:00
c42c00b5f1
adds mailcatcher to foodsoft:setup_development
2013-05-29 12:35:16 +02:00
21c7fa40c1
adds a foodsoft:setup_development rake task
2013-05-26 14:02:16 +02:00
d0c74b394e
i18n and translate page number text too
2013-05-20 17:14:42 +02:00
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
1fe141175c
Fixed multicoops and resque rake tasks.
2013-01-07 13:44:46 +01:00
9db5a2fa14
Fixed apple calcualtion issue on fresh coop installations.
2012-12-30 15:32:22 +01:00
9e228085df
Added rake tasks for restarting resque workers.
2012-12-30 14:47:02 +01:00
9ad77f5256
Add rake task helper for single coop.
2012-12-24 12:50:37 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +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
1cdb9e8501
Outlined new concept for multiple periodically recurring tasks ( #3 ).
2012-11-28 10:13:54 +01:00
fc1c173718
Fixed articles module.
2012-10-28 18:03:50 +01:00
f20ae890dd
Added twitter bootstrap layout. Adapt home page.
2012-10-06 17:14:57 +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
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
ea547c84f0
Added rake task to execute every rake task for every foodcoop.
2012-08-27 08:24:25 +02:00
ec2e761e7f
Fixed multi coop routing and changed config accessors.
2012-08-24 19:52:38 +02:00
af3875d46b
Refactored order finishing. Delay user notifications.
2012-08-24 14:24:36 +02:00
524d9b7c7a
Fixed rake task to create weekly tasks.
2012-06-26 23:18:55 +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
7d54a416df
Allow changing number of automaticly created next weekly tasks.
2012-06-24 11:01:16 +02:00
1e33411516
refactored some js stuff. Fixed forms in article modul.
2011-05-19 19:49:37 +02:00
03d84aed1d
Added simple form for easier form building.
2011-05-14 17:06:32 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +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
a689bdd5f5
Removed some deprecation warning from routing filter.
2011-05-11 00:58:53 +02:00
1e49a44a92
Added seeds.rb for an easy start.
2011-05-06 20:23:33 +02:00
00d9f060cc
Merge branch 'routing-filter'
2010-05-25 23:16:49 +02:00
d6ee00db17
Fixed hard coded links in wiki pages.
2010-03-22 03:11:32 +01:00
84699a9052
Avoid task exit when deliver with bad emails addresses.
2010-03-20 23:07:55 +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
55d2976e98
Moved order stats and cleanup stuff into rake task.
...
Closes #14
2010-02-09 21:45:57 +01:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
4ba612aa5b
Fixed bug in new rake task.
2009-08-14 13:50:05 +02:00
332fc831c8
Send warn messages for unassigned tasks 7 days before due date.
2009-08-12 21:47:07 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
58ce422ef7
Reduced number of generated weekly tasks.
2009-08-11 18:39:21 +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
5d9385cde4
Changed wiki parser to wikicloth.
...
* Temporarly removing of TOC.
2009-08-11 14:30:35 +02:00
ce2156d75f
Send order-finish-notifications in background.
2009-03-11 16:58:31 +01:00
3ea8d5a2ef
Refactoring of message system.
2009-02-18 01:06:35 +01:00
67743cd014
Implement notification for upcoming tasks via a daily fired rake-task.
2009-02-10 15:07:47 +01:00
e16bebd042
Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'.
2009-02-01 20:56:23 +01:00
fc45345e0d
Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results)
2009-01-20 19:37:15 +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
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
wvengen
wvengen
Benjamin Meichsner
Robert Waltemath
Manuel Wiedenmann
Benjamin Meichsner
Benjamin Meichsner