benni
|
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 |
|
benni
|
4b6499d529
|
Ignore some more config files.
|
2012-06-24 11:04:29 +02:00 |
|
benni
|
da8fd1d72a
|
Ignore rbenv config.
|
2012-04-20 18:34:20 +02:00 |
|
benni
|
ca15bb1102
|
Include session_store in git repo, but not the secret token.
|
2011-05-14 16:51:10 +02:00 |
|
benni
|
971e9f145a
|
Ignored tmp, rubymine project files and other stuff.
|
2011-05-06 19:55:34 +02:00 |
|
Benjamin Meichsner
|
d11c619c82
|
Removed session key from version control.
* Maybe you have to delete your cookies after pulling this commit.
|
2010-03-20 02:46:06 +01:00 |
|
Benjamin Meichsner
|
7a77d1aa66
|
Caching of css and javascript for better speed results.
|
2010-02-09 21:06:24 +01:00 |
|
Benjamin Meichsner
|
8912dbaea0
|
Ignore vim temporary files.
|
2009-09-05 21:08:35 +02:00 |
|
Benjamin Meichsner
|
6202e05841
|
Last part of order refactoring. Now order_article create/update is possible.
|
2009-02-09 20:12:56 +01:00 |
|
Benjamin Meichsner
|
96442477d1
|
Fixed broken links in tasks-module. Translated some views into german.
|
2009-02-06 20:51:14 +01:00 |
|
Benjamin Meichsner
|
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 |
|
Benjamin Meichsner
|
5b9a7e05df
|
Initial commit of foodsoft 2
|
2009-01-06 11:49:19 +01:00 |
|