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 |
|
danielvincent
|
abfd9c355c
|
make login seem faster.
|
2011-01-20 22:55:44 -08:00 |
|
maxwell
|
16b892ccec
|
we really need to make our db case insensitive
|
2011-01-20 18:39:03 -08:00 |
|
Raphael
|
a688e47934
|
Make sure invites is not set to nil
|
2011-01-20 15:59:23 -08:00 |
|
Raphael
|
88fa595d59
|
Move seed_aspects to after accept_invitation
|
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 |
|
danielvincent
|
3d89e1f203
|
login page cleanup. totally simple. changed link color to something less jarring
|
2011-01-19 23:06:54 -08:00 |
|
Raphael
|
2c68bb0305
|
Remove n-query problem from contact_list
|
2011-01-19 18:06:35 -08:00 |
|
Raphael
|
e97081e8cd
|
Delete some pending specs, fix a minor bug
|
2011-01-19 17:11:33 -08:00 |
|
Raphael
|
a5b4dd2604
|
fix js bug, add spec
|
2011-01-19 16:58:01 -08:00 |
|
maxwell
|
cd92b1dccb
|
put timeago in document ready, not outside
|
2011-01-19 16:18:10 -08:00 |
|
Raphael
|
ad48f4796c
|
Remove warning in aspectscontroller
|
2011-01-19 16:08:14 -08:00 |
|
Raphael
|
3c6dd3d721
|
Remove XSS in profile
|
2011-01-19 16:08:14 -08:00 |
|
danielvincent
|
4b74796c07
|
16 pictures on aspect listings
|
2011-01-19 16:06:35 -08:00 |
|
maxwell
|
120c07ddf5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-19 16:04:54 -08:00 |
|
maxwell
|
35432880b2
|
adding timeago when the inf. scroll is involked
|
2011-01-19 16:04:46 -08:00 |
|
Raphael
|
f35f0212dd
|
Show the right contacts
|
2011-01-19 15:54:49 -08:00 |
|
zhitomirskiyi
|
122f182a4c
|
limit to 16 in the view
|
2011-01-19 15:52:52 -08:00 |
|
maxwell
|
e7a065a521
|
make jobs have a base class, which will verify the activerecord connection before trying the job
|
2011-01-19 14:10:42 -08:00 |
|
MrZYX
|
7f8ee17b40
|
pass @contacts to partial in aspects/index.js.erb
|
2011-01-19 21:09:06 +01:00 |
|
maxwell
|
85b824babc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 22:12:11 -08:00 |
|
maxwell
|
7a02a31440
|
fix invitations#new, and a post spec which was mongo specific
|
2011-01-18 22:11:58 -08:00 |
|
Raphael
|
3935d978ac
|
Take some queries out of views
|
2011-01-18 19:11:01 -08:00 |
|
zhitomirskiyi
|
21bccedf9b
|
notification eagerly load the target
|
2011-01-18 17:22:48 -08:00 |
|
zhitomirskiyi
|
5ac194911f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 17:07:03 -08:00 |
|
zhitomirskiyi
|
e7a4c47f0a
|
include target for notification
|
2011-01-18 17:06:54 -08:00 |
|
Raphael
|
38dd58315d
|
typo
|
2011-01-18 17:04:22 -08:00 |
|
zhitomirskiyi
|
38a3193a61
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:58:04 -08:00 |
|
zhitomirskiyi
|
63590e2e7e
|
restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives"
|
2011-01-18 16:57:34 -08:00 |
|
danielvincent
|
511a48adde
|
fixed publicscontroller specs
|
2011-01-18 16:52:11 -08:00 |
|
Raphael
|
3b394c1c89
|
One more defualt scope out
|
2011-01-18 16:48:02 -08:00 |
|
Raphael
|
e6e2ba9cfb
|
Take out default scopes
|
2011-01-18 16:46:52 -08:00 |
|
zhitomirskiyi
|
ef1b7644f3
|
got rid of more hash from
|
2011-01-18 16:38:31 -08:00 |
|
zhitomirskiyi
|
3e6a271ad8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:22:03 -08:00 |
|
zhitomirskiyi
|
004094d66f
|
fixed the querying in the controllers got rid of hashes
|
2011-01-18 16:21:14 -08:00 |
|
Raphael
|
85bae12a00
|
Query on guid, not id
|
2011-01-18 16:07:58 -08:00 |
|
Raphael
|
9e5cf1e1a4
|
Fix person receive urls
|
2011-01-18 15:21:04 -08:00 |
|
zhitomirskiyi
|
41c83a7e19
|
mousedown so that new tab opening would make notification go down
|
2011-01-18 10:51:05 -08:00 |
|
zhitomirskiyi
|
0cb9f1c0d7
|
focus publisher on reshare
|
2011-01-18 10:51:05 -08:00 |
|
Raphael
|
28b7302c9e
|
Specify type again
|
2011-01-17 19:42:49 -08:00 |
|
Raphael
|
6474ca9540
|
display photos correctly
|
2011-01-17 19:34:33 -08:00 |
|
zhitomirskiyi
|
8d86585928
|
profile spec passes
|
2011-01-17 18:22:54 -08:00 |
|
zhitomirskiyi
|
8818a9bb6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-17 18:04:21 -08:00 |
|
zhitomirskiyi
|
c28b5a22fb
|
here you go
|
2011-01-17 18:03:15 -08:00 |
|
Raphael
|
8bd784e5ab
|
Fix aspect edit
|
2011-01-17 17:36:36 -08:00 |
|
zhitomirskiyi
|
3f21a05e3e
|
remove s3 setting
|
2011-01-17 16:46:39 -08:00 |
|
zhitomirskiyi
|
995d285fdd
|
ssl s3, attrs
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
0c8aca3ef8
|
rebasing
|
2011-01-17 15:56:06 -08:00 |
|
zhitomirskiyi
|
7ef89acf81
|
added the redirect to the nginx conf
|
2011-01-17 15:56:06 -08:00 |
|
danielvincent
|
2eb1901073
|
s3 support minus rake migration.
|
2011-01-17 15:56:06 -08:00 |
|
Raphael
|
bd4efe8c2d
|
Escape youtube titles
|
2011-01-17 15:39:46 -08:00 |
|
zhitomirskiyi
|
fc92779ddc
|
redirect after contact destroy
|
2011-01-17 14:46:38 -08:00 |
|
zhitomirskiyi
|
be92f3866c
|
IZ MS fix 500 on commnet notificaions
|
2011-01-17 14:46:38 -08:00 |
|
Raphael
|
4ba58d8132
|
Simplify hashes_for_contacts
|
2011-01-17 14:23:50 -08:00 |
|
Raphael
|
6410355d71
|
Fix aspect edit page
|
2011-01-17 14:23:50 -08:00 |
|
zhitomirskiyi
|
79b613b0e5
|
MS IZ notifications now contain helpful test
|
2011-01-17 14:07:21 -08:00 |
|
Maxwell Salzberg
|
254c411bd9
|
prevent searching with spaces
|
2011-01-17 13:48:52 -08:00 |
|
Raphael
|
36781481bb
|
Pulling in changes from master
|
2011-01-17 11:41:15 -08:00 |
|
danielvincent
|
e2fdad02f1
|
css fixes, incl. timeago style fix on stream_element
|
2011-01-14 22:12:31 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
zhitomirskiyi
|
aba03ed5b0
|
added the locales for timeago
|
2011-01-14 11:46:38 -08:00 |
|
maxwell
|
641b805da2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 17:31:44 -08:00 |
|
maxwell
|
f509367a40
|
fix the 404 page to show the dun goofed guy
|
2011-01-13 17:31:18 -08:00 |
|
zhitomirskiyi
|
2c58630995
|
rails autoescapes in the link_to
|
2011-01-13 17:16:53 -08:00 |
|
maxwell
|
600e67d5d1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 16:31:35 -08:00 |
|
maxwell
|
f97a9fa017
|
added timeago jquery plugin. we now need to figure out a js translation scheme
|
2011-01-13 16:29:13 -08:00 |
|
maxwell
|
fc09b0fb40
|
add a max char count to commnets (500)
|
2011-01-13 14:49:17 -08:00 |
|
maxwell
|
b116362c5d
|
notifications for local comments
|
2011-01-13 13:02:02 -08:00 |
|
zhitomirskiyi
|
1748827f0a
|
photos show spec passes
|
2011-01-13 10:19:17 -08:00 |
|
Dan Hansen
|
43658b4923
|
only show prev/next if there is more than one photo, fixes #813
|
2011-01-13 01:03:37 -06:00 |
|
Dan Hansen
|
ce4fe1938c
|
remove references to fancybox, we use facebox
|
2011-01-13 00:24:10 -06:00 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08:00 |
|
maxwell
|
c832201bd9
|
remove trailing bracket from aspects#edit pane
|
2011-01-12 11:00:22 -08:00 |
|
maxwell
|
1661158f95
|
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
|
2011-01-12 10:47:39 -08:00 |
|
MrZYX
|
137cde185f
|
unscope contacts
|
2011-01-12 16:03:19 +01:00 |
|
MrZYX
|
1319099cf3
|
made some strings translatable
|
2011-01-12 15:58:10 +01:00 |
|
maxwell
|
73821859e6
|
require pubsubhubub in the job'
|
2011-01-11 16:24:59 -08:00 |
|
maxwell
|
49b172f192
|
up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness
|
2011-01-11 15:04:03 -08:00 |
|
maxwell
|
25f388d903
|
MS DG made receive encapsulated in an object
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
23de681cb8
|
DG MS moved receive methods to their respective models
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
daab8e80ce
|
basic receive cleanup
|
2011-01-11 14:23:18 -08:00 |
|
Raphael
|
ee20b00f58
|
Only the time zone errors are left, and those could probably be ignored
|
2011-01-10 18:30:52 -08:00 |
|
danielvincent
|
685b809248
|
resque requires a job to be assigned to a queue. enable resque logging on posting to a hub
|
2011-01-08 18:13:54 -08:00 |
|
danielvincent
|
f2f3059d72
|
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
|
2011-01-08 17:17:37 -08:00 |
|
danielvincent
|
6cc5d6e3ab
|
fixed all rspec/cucumber
|
2011-01-08 16:53:16 -08:00 |
|
danielvincent
|
6ca0b0014b
|
fade in aspect badges on stream
|
2011-01-08 15:24:03 -08:00 |
|
danielvincent
|
55fa1646c7
|
swapped out delete text for 'x' on stream_elements. controls fade in on hover
|
2011-01-08 15:06:25 -08:00 |
|
danielvincent
|
9cf1f5a023
|
fixed reshare with filters
|
2011-01-08 13:11:55 -08:00 |
|
danielvincent
|
cadba3f2b7
|
fixed specs with a reload. added header gradient for firefox
|
2011-01-08 13:11:55 -08:00 |
|