zhitomirskiyi
|
dcf6469ded
|
visible contacts option on aspect edit pane
|
2011-01-27 13:41:22 -08:00 |
|
Raphael
|
94ae7a678b
|
Placeholder views for contacts_visible in aspects
|
2011-01-27 13:41:22 -08:00 |
|
Raphael
|
a8306f9f37
|
don't select duplicate people
|
2011-01-27 13:41:22 -08:00 |
|
Raphael
|
31e4683183
|
Finished contacts of contacts for local users
|
2011-01-27 13:41:22 -08:00 |
|
MrZYX
|
86ab893a63
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 21:04:12 +01:00 |
|
MrZYX
|
cbfefc8fc3
|
fixed some untranslatable strings, thanks to Nygu
|
2011-01-27 21:04:03 +01:00 |
|
zhitomirskiyi
|
0fa0b7e950
|
fixed syntax error in mobile layout. removed ipad from mobile_fu
|
2011-01-27 11:30:15 -08:00 |
|
zhitomirskiyi
|
01ce26cbf3
|
fixed errror on services inviter action, specs
|
2011-01-27 10:58:09 -08:00 |
|
maxwell
|
a705824b0c
|
make invites default to 5 again
|
2011-01-27 10:36:02 -08:00 |
|
zhitomirskiyi
|
62c8685154
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-27 10:19:52 -08:00 |
|
zhitomirskiyi
|
c997f6ee05
|
fix finder controller action
|
2011-01-27 10:19:38 -08:00 |
|
MrZYX
|
14f4e1aa57
|
some fixes to the translations of the mobile site
|
2011-01-27 18:20:25 +01:00 |
|
MrZYX
|
eba99c84ba
|
made 'mark all as read' translatable
|
2011-01-27 17:13:27 +01:00 |
|
zhitomirskiyi
|
0ba9889025
|
removed bug in finder view
|
2011-01-26 18:50:02 -08:00 |
|
zhitomirskiyi
|
2b8635f0aa
|
hide share request button for people already on diaspora in friend finder (for now)
|
2011-01-26 18:44:17 -08:00 |
|
zhitomirskiyi
|
4fb271b3bb
|
removed the aspect settings
|
2011-01-26 18:42:57 -08:00 |
|
Raphael
|
b67aca0ffc
|
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
|
2011-01-26 18:29:23 -08:00 |
|
zhitomirskiyi
|
1bb5f9f983
|
only allow invites if invite count > 0 for current user
|
2011-01-26 18:08:57 -08:00 |
|
zhitomirskiyi
|
bc81154c46
|
consolidated invite/invite friends sections on aspect/index
|
2011-01-26 18:05:42 -08:00 |
|
zhitomirskiyi
|
9bd6b11ddf
|
made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
|
2011-01-26 17:50:49 -08:00 |
|
zhitomirskiyi
|
8941448866
|
placed friend finder in facebox. added translations
|
2011-01-26 17:44:40 -08:00 |
|
zhitomirskiyi
|
49f5f15b98
|
properly call translations in services controller
|
2011-01-26 17:02:07 -08:00 |
|
zhitomirskiyi
|
a610618057
|
display resend link if already sent invitation in friend finder
|
2011-01-26 16:57:39 -08:00 |
|
zhitomirskiyi
|
9e22f4a6e6
|
checks if you already invited the person
|
2011-01-26 16:31:34 -08:00 |
|
zhitomirskiyi
|
1a911a8b99
|
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
|
2011-01-26 16:01:57 -08:00 |
|
zhitomirskiyi
|
6242ac64ed
|
removed unique index on email to a regular index in order to make inviting users through fb work (no email present)
|
2011-01-26 15:04:46 -08:00 |
|
zhitomirskiyi
|
be57170bf9
|
added the empty email spec
|
2011-01-26 14:22:04 -08:00 |
|
zhitomirskiyi
|
8bc857cf4d
|
updated devise added a devise_invitable fork and performed migration
|
2011-01-26 13:46:50 -08:00 |
|
zhitomirskiyi
|
ab41a5f24a
|
friend finder has invite buttons and aspect dropdowns
|
2011-01-26 13:03:53 -08:00 |
|
zhitomirskiyi
|
89a8817ce6
|
made service#invite redirect to the right place
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
3392f11b64
|
Job::InviteUser -> Job::InviteUserByEmail
|
2011-01-26 12:16:48 -08:00 |
|
zhitomirskiyi
|
5c5e450a1e
|
Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
d595a64169
|
new interface to send invitation WIP
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
b3467b5d17
|
pending specs for facebook inviter
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
e56ba84094
|
friend finder basic styling
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
cf45f31712
|
facebook friend finder is now contact-aware
|
2011-01-26 12:16:47 -08:00 |
|
zhitomirskiyi
|
d976bf0966
|
fixed bug in facebook service finder
|
2011-01-26 12:16:46 -08:00 |
|
zhitomirskiyi
|
f3f38cf4fd
|
fetch person object associated with facebook id in friend finder
|
2011-01-26 12:16:46 -08:00 |
|
zhitomirskiyi
|
8bc52cdb55
|
facebook friend finder gathers fb friends.
|
2011-01-26 12:16:46 -08:00 |
|
Raphael
|
f9fbb63ecb
|
Make 'not sharing' a button, eliminate xss in alert
|
2011-01-26 11:26:14 -08:00 |
|
Raphael
|
e4ad229a5a
|
Requestors are now high in search
|
2011-01-25 18:24:11 -08:00 |
|
maxwell
|
4e60d2b92e
|
update inf. scroll; fix pagniation showing/not showing in all the wrong places
|
2011-01-25 17:38:29 -08:00 |
|
Raphael
|
906cb36adf
|
Fix double notifications on comments, write a bunch of comment dispatch tests. Alliterate.
|
2011-01-25 16:46:51 -08:00 |
|
maxwell
|
75f08f8cb9
|
limit results in people#show to 15 posts
|
2011-01-25 14:21:15 -08:00 |
|
Raphael
|
5fe0613a97
|
Remove extra token from search
|
2011-01-25 10:47:11 -08:00 |
|
Raphael
|
d1b1db25ed
|
That needed to be formatted differently
|
2011-01-25 10:09:15 -08:00 |
|
Raphael
|
d288160c7f
|
Add link to text request_accepted email
|
2011-01-25 10:07:45 -08:00 |
|
maxwell
|
cef10c1228
|
added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css
|
2011-01-24 23:18:24 -08:00 |
|
zhitomirskiyi
|
2314c08265
|
current password requirement to change password
|
2011-01-24 22:39:57 -08:00 |
|
maxwell
|
d040de541a
|
fix error in stream and puts in fake
|
2011-01-24 19:09:38 -08:00 |
|
maxwell
|
bc82dac61c
|
make the more button work in the mobile site, also, i finally fixed the timeago stuff in the scroll
|
2011-01-24 19:09:37 -08:00 |
|
maxwell
|
8b3beba93f
|
adding login page to mobile, and adding timeago WIP
|
2011-01-24 17:36:47 -08:00 |
|
zhitomirskiyi
|
e9e01e965e
|
fixed error with comments saving twice on the same pod
|
2011-01-24 17:24:29 -08:00 |
|
maxwell
|
1b3c58c2c2
|
Use a fake to not allocate an AR model for every reference to a person
|
2011-01-24 15:13:52 -08:00 |
|
zhitomirskiyi
|
4217aa75e0
|
swapped back icon in mobile header for list icon
|
2011-01-24 12:45:30 -08:00 |
|
zhitomirskiyi
|
2c230fb80d
|
added menu notifications page aspect name header.
|
2011-01-24 12:23:52 -08:00 |
|
Dan Hansen
|
b533d31fad
|
make the footer not so useless
|
2011-01-24 12:23:51 -08:00 |
|
danielvincent
|
21465c8f32
|
various mobile tweaks. logout link actually logs out
|
2011-01-24 12:22:18 -08:00 |
|
danielvincent
|
7ac0e9eb49
|
wip
|
2011-01-24 12:22:18 -08:00 |
|
danielvincent
|
383876ddf4
|
mobile stream sass tweaks
|
2011-01-24 12:22:18 -08:00 |
|
danielvincent
|
1631452669
|
added in link to search page
|
2011-01-24 12:22:18 -08:00 |
|
danielvincent
|
b983746888
|
force all links to not be bold.
|
2011-01-24 12:22:17 -08:00 |
|
danielvincent
|
39c5189c1f
|
everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge.
|
2011-01-24 12:22:17 -08:00 |
|
Dan Hansen
|
0d905a7124
|
i18n locale fix
|
2011-01-24 03:14:19 -06:00 |
|
Dan Hansen
|
8293016348
|
make the footer not so useless
|
2011-01-23 23:53:17 -06:00 |
|
danielvincent
|
c96098540b
|
ask a question in the publisher. (not removing previous translation & method just yet).
|
2011-01-23 11:06:08 -08:00 |
|
danielvincent
|
77042f9d47
|
publisher always shows textarea. outline publisher textarea in blue
|
2011-01-22 18:49:50 -08:00 |
|
Sarah Mei
|
46dcd07f39
|
Oops, debugging statement
|
2011-01-22 15:59:30 -08:00 |
|
Sarah Mei
|
d4cb5b8dad
|
Don't cache authenticity tokens
|
2011-01-22 15:56:31 -08:00 |
|
Dan Hansen
|
90f5192055
|
refactor process_youtube, escape vimeo titles
|
2011-01-22 16:26:45 -06:00 |
|
zhitomirskiyi
|
5ebd10e43f
|
removing photo from publisher works
|
2011-01-22 13:48:26 -08:00 |
|
zhitomirskiyi
|
b7f78335e1
|
mousedown and fixed sass
|
2011-01-22 13:48:25 -08:00 |
|
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 |
|
MrZYX
|
852be182f5
|
made 'start sharing' translatable
|
2011-01-22 16:29:39 +01:00 |
|
Dan Hansen
|
67100aa7bb
|
fix the build
|
2011-01-22 00:39:53 -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 |
|
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 |
|
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 |
|
danielvincent
|
c5e0c616b5
|
share with pane styles fixed
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
98ceb1ca6b
|
fixups on people/show. make photos scroll over header on show pages.
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
c74dc120df
|
fixed all cucumber tests
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
98bcad5c59
|
visual fixes on people/show. contact count on aspect filters. contact list searches again.
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
2e472ded94
|
new notification/request text on aspects/index
|
2011-01-08 13:11:54 -08:00 |
|
danielvincent
|
71ca93720b
|
contact lists functional on aspects/index. edit panes facebox in from header
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
c9307305b3
|
collapsed aspect_listing and contact_listing on aspects/index
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
3ff4b67ff0
|
touched up stream_element and comment partial
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
f44b3cbe3d
|
contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge.
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
422f17a648
|
switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials.
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
e1b6f4f074
|
aspect filters shown selected on photo and statusmessage show pages
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
8c82a5974a
|
aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder
|
2011-01-08 13:11:53 -08:00 |
|
danielvincent
|
5358ac32a1
|
photos can be posted to multiple aspects. header nav works from pages other than aspect/index.
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
0a07dd16b5
|
posts are properly socketed on filtered streams
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
b029475421
|
aspects now have edit pages accessible through the top nav
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
44d3c4bacd
|
fixed inf scroll on filters issue. one spec failing in AspectsController.
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
d0b25814b1
|
publisher retains text when filtering stream
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
a773450650
|
aspect show fix
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
e6ae5e13e2
|
publisher works through ajax filters
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
f02c13ee73
|
filters are now working in ajax. inf. scroll and publisher pending ajax.
|
2011-01-08 13:11:52 -08:00 |
|
danielvincent
|
c64865d32e
|
header touchup
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
f1564d068a
|
pass @all_aspects as opposed to @aspects in stream
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
a9195d7730
|
aspect filters now functional on aspects/index
|
2011-01-08 13:11:51 -08:00 |
|
danielvincent
|
79b7f62520
|
filter logic in aspects_controller#index
|
2011-01-08 13:11:51 -08:00 |
|
maxwell
|
a82e59077b
|
pass opts to the postman when creating a post
|
2011-01-06 17:49:24 -08:00 |
|
maxwell
|
49225568cb
|
moar tests for pubsubjob
|
2011-01-06 17:34:40 -08:00 |
|
zhitomirskiyi
|
86154ba348
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 17:26:42 -08:00 |
|
maxwell
|
153c4925d6
|
test for pubsubhububb jobs
|
2011-01-06 17:19:13 -08:00 |
|
zhitomirskiyi
|
8f2cad776b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 17:14:59 -08:00 |
|
Raphael
|
89a41826c1
|
Started raw post import
|
2011-01-06 17:01:17 -08:00 |
|
zhitomirskiyi
|
249b62445f
|
added the files
|
2011-01-06 16:51:34 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -08:00 |
|
Raphael
|
e46b3e6cf3
|
Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain.
|
2011-01-06 16:23:18 -08:00 |
|
zhitomirskiyi
|
0c8e6b0ba1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-06 15:56:20 -08:00 |
|
zhitomirskiyi
|
3fae950905
|
also commented notification and sending ids into resque so that it works
|
2011-01-06 15:56:03 -08:00 |
|
Raphael
|
283a5501be
|
Boolean values aren't importing; we may need SET statements for them
|
2011-01-06 14:58:42 -08:00 |
|
Raphael
|
7c4d35cf28
|
raw import of notifications, failing to pull in unread
|
2011-01-06 14:37:59 -08:00 |
|
Raphael
|
564dd993b7
|
raw import of Invitation
|
2011-01-06 14:30:38 -08:00 |
|
Raphael
|
a1419b9dc0
|
Person#owner_mongo_id should be null if the csv has an empty string
|
2011-01-06 14:16:51 -08:00 |
|
danielvincent
|
8074e481a3
|
stream fix on aspects/show
|
2011-01-06 13:51:59 -08:00 |
|
maxwell
|
5818227904
|
adding job for posting to services
|
2011-01-06 13:13:09 -08:00 |
|
maxwell
|
27d8cc8003
|
added sync pubsubhubbub publisher client. we now should not longer require eventmachine, (in the server process, the websocket still requires it). this should also be in a job
|
2011-01-05 19:02:43 -08:00 |
|
maxwell
|
8b3a193156
|
added copyright notice to jobs
|
2011-01-05 18:52:43 -08:00 |
|
maxwell
|
beaeac2d42
|
comment out debug
|
2011-01-05 17:52:21 -08:00 |
|
maxwell
|
a7d651236f
|
make the postman work across everything. remove lots of now useless methods
|
2011-01-05 17:44:08 -08:00 |
|
maxwell
|
5e58eba240
|
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
|
2011-01-05 17:43:25 -08:00 |
|
maxwell
|
7ea6b4dd8d
|
more cleanup
|
2011-01-05 17:43:25 -08:00 |
|
maxwell
|
8819d288c4
|
i am greeen
|
2011-01-05 17:43:25 -08:00 |
|
maxwell
|
3fe30cde12
|
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
|
2011-01-05 17:43:25 -08:00 |
|
Raphael
|
ff1cad6e63
|
raw import for requests
|
2011-01-05 17:38:00 -08:00 |
|
Raphael
|
0d80ded2d3
|
Raw import for post_visibilities
|
2011-01-05 17:25:11 -08:00 |
|
zhitomirskiyi
|
ce470e74ee
|
notification calls email notification
|
2011-01-05 17:21:55 -08:00 |
|
Raphael
|
b34acfd4eb
|
Add contact raw import, fixtures have no comments
|
2011-01-05 16:40:16 -08:00 |
|
Raphael
|
e4ef2641f8
|
raw import of aspects and aspect memberships
|
2011-01-05 15:40:04 -08:00 |
|
zhitomirskiyi
|
67be774b7a
|
setting the comment
|
2011-01-05 15:35:40 -08:00 |
|
zhitomirskiyi
|
82852db5ec
|
added the files this time
|
2011-01-05 15:04:28 -08:00 |
|
zhitomirskiyi
|
7254db5cbc
|
Revert "Revert "added comment on post mail method""
This reverts commit c9b3066599.
|
2011-01-05 14:59:15 -08:00 |
|
zhitomirskiyi
|
c9b3066599
|
Revert "added comment on post mail method"
This reverts commit c00226238b.
|
2011-01-05 14:56:04 -08:00 |
|
zhitomirskiyi
|
c00226238b
|
added comment on post mail method
|
2011-01-05 14:55:17 -08:00 |
|
zhitomirskiyi
|
2f06ec1dca
|
don't display notificatification badge div if there is no notification count (permalink works)
|
2011-01-05 10:07:22 -08:00 |
|
zhitomirskiyi
|
c7ecab4933
|
the new request email links back to the pod
|
2011-01-05 09:35:47 -08:00 |
|
Sarah Mei
|
7f86a9e1ba
|
ImportToMysql now loads users.csv. Spec currently failing on datetime conversion.
|
2011-01-04 22:43:32 -08:00 |
|
Raphael
|
d64fd2d222
|
Don't redirect to root_url on aspect destroy
|
2011-01-04 18:00:49 -08:00 |
|
Raphael
|
83d6b95c46
|
Merge remote branch 'nickvdb/763-notifications-paginate'
|
2011-01-04 16:18:46 -08:00 |
|
Raphael
|
0e55b0bf44
|
Merge remote branch 'tomk/721-wrong-person-link-when-creating-comment'
|
2011-01-04 16:14:39 -08:00 |
|
Raphael
|
8d5dc5d27b
|
Merge remote branch 'tomk/ui-cosmetics'
|
2011-01-04 16:02:11 -08:00 |
|