zhitomirskiyi
|
ff375b71cb
|
works need a middle stage
|
2011-01-22 13:48:25 -08:00 |
|
danielvincent
|
338e17ff87
|
cache login form & footer
|
2011-01-22 13:30:31 -08:00 |
|
Dan Hansen
|
45444316cb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-22 12:40:36 -06:00 |
|
Dan Hansen
|
b209fd0c2c
|
our spec would complain about the data of the ajax request not being there, move it into the callback instead
|
2011-01-22 12:40:20 -06:00 |
|
MrZYX
|
c9524e9b3a
|
we don't need to exit if jammit fails
|
2011-01-22 19:36:10 +01:00 |
|
MrZYX
|
8bb257d4db
|
updated locales
|
2011-01-22 18:11:35 +01:00 |
|
MrZYX
|
7ba38d80f1
|
some untested improvments to script/server
|
2011-01-22 17:55:10 +01:00 |
|
MrZYX
|
cadcc3e7c3
|
some browers (Firefox for example) have no pushState, so disable it for those for now
|
2011-01-22 16:43:34 +01:00 |
|
MrZYX
|
852be182f5
|
made 'start sharing' translatable
|
2011-01-22 16:29:39 +01:00 |
|
Dan Hansen
|
8619a2035c
|
green for the night
|
2011-01-22 01:16:52 -06:00 |
|
Dan Hansen
|
67100aa7bb
|
fix the build
|
2011-01-22 00:39:53 -06:00 |
|
Sarah Mei
|
225e5fc9d7
|
This much untested code makes me sad. But I fixed the bug whereby no rake tasks worked because of the require line.
|
2011-01-21 22:03:21 -08:00 |
|
Dan Hansen
|
a3bc8932d4
|
fixes for the alert widget, widgets.init didn't execute correctly because of the context
|
2011-01-21 20:09:34 -06:00 |
|
Dan Hansen
|
c23811e1ab
|
flash the user whether or not that person was moved to a different aspect
|
2011-01-21 20:02:42 -06:00 |
|
Raphael
|
eea5b0a748
|
fix hcard link in webfinger profile
|
2011-01-21 15:03:11 -08:00 |
|
zhitomirskiyi
|
01a4327c2b
|
use google API instead of highcharts due to licensing
|
2011-01-21 13:00:08 -08:00 |
|
zhitomirskiyi
|
41993fe5da
|
use highcharts.js for stats
|
2011-01-21 12:19:05 -08:00 |
|
maxwell
|
495154b2b5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-21 11:15:40 -08:00 |
|
zhitomirskiyi
|
190daa76dd
|
getting rid of gruff and it's imagemagic deps. made graphs on stats pending.
|
2011-01-21 11:11:58 -08:00 |
|
maxwell
|
4bff854a04
|
pass params to super
|
2011-01-21 11:11:00 -08:00 |
|
danielvincent
|
c5bf7b523f
|
use history.pushstate to preserve filters on page refresh
|
2011-01-21 11:11:00 -08:00 |
|
zhitomirskiyi
|
403490364a
|
fixed datapoint_spec. fixed labels on graph
|
2011-01-21 10:50:53 -08:00 |
|
zhitomirskiyi
|
46cb9dd346
|
before auth filter
|
2011-01-21 10:39:10 -08:00 |
|
zhitomirskiyi
|
46b94bc130
|
all the specs pass with before each
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
56831cec63
|
stats WIP
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
69d6de2fe7
|
added views and graph generation for statistics
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
f89c442730
|
statistics class does distributions and averages on its DataPoints
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
55bfbfd5b0
|
added users_with_posts_today to DataPoint
|
2011-01-21 10:29:07 -08:00 |
|
zhitomirskiyi
|
ecb059b661
|
added Statistic and DataPoint models
|
2011-01-21 10:29:06 -08:00 |
|
zhitomirskiyi
|
0dc0af015f
|
added methods to statistics rake task
|
2011-01-21 10:29:06 -08:00 |
|
MrZYX
|
4eb31f1fd2
|
updated locales
|
2011-01-21 16:11:47 +01:00 |
|
danielvincent
|
8af2fc7bcc
|
fix in calculating selected states on aspect filters
|
2011-01-21 01:16:34 -08:00 |
|
danielvincent
|
22d4083c8c
|
use history.pushstate to preserve filters on page refresh
|
2011-01-21 01:10:29 -08:00 |
|
danielvincent
|
abfd9c355c
|
make login seem faster.
|
2011-01-20 22:55:44 -08:00 |
|
Maxwell Salzberg
|
fe0f16812f
|
ci sucks
|
2011-01-20 18:57:20 -08:00 |
|
maxwell
|
16b892ccec
|
we really need to make our db case insensitive
|
2011-01-20 18:39:03 -08:00 |
|
Raphael
|
7d4d08c59f
|
Add cache control public to public/assets
|
2011-01-20 16:45:01 -08:00 |
|
Raphael
|
a688e47934
|
Make sure invites is not set to nil
|
2011-01-20 15:59:23 -08:00 |
|
Raphael
|
591915a2cd
|
Add some includes to a query
|
2011-01-20 15:22:35 -08:00 |
|
Raphael
|
88fa595d59
|
Move seed_aspects to after accept_invitation
|
2011-01-20 15:03:33 -08:00 |
|
Raphael
|
19a86eb5a3
|
Remove useless transaction_id from request logs
|
2011-01-20 15:03:33 -08:00 |
|
maxwell
|
b21b0adca7
|
remove single user redirect
|
2011-01-20 15:02:46 -08:00 |
|
maxwell
|
c6a3cff644
|
make the recover password error message slightly more informitive for people who signed up for invites but have not yet received them yet
|
2011-01-20 12:48:28 -08:00 |
|
Raphael
|
7217bba7e7
|
Allow no 2 character queries
|
2011-01-20 12:18:42 -08:00 |
|
Raphael
|
661d5e41a1
|
Join on contacts correctly in search
|
2011-01-20 12:05:25 -08:00 |
|
Raphael
|
4deec0cb38
|
Fix call to search in controller
|
2011-01-20 10:28:27 -08:00 |
|
Raphael
|
971c88da5e
|
Sort search results by friend status
|
2011-01-20 10:20:17 -08:00 |
|
MrZYX
|
4886dbe035
|
replaced user with username in the database.yml example
|
2011-01-20 15:19:14 +01:00 |
|
danielvincent
|
db32074439
|
underline a:hover, remove active state for touch devices
|
2011-01-19 23:34:12 -08:00 |
|
danielvincent
|
3d89e1f203
|
login page cleanup. totally simple. changed link color to something less jarring
|
2011-01-19 23:06:54 -08:00 |
|