Reinier Balt
4a485558e2
Merge branch 'master' into rails4
...
Conflicts:
Gemfile.lock
config/routes.rb
2013-06-17 09:25:02 +02:00
Reinier Balt
7084c11263
fix failing tests
2013-06-11 15:36:27 +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
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
0e8552ac4e
fix #1273 . Used the wording suggested in this ticket.
2013-06-05 16:58:52 +02: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
Heraldo Esquiche
f8300de7df
Update es.yml
...
manually merged with 2.3devel
2013-06-04 10:19:36 +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
cb4c627153
Merge branch 'master' into rails4
2013-05-27 12:46:13 +02: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
8ffacca393
fix cucumber scenario's.
...
One still fails on Cookie overflow, but works testing by hand...
2013-05-13 17:13:26 +02:00
Reinier Balt
7465ecce26
Start using actionpack-xml_parser as a gem
...
XML param parsing was removed from rails 4. We may need to look into dropping support
for xml api perhaps in favor of a good json api
2013-05-13 15:36:33 +02:00
Reinier Balt
08498fee4f
fix failing tests
...
Includes a monkey patch for Arel that may need to be removed when 4.0.0 final ships
2013-05-13 15:35:21 +02:00
Reinier Balt
65859807ea
update configs for rails 4
2013-05-11 23:12:20 +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
Carsten Otto
929ea3027f
typo
2013-05-01 16:36:23 +02:00
Matt Rogers
d1ff0daf6f
Move the calendar to its own controller
2013-04-30 20:09:46 -05:00
Matt Rogers
70fc1848c2
Remove extra whitespace
2013-04-30 19:18:27 -05:00
Reinier Balt
549aa35e61
fix #1411 where the context list page was not adding new context on the page after the last was deleted.
2013-04-19 15:23:28 +02:00
Reinier Balt
5f8f2eefa9
fix failing calendar scenarios
2013-04-16 10:20:44 +02:00
Reinier Balt
4ece8bf7ab
put mini-profiler on the right to not block the menubar
2013-04-11 10:51:02 +02:00
Reinier Balt
53daa0f1e3
we are grouping by not ordering by
2013-04-08 19:51:28 +02:00
Reinier Balt
ee43ccbee6
remove leftover from merge failure
2013-03-18 12:43:22 +01:00
Reinier Balt
85fc82d494
refactor done todos view and tests
2013-03-18 12:36:40 +01:00
Reinier Balt
0a9755c8a3
get all scenario's running again, first pass.
2013-03-18 12:36:40 +01:00
Reinier Balt
ede898120c
remove option to show empty containers and start fixing failing cucumber scenarios
2013-03-18 12:36:40 +01:00
Reinier Balt
22b371ef8c
do a big refactor of rendering collections of todos for home page, tag page, project page, context page
2013-03-18 12:36:40 +01:00
Reinier Balt
f22dfc1f9b
initial changes to add an option to select either context or project as grouping of todos on home or tag page
...
* new menu item in view menu
* js to toggle view
* store setting in cookie to keep de choice of view persistent
* refactor index and tag page of todos to look more alike
* refactor context and project partials to look more alike
2013-03-18 12:32:28 +01:00
Katrina Owen
08cf7ca542
Fix grammar in pie chart legend
2013-03-17 16:29:19 -06:00
Matt Rogers
31d32614e2
restore the french locale file
2013-03-02 23:19:30 -06:00
Reinier Balt
6c3f447d8e
remove two unused translation keys
2013-03-02 16:44:38 +01:00
Reinier Balt
f649c6ce0c
fix js for contexts and add i18n keys for closed contexts
2013-03-02 16:33:38 +01:00
Reinier Balt
4df340bd7b
add ui for changing state of context to closed. This fixes #645
2013-03-01 16:22:30 +01:00
Katrina Owen
cb9073f4bd
Swap min/max variables in i18n translation
...
The :min was pointing at the max value, and the inverse.
I had to tweak a few of the language files as well, to make sure that
minimum and maximum are pointing to the correct values.
I didn't touch the hebrew language file, so someone with the correct
language skills may want to take a look at it to make sure that the text
matches the interpolation variables that get sent in.
2013-02-28 20:43:11 -05:00
Reinier Balt
2b2572a2d1
set caching back to false for development environment
...
this was accidentally added to a previous commit
2013-02-27 12:06:25 +01:00
Reinier Balt
6fa70db39e
fix updating dependency trees when changin a name. Including invalidating cache when
...
necessary
2013-02-17 17:37:44 +01:00
Renaud AUBIN
e58919df03
Improve fr i18n (minor)
...
Fixes orthographic mistakes and some case-related issues.
2013-02-07 00:37:18 +01:00
Renaud AUBIN
eea44c413d
Improve i18n french (Tolk workflow)
...
Miscellaneous improvements from orthographic or translation mistakes to
typographic conventions (restrained to existing keys). Add some missing
strings.
2013-02-06 01:10:09 +01:00
Dan Rice
aba222ff41
Rename Czech locale from cz to cs as per ISO 639-1
2013-02-05 11:08:21 -05:00
Dan Rice
c09da9cb1c
Bump the development version number
2013-02-05 00:28:39 -05:00
Renaud AUBIN
1c05249831
Replace 'Echéance' by 'Échéance'
...
Capital letters should be accentuated when needed even if the usage of
poor quality digital typography has disolved its usage. The usage of non
accentuated capital letters can be considered as orthographic mistake.
2013-02-02 16:50:40 +01:00
Renaud AUBIN
b530da2785
Remove trailing whitespaces and fix some fr entries
2013-02-02 16:44:55 +01:00
Matt Rogers
3a8cc2eb20
Remove capistrano for Tracks deployment
2013-01-24 22:35:44 -06:00
Reinier Balt
ee3f8a3f8b
set default format to progress for cucumber
2012-12-26 16:46:05 +01:00
Dan Rice
ff19270c09
Fix routing for todos#remove_predecessor
...
Fixes #1363
2012-12-24 11:51:44 -05:00
Reinier Balt
da2bee2e53
start fiingx failing cucumber scenario's and some small fixes
...
new capybara introduces some failing scenario's
2012-12-23 23:16:22 +01:00
Reinier Balt
bd656ee1c7
fix #1350 by removing admin_email from preferences model and add it as a site option in
...
site.yml.tmpl. This one needs running migrations
2012-12-23 21:03:37 +01:00
