Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-24 19:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3373 commits 32 branches 36 tags 32 MiB
Commit graph

3373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Rice
20b040b8b7 Update Nokogiri 2015-12-01 00:02:36 -05:00
Matt Rogers
9389fbef9a Merge pull request #1939 from TracksApp/support-mysql-5.7 
Bump mysql2 to 0.3.20
 2015-11-27 15:21:12 -06:00
Matt Rogers
6a7af342b6 Bump mysql2 to 0.3.20 
Keep it locked at the 0.3.x version due to problems with other apps and
the 0.4.x versions.
 2015-11-18 08:19:54 -06:00
Dan Rice
da7a97b9b5 Merge pull request #1935 from mattr-/simplify-login-system 
Simplify the return values when using basic auth
 2015-11-03 00:15:43 -05:00
Matt Rogers
d9b78c4e1f Simplify the return values when using basic auth 
Returning a hash with explicit keys isn't strictly necessary with the
access methods we're using to get the values for those keys out of the
hash. Return an empty hash instead, simplifying the code.

Also remove the early return statements within the conditional. Those
are also unneeded since this is the last expression that's run in the
method.
 2015-11-02 22:05:29 -06:00
Matt Rogers
fbb62fd36e Merge pull request #1933 from dnrce/projects_url 
Fix link in projects RSS feed
 2015-10-12 21:06:56 -05:00
Dan Rice
0f168b430e Fix link in projects RSS feed 2015-10-11 16:46:21 -04:00
Dan Rice
70e81b7782 Merge pull request #1922 from TracksApp/configurable-static-asset-serving 
Add a configuration setting for serving static assets
 2015-09-03 15:25:04 -04:00
Matt Rogers
faf585b1d4 Add a configuration setting for serving static assets 
This new setting will allow us to control in `site.yml` whether or not
our static assets will be served by Rails or by the app server that is
proxying requests to Rails. This is set to `false` by default so that
the proxying server is responsible for serving the assets.
 2015-09-01 19:21:16 -05:00
Matt Rogers
e71d81e129 Merge pull request #1924 from dnrce/namespace-legacy-css 
Namespace the legacy CSS
 2015-09-01 14:11:44 -05:00
Dan Rice
0ca0317a7f Namespace the legacy CSS 2015-08-30 22:31:03 -04:00
Dan Rice
5f031df2c5 Update uglifier gem 2015-08-30 16:54:53 -04:00
Dan Rice
dbd2aa71b3 Merge branch '2.3_branch' 2015-08-30 11:43:10 -04:00
Dan Rice
465fccff4d Merge pull request #1925 from SuperNascher/usercreate 
Increase the maximum password length
 2015-08-29 22:53:39 -04:00
Nascher
dd6698b8a1 Update the maximum password length 2015-08-29 23:58:02 +00:00
Nascher
4632208699 Increase the maximum password length 2015-08-29 18:36:12 +00:00
Matt Rogers
9a18705f70 Merge pull request #1911 from matjack1/empty-project 
Default project should be empty
 2015-08-25 20:46:45 -05:00
Dan Rice
48c1d7c214 Merge pull request #1920 from TracksApp/incremental-bootstrap-ui 
Add in Bootstrap for UI bits
 2015-08-21 08:52:47 -04:00
Matt Rogers
f62dfac1e4 Lock bootstrap-sass to to 3.3.3 2015-08-20 22:03:44 -05:00
Matt Rogers
dd6b9f0359 Merge pull request #1917 from lrbalt/fix-content-type-attachment 
remove old hack to set content type to application/html
 2015-08-20 11:23:21 -05:00
Matt Rogers
a92824b34d Merge pull request #1918 from lrbalt/fasterer 
speed improvements from fasterer gem
 2015-08-20 09:43:15 -05:00
Matt Rogers
109a82f9e0 Merge pull request #1919 from lrbalt/master 
enable caching of gems on travis
 2015-08-20 09:40:28 -05:00
Reinier Balt
209049b012 enable caching of gems on travis 
as described in http://docs.travis-ci.com/user/caching/
 2015-08-19 15:49:43 +02:00
Reinier Balt
0602634ae3 Fasterer: Use #cover? instead of #include? on ranges 2015-08-19 15:42:14 +02:00
Reinier Balt
bb006f98c1 Using tr is faster than gsub 
Using tr is faster than gsub when replacing a single character in
a string with another single character.

Also freeze constant strings
 2015-08-19 15:24:35 +02:00
Reinier Balt
d3aa73f783 first select than sort 
sorting on a smaller collection is faster
 2015-08-19 15:21:11 +02:00
Reinier Balt
405ad5a79f Fasterer: Enumerable#sort is slower 
Enumerable#sort is slower than Enumerable#sort_by
 2015-08-19 15:19:47 +02:00
Reinier Balt
5092b388fe Fasterer: Parallel assignment is slower 
Parallel assignment is slower than sequential assignment.
Only got the low hanging fruit. There are some functions that
have multiple return values. Fixing this needs more refactoring.
 2015-08-19 15:12:52 +02:00
Reinier Balt
9f81e1a5c3 fasterer: Use attr_reader for reading ivars. 2015-08-19 14:52:13 +02:00
Reinier Balt
0d224a5fe9 fasterer: hash#fetch with block is faster 
hash#fetch with block is faster than hash#fetch with
second parameter
 2015-08-19 14:49:52 +02:00
Reinier Balt
ddd9c07d3b Fasterer: Use &:symbol is faster 
Calling argumentless methods within blocks is slower than using
symbol to proc.
 2015-08-19 14:48:31 +02:00
Reinier Balt
f7f10b8a61 remove old hack to set content type to application/html 
This prevents attachments to be seen as something different than
html content. For example, message/rfc822 for email was being
replaced by application/html causing wrong application to be
started on the client.
 2015-08-19 14:27:26 +02:00
Matteo Giaccone
336f19c4fe Default project should be empty 2015-08-13 21:58:03 +01:00
Matt Rogers
258f0ecb2e Merge pull request #1876 from C-Otto/tracks-1839 
(2.3) remove context if name is not set in update form
 2015-08-11 11:11:11 -05:00
Carsten Otto
1fa6a182c1 remove context if name is not set in update form 
fixes #1839
 2015-08-09 13:42:29 +02:00
Dan Rice
8a378aa2c4 Merge pull request #1907 from TracksApp/remove-google-gadget-integration 
Remove the Google Gadget Integration
 2015-08-08 07:43:38 -04:00
Reinier Balt
2c33cdfaae Mention adding email as attachement of todo to changelog 2015-08-08 10:50:35 +02:00
Matt Rogers
212dd69514 Add the ability to conditionally use bootstrap 
Elements should be wrapped in the bootstrap class to use this feature
 2015-08-07 23:29:40 -04:00
Matt Rogers
a896576b70 Make application.css a SASS file 
This is so we can use SASS import directives in it.
 2015-08-07 23:16:11 -04:00
Matt Rogers
565d4ac1a1 add in bootstrap-sass 2015-08-07 23:15:30 -04:00
Matt Rogers
bb934b6474 Remove the Google Gadget Integration 
Google has discontinued the "Add any gadget by URL" Labs feature. Remove
the feature from the application.
 2015-08-07 21:31:00 -04:00
Matt Rogers
5342877caf Merge pull request #1865 from C-Otto/tracks-1840 
Show links to context/project also for completed actions
 2015-08-07 21:06:27 -04:00
Matt Rogers
486204c1d7 Merge pull request #1888 from C-Otto/tracks-1882 
navigate back to note's project after deletion
 2015-08-07 21:05:21 -04:00
Matt Rogers
4c24c4cd18 Merge pull request #1886 from C-Otto/tracks-1878 
Ignore time, so that one can always defer to the due date
 2015-08-07 21:03:45 -04:00
Matt Rogers
bca2440ca0 Merge pull request #1857 from C-Otto/tracks-1852 
Show meaningful numbers in badge for completed projects and recurring actions
 2015-08-07 21:01:32 -04:00
Matt Rogers
50421fc19b Merge pull request #1825 from C-Otto/sort-containers 
Sort containers
 2015-08-07 20:35:54 -04:00
Matt Rogers
3d77e11a87 Merge pull request #1853 from C-Otto/tracks-1851 
Do not open 'new note' form when clicking unrelated links
 2015-08-07 20:34:08 -04:00
Matt Rogers
a9023960fc Merge pull request #1848 from C-Otto/tracks-1847 
Fix description of monthly recurring tests
 2015-08-07 20:29:40 -04:00
Matt Rogers
f393afb69f Merge branch '2.3_branch' 
This brings the master branch up to date with the 2.3 release branch
 2015-08-07 20:27:14 -04:00
Matt Rogers
9089e15788 Merge pull request #1885 from C-Otto/tracks-1789 
(2.3) Update project name and context name in 'new action' form
 2015-08-07 20:08:18 -04:00