Commit graph

2761 commits

Author SHA1 Message Date
Reinier Balt
64d3e802f2 fix #1406. fix #1431. set recurring_period first before setting other attributes 2013-06-19 16:42:35 +02:00
Reinier Balt
56b884055f fix #1270. if start-from fits the recurrence pattern, the first todo should use the start-from date
this is use-case 2 mentioned in the ticket.
2013-06-11 23:38:30 +02:00
Reinier Balt
3a2af7caf2 update CHANGELOG [ci skip] 2013-06-11 16:30:32 +02:00
Reinier Balt
be1a9528d5 move the two toggle links in top-right to view menu 2013-06-11 16:13:46 +02:00
Reinier Balt
7084c11263 fix failing tests 2013-06-11 15:36:27 +02:00
Reinier Balt
07de6a8358 fix expiration test. it was missing a rendering 2013-06-11 15:24:20 +02:00
Reinier Balt
0a57a68a87 Project and context view can now be grouped by context and project (using view menu) 2013-06-11 11:12:21 +02:00
Reinier Balt
591e20c9f1 update gems 2013-06-11 11:11:40 +02:00
Reinier Balt
9c56416dcb Merge pull request #184 from mattr-/cucumber-login-backdoor
Move the expire_session route
2013-06-10 21:52:25 -07:00
Matt Rogers
931791edfd Move the expire_session route
It's now in the cucumber login helper.
2013-06-10 14:30:12 -05:00
Reinier Balt
0a10a2050b Merge pull request #183 from mattr-/cucumber-login-backdoor
Add login backdoor to speed up the cucumber test suite
2013-06-09 21:49:00 -07:00
Reinier Balt
0e8552ac4e fix #1273. Used the wording suggested in this ticket. 2013-06-05 16:58:52 +02:00
Reinier Balt
b6bf21987d add new rvm dotfiles to gitignore 2013-06-05 16:30:03 +02:00
Matt Rogers & Katrina Owen
2c5aff3b36 Add login backdoor to speed up the cucumber test suite 2013-06-04 19:39:06 -05:00
Reinier Balt
651e45d389 merge i18n keys to better support fr locale and update en, fr and nl locale for the change
es was updated by tolk, but no changes in content
2013-06-04 11:47:47 +02:00
Reinier Balt
b6e110c917 fix #1422. Changing default tags of a project is now remembered
when not updating the whole page
2013-06-04 10:50:42 +02:00
Reinier Balt
ee9951403e fix #1419 for master too: do not show new todo that was added with show_from set 2013-06-04 10:31:29 +02:00
Heraldo Esquiche
f8300de7df Update es.yml
manually merged with 2.3devel
2013-06-04 10:19:36 +02:00
Reinier Balt
a8af880647 fix #1417. We now handle unblocking a todo that is part of a hidden project or context 2013-06-04 10:07:02 +02:00
Reinier Balt
2921746409 fix manual merge error 2013-06-03 15:21:19 +02:00
Reinier Balt
02d4afb724 fix #1429 by correctly handling tags with dots
This was a very old regression. This used to work before the rails 3.2 upgrade... Added tests
to prevent future unnoticed breakage
2013-06-03 15:20:13 +02:00
Reinier Balt
b87326acd7 update cs and he locales too
tolk:import did not work correctly because my tolk tables in mysql were in latin1, not in utf-8
after changing my tables and columns to utf-8 I was able to import he and cs locale correctly 
and regenerate
2013-05-27 15:47:08 +02:00
Reinier Balt
301af365a3 update nl locale and regenerate locales for de, es and fr
cs and he cannot be regenerated because some or all characters are not imported by Tolk
2013-05-27 14:36:50 +02:00
Reinier Balt
08282bf990 Merge pull request #180 from Lem/master
Date format fix in german locales
2013-05-25 14:18:55 -07:00
Thorben Went
f2e08ab65c Fix date format in german locales. Bug will result in defect datepicker.
See ticket #1427 on assembla
2013-05-18 10:52:51 +02:00
Reinier Balt
d1de2998de ignore: trying to find issue on failing scenario on Travis 2013-05-11 13:47:33 +02:00
Reinier Balt
0d0b36de29 remove duplication in feedlist controller 2013-05-11 10:49:38 +02:00
Reinier Balt
cdfb65d529 remove duplication of all_done_todos and done_todos in project and context container 2013-05-11 10:38:34 +02:00
Reinier Balt
38057054ab sync docs with 2.2 2013-05-09 16:28:40 +02:00
Reinier Balt
101268f504 Introduce #onsite_redirect_to helper for onsite redirects
Prefer #onsite_redirect_to to #redirect_to when using untrusted input (e.g. cookies) in the redirect destination

Thanks @brynary
2013-05-07 09:41:48 +02:00
Reinier Balt
78f81ed29f Do not symbolize arbitray locale params
* Validate locale is valid before assigning it
* Don't convert invalid locales to symbols (creates DoS risk)

thanks @brynary
2013-05-07 09:29:47 +02:00
Reinier Balt
c6e526127c Use setting from stie.yml instead of hardcoded secret token
Fallback to randomly generated token, which is fine for development and test mode. (Sessions will be invalidated when the server reboots)

Thanks @brynary
2013-05-07 09:21:22 +02:00
Reinier Balt
0cc41bda87 Disable #yaml_import action for now
This was dead code anyway

thanks @brynary
2013-05-07 09:07:57 +02:00
Reinier Balt
7efb155928 fix regression 2013-05-05 20:54:12 +02:00
Reinier Balt
ccdaae038b small refactorings 2013-05-05 20:32:32 +02:00
Reinier Balt
26a27e5cfe increase test coverage of some models 2013-05-04 15:22:29 +02:00
Reinier Balt
80ed0d2cef fix failing scenario caused by different aasm semantics
also switch to css selector to hopefully fix the failure on travis
2013-05-04 14:12:00 +02:00
Reinier Balt
89cdfbc606 fix failing tests on ruby 1.9.3
funny, this is the first one not failing on 2.0.0 but failing on 1.9.3. Thanks for Travis!
2013-05-04 13:44:45 +02:00
Reinier Balt
5cfa115cdc small refactorings
fix passing params in use of _collection
2013-05-03 21:54:03 +02:00
Reinier Balt
f891ee86fe fix clearing show_from fails
caused by slightly different (better) workings of aasm
2013-05-03 19:28:26 +02:00
Matt Rogers
883ea2b968 Move Project#create_from_todo to its own class
The point of this is to keep as many things out of the ActiveRecord
objects as possible and use them as just a thin database abstraction
layer.
2013-05-02 22:30:24 -05:00
Reinier Balt
18883c6ecc Merge pull request #179 from C-Otto/master
Typo
2013-05-01 14:01:24 -07:00
Carsten Otto
929ea3027f typo 2013-05-01 16:36:23 +02:00
Matt Rogers
55eb7b818c Revert "Use an attr_reader for attributes"
This reverts commit 6376bd7ef6.
2013-04-30 23:02:54 -05:00
Matt Rogers
49886b1bd3 Revert "Cache the project and context names"
This reverts commit 610152b8dd.
2013-04-30 23:01:46 -05:00
Matt Rogers
c1597a7751 Rename to_xml_params to todo_xml_params 2013-04-30 22:52:22 -05:00
Matt Rogers
8fe343cccc Push to_xml_params down to ApplicationController 2013-04-30 22:50:32 -05:00
Matt Rogers
98b188d1df Add tests for the ICS and XML views and fix them up 2013-04-30 20:38:10 -05:00
Matt Rogers
ebd182695d remove the calendar from TodosController 2013-04-30 20:35:13 -05:00
Matt Rogers
83273ac342 add the before filter configuration back 2013-04-30 20:19:27 -05:00