Commit graph

369 commits

Author SHA1 Message Date
Benjamin Meichsner
35dbb58e67 Damn'it. Forget to update environment file after rails update. 2013-02-17 21:19:03 +01:00
Benjamin Meichsner
6a0bab58f1 Temporairly deactivated ruby spec in Gemfile.
Background. Our bundler is too old on the production server and
I don't want to break other applications.
2013-02-17 21:01:08 +01:00
Benjamin Meichsner
ccdf3c0bf1 Updated rails to 2.3.17. 2013-02-17 21:00:12 +01:00
bennibu
35ec54b4f4 Merge pull request #80 from balkansalat/master
Session store, order creator, mailing list wiki link, task validation
2012-12-12 09:01:22 -08:00
Robert Waltemath
8c0af4bd87 Documented config/initializers/session_store.rb 2012-11-14 09:52:32 +01:00
Robert Waltemath
2bd52b9270 Corrected config hash index to ':mailing_list_subscribe' 2012-11-13 10:18:40 +01:00
Robert Waltemath
a8d61d2591 Removed environment.rb to avoid overwriting it on update. 2012-11-13 10:12:06 +01:00
Robert Waltemath
c032fdca6e Merge remote-tracking branch 'upstream/master' 2012-11-13 08:55:50 +01:00
Julius
d086fe7cc7 Fix task validation again #16; mark assignment validation TODO 2012-11-12 21:31:04 +01:00
Julius
e561ddb064 Fix task validation #16 2012-11-12 20:14:06 +01:00
Julius
95efe554fc Add another option for mailing list subscription tip 2012-11-12 18:08:47 +01:00
Julius
1e725872da Add advise to modify secret token 2012-11-12 14:39:38 +01:00
Julius
c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +01:00
Julius
69c4fc5817 Add created_by_user_id to Order table 2012-11-12 11:37:26 +01:00
Julius
cecad7db13 make it run... 2012-11-09 23:54:45 +01:00
benni
ee3da51ad3 Fixed bug in new stockit article form. 2012-10-24 12:19:53 +02:00
benni
e9383e0d17 Remove searching shared articles by list.
This is necessary to go with newest fixes in sharedlists app.
2012-10-13 22:19:01 +02:00
benni
8c3d046cf4 Recommend using rails3 branch for beginners. 2012-08-25 12:26:20 +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
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
ca68091914 Changes during bundler update... 2012-02-24 10:49:33 +01:00
bennibu
a9969b840a Merge pull request #66 from metawilm/master
Database initialization commands
2011-06-05 08:45:28 -07:00
Willem Broekema
c7ff6e3b90 Add rake comamnds to initialize database 2011-05-31 05:33:54 -07:00
benni
e589ad5274 Updated rails i18n translations. 2011-05-13 22:44:18 +02:00
benni
8da229316c Some improved validations for task. 2011-05-13 22:43:23 +02:00
benni
a689bdd5f5 Removed some deprecation warning from routing filter. 2011-05-11 00:58:53 +02:00
benni
bea145f33d Upgrade rails to 2.3.11. 2011-05-10 23:29:36 +02:00
benni
46450cebef New annotation, because of db switch to mysql.
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
benni
c2496aa4fd Consider task duration in ordergroup stats.
* Also added duration to task template in workgroup task_duration.
2011-05-07 21:54:00 +02:00
benni
be85296ddb Enabled hirb for better console formatting. 2011-05-07 21:14:11 +02:00
benni
dcd2a514a6 Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
benni
face58ebef Updated README_DEVEL. 2011-05-06 20:38:39 +02:00
benni
04293c8dcf Added sqlite gem to support sqlite3 databases. 2011-05-06 20:37:48 +02:00
benni
1e49a44a92 Added seeds.rb for an easy start. 2011-05-06 20:23:33 +02:00
benni
50a45cfa7d Updated config/boot.rb to rails 2.3.10 2011-05-06 20:07:54 +02:00
benni
971e9f145a Ignored tmp, rubymine project files and other stuff. 2011-05-06 19:55:34 +02:00
benni
0df0519947 Upgrade to rails 2.3.10. 2011-05-06 19:52:50 +02:00
bennibu
dc1d545829 Merge pull request #65 from yep/master.
increased invite link lifetime from 2 days to 7 days.
2011-05-02 07:36:24 -07:00
yep
383241621c increased invite link lifetime from 2 days to 7 days. 2011-05-02 14:53:22 +02:00
benni
6c82d0e06a Avoid setting page as parent id, which has current page as parent. 2011-03-09 13:36:02 +01:00
benni
20b7db306b Implemented bundler. No more confusiong with gem versions! 2011-01-30 22:59:32 +01:00