Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-31 22:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2949 commits 35 branches 36 tags 32 MiB
Commit graph

343 commits

Author SHA1 Message Date
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2013-09-22 10:30:24 +02:00
Greg Sutcliffe
8a2da01d51 Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00
Reinier Balt
8151cd9473 forgot to commit routing changes 2013-08-08 09:32:38 +02:00
Reinier Balt
75ab8364a2 change version to 3.0devel 2013-07-29 12:25:33 +02:00
Darren Cato
c9c1569de0 i18n changes 2013-07-28 13:28:15 +02:00
Darren Cato
7e076290b8 first pass at csv import functionality for tracks 2013-07-28 13:28:15 +02:00
Reinier Balt
4c4ce911fc Merge pull request #199 from shaded2/csv_import 
Csv import
 2013-07-26 03:04:07 -07:00
Darren Cato
3bf7888d5a i18n changes 2013-07-23 13:21:56 -04:00
Darren Cato
3450c22e97 first pass at csv import functionality for tracks 2013-07-21 13:37:35 -04:00
Reinier Balt
79fdd5d625 implement go to project with autocomplete 2013-07-20 23:21:24 +02:00
Reinier Balt
ff1fa62d4d Merge branch 'master' into new-gui 2013-07-19 18:29:50 +02:00
Stacy Vlasits
9896705bf2 fixed next month label for calendar view 2013-07-18 16:43:05 -05:00
Tim Madden
3a290c0f6e Fix #1438 by adding mobile stylesheets to asset pipeline 2013-07-18 11:11:16 -05:00
Reinier Balt
c5884a3f3c Merge branch 'master' into new-gui 2013-07-05 17:03:36 +02:00
Reinier Balt
9f4cec3117 Fix #1433 by adding login and print stylesheets to asset pipeline 2013-07-05 17:03:01 +02:00
Heiko Reincke
3ccefa4e06 updated german locale de.yml 2013-07-03 08:45:27 +02:00
Reinier Balt
db29b84f69 add keyboard shortcuts and make todos selectable useing j and k 2013-07-01 15:56:54 +02:00
Reinier Balt
b725b7b137 clean up menu bar 2013-06-28 09:46:21 +02:00
Reinier Balt
680872aafc install bootstrap 2013-06-21 08:53:35 +02:00
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