Commit graph

2380 commits

Author SHA1 Message Date
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
fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni
f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni
ef2ce98e46 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
benni
9ac747e9f3 Updated rails to 3.0.16 2012-07-27 18:12:10 +02:00
benni
8a74e7d77f Removed annoate and hirb Gemfiles.
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni
af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni
dc0d1b3e46 Fixed bug in apples stats. 2012-07-22 21:12:53 +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
7c07fa1b54 Bumped new version: 3.1.1 2012-07-20 15:03:22 +02:00
benni
7cf0308adb Added rbenv version file to change ruby version. 2012-07-20 14:55:52 +02:00
bennibu
7e77d7804c Merge pull request #72 from davidrabel/global-article-update
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-20 01:37:27 -07:00
davidrabel
cda3c37e20 Umlaute eingefügt 2012-07-19 15:37:17 +02:00
davidrabel
2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. 2012-07-18 22:16:08 +02:00
benni
7b7d50a235 Added database indexes. Performance boost for balance page.
Conflicts:

	db/schema.rb
2012-06-26 23:27:25 +02:00
benni
524d9b7c7a Fixed rake task to create weekly tasks. 2012-06-26 23:18:55 +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
f1b71a5588 Minor refactoring in stats partial. 2012-06-24 21:43:36 +02:00
benni
4b6499d529 Ignore some more config files. 2012-06-24 11:04:29 +02:00
benni
1d6a31b9d4 Minor css changes due to haml/sass update. 2012-06-24 11:02:35 +02:00
benni
7d54a416df Allow changing number of automaticly created next weekly tasks. 2012-06-24 11:01:16 +02:00
benni
467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni
218f40eb8d Added database indexes. Performance boost for balance page. 2012-05-28 10:41:33 +02:00
benni
6bd4bbec86 Deactivated broken links in balancing. 2012-05-12 11:18:46 +02:00
benni
c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00
benni
da8fd1d72a Ignore rbenv config. 2012-04-20 18:34:20 +02:00
benni
b295f62322 Updated finance/invoices 2012-04-20 18:33:47 +02:00
benni
4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni
ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni
5636e200dc Moved some plugins from vendor/plugins into Gemfile. 2012-04-15 19:13:38 +02:00
benni
ca68091914 Changes during bundler update... 2012-02-24 10:49:33 +01:00
benni
8141c06fa5 Some ajax loading callback. 2011-06-20 00:48:05 +02:00
benni
b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
benni
88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni
38b5dcba1f Refactored ordering part two. Integrated stock order. 2011-06-19 19:56:04 +02:00
benni
eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni
45e0048490 Minor refactoring for ordering js data. 2011-06-13 16:45:37 +02:00
benni
f3773314a7 Fixed ordering view. 2011-06-13 16:23:56 +02:00
benni
adbe93f39e Fixed open_orders partial. 2011-06-13 15:26:06 +02:00
benni
5b2df07378 Fixed ordering before filter. 2011-06-10 13:58:50 +02:00
benni
afb2c26ab3 Fixed orders form. 2011-06-10 13:53:51 +02:00
benni
9ad93e9c06 Catch exceptions when deleting ordegroups. 2011-06-10 13:33:10 +02:00
benni
a27c0c67fc Fixed some typos. 2011-06-10 13:31:01 +02:00
benni
172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni
6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni
689cfcfe01 Fixed items_per_page helper. 2011-06-10 12:03:32 +02:00
benni
a47d4b1f0e Unobtrusive pagination_links_remote 2011-06-10 11:43:56 +02:00
benni
c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00