danielvincent
|
ae8686ef25
|
add which_action_and_user to application_controller
|
2011-01-28 16:15:50 -08:00 |
|
Raphael
|
2dfb9f9618
|
remove unused method
|
2011-01-28 15:18:22 -08:00 |
|
zhitomirskiyi
|
3b68fc3e9a
|
the friend finder is respecting of searchable
|
2011-01-28 13:45:58 -08:00 |
|
Raphael
|
ca76572eae
|
Include profile in services finder
|
2011-01-28 12:49:30 -08:00 |
|
Raphael
|
dde8fd65e5
|
Fix build
|
2011-01-28 12:18:56 -08:00 |
|
Raphael
|
767e58bf94
|
Correct email picture url
|
2011-01-28 11:43:15 -08:00 |
|
zhitomirskiyi
|
ced2c18da1
|
remove caching the footer due to localization issues
|
2011-01-27 14:17:50 -08:00 |
|
zhitomirskiyi
|
f5ad03f5d9
|
added visiblity for new aspect on getting started
|
2011-01-27 13:58:59 -08:00 |
|
zhitomirskiyi
|
897786bce4
|
able to send email invites if the pod is not fb connected
|
2011-01-27 13:53:53 -08:00 |
|
maxwell
|
0913389698
|
fix the null person ID bug in profile
|
2011-01-27 13:44:37 -08:00 |
|
zhitomirskiyi
|
3ebda174fb
|
make aspect list visible option on new_aspect pane
|
2011-01-27 13:41:23 -08:00 |
|
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 |
|