Commit Graph

28 Commits

Author SHA1 Message Date
Patrick Gansterer 19efd68c5f
Add support for ActiveStorage (PR #852) 2022-01-31 08:44:53 +01:00
wvengen 0363f2dadc Improve Docker setup (PR #497) 2017-10-01 13:57:36 +02:00
wvengen fd8b9ac19d expand gitignore [ci skip] 2014-07-09 14:26:49 +02:00
wvengen 24b0628825 add yard documentation config 2014-06-23 17:51:18 +02:00
Robert Waltemath bf8ef2f45c Ignore bundler config. 2014-01-03 13:54:15 +01:00
wvengen 64a597c689 use i18n-js 2013-10-04 15:01:10 +02:00
Benjamin Meichsner 27c006443f (git)Ignore localeapp config. 2013-09-02 13:33:25 +02:00
Julius a4474213be tell git to ignore secret_token.rb 2013-01-12 16:04:00 +01:00
benni 344abf5a26 Deployment stuff. Ignore capistrano. Faster precompiling. 2012-12-22 18:38:49 +01:00
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
2012-12-14 18:10:46 +01:00
Julius cecad7db13 make it run... 2012-11-09 23:54:45 +01:00
Robert Waltemath f6cc41aad9 Told git to ignore generated doc. 2012-10-18 09:58:53 +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 5849473db4 Do not git ignore ruby version managers. Set ruby 1.9.3 2012-07-20 15:41:53 +02:00
benni 7cf0308adb Added rbenv version file to change ruby version. 2012-07-20 14:55:52 +02:00
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