Raphael Sofaer
7f5f696642
Don't let googlebot 500 us on the public post page
2011-08-09 12:26:10 -07:00
danielgrippi
a78fa96e99
don't display a reshare link if the original post has been deleted
2011-08-09 10:26:21 -07:00
Maxwell Salzberg
72b734e3e8
scroll to top like a boss
2011-08-09 01:04:54 -07:00
Maxwell Salzberg
43bd8b6860
typo in the settings
2011-08-08 19:07:38 -07:00
Raphael Sofaer
97660e8f49
Fix some typos in the batch invitation email
2011-08-08 19:02:07 -07:00
Maxwell Salzberg
ee08d3cd5c
fix inviter a touch
2011-08-08 18:50:59 -07:00
Raphael Sofaer
f02b1dd3a2
Adjust and tweak batch invitation email. It might need a few more tables
2011-08-08 17:56:20 -07:00
Maxwell Salzberg
77cb93be24
fix up the inviter sidebar
2011-08-08 17:53:04 -07:00
Maxwell Salzberg
5bd9e7c53d
update email copy
2011-08-08 16:35:34 -07:00
Raphael Sofaer
f385eef851
Fix like socketing
2011-08-08 11:54:32 -07:00
Sarah Mei
ccf843b486
Merge pull request #1745 from ticho/unread-message-count-css-fix
...
Correctly space unread and total message counts in conversations list
2011-08-07 20:40:53 -07:00
Manuel Schölling
8b99ae9cb6
Changed translation and fixed misspelled function call
2011-08-07 22:00:23 +02:00
Manuel Schölling
79d0dfc7bb
added missing hang=>left and people's AspectMembershipDropdown is not a partial anymore
2011-08-07 12:53:22 +02:00
Raphael Sofaer
08ae8d23cc
aspect_membership_dropdown, not aspectmembership
2011-08-07 12:53:22 +02:00
Manuel Schölling
fead6032f7
Issue 1586: added a aspect drop down next to the submit button in the publisher
2011-08-07 12:51:32 +02:00
Andrej Kacian
6b64d7f55a
Correctly space unread and total message counts in conversations list
2011-08-07 04:06:26 +02:00
Andrej Kacian
077d8fd2fe
Fixes #1587 by changing globe icon tooltip when switching between public and limited post in publisher.
2011-08-06 23:37:21 +02:00
Raphael Sofaer
201574c53a
Check for nil before building ServiceUser objects
2011-08-06 14:02:27 -07:00
Sarah Mei
66bb686f4b
Handle the case where the pod doesn't have the diasporahq user.
2011-08-06 12:48:23 -07:00
Sarah Mei
421bfe6d8f
Handle the case in which the pod owner has not set up featured users.
2011-08-06 12:47:46 -07:00
Raphael Sofaer
e3d0cfedd7
Use 'Welcome' from i18n
2011-08-05 23:09:00 -07:00
Raphael Sofaer
de3f27f8b1
We don't need to check defined? on an instance variable
2011-08-05 23:04:30 -07:00
Raphael Sofaer
817d6701e4
We don't have fakes anymore, get rid of most of the reshare? method
2011-08-05 22:31:32 -07:00
Raphael Sofaer
dde4b30180
Fix rspec specs
2011-08-05 22:29:27 -07:00
Maxwell Salzberg
700927e40f
remove user stubbing
2011-08-05 18:59:04 -07:00
Maxwell Salzberg
c5d2dbfa95
add copy
2011-08-05 18:54:49 -07:00
Maxwell Salzberg
b4d4499299
adding invite email
2011-08-05 18:32:25 -07:00
Maxwell Salzberg
a3104741c5
cleanup inviter for more offical email
2011-08-05 17:55:56 -07:00
Raphael Sofaer
a35356cfc3
DG Fix 500 in person page when incoming_request is undefined
2011-08-05 17:33:10 -07:00
danielgrippi
5e1d1428d0
fix styles
2011-08-05 17:29:57 -07:00
danielgrippi
eb6d4c0228
remove dropdown from h4
2011-08-05 17:24:54 -07:00
danielgrippi
cd62064846
touched up aspect/edit and friend finder popups
2011-08-05 17:14:07 -07:00
Raphael Sofaer
8b7f938a63
Order the results of ServicesController#finder
2011-08-05 16:42:09 -07:00
Maxwell Salzberg
1facf2fccb
fix passing public link for services links
2011-08-05 16:35:25 -07:00
danielgrippi
0cceb4fdd3
fixed people/contacts layout; pulled person sub-header into its own partial
2011-08-05 15:51:18 -07:00
Raphael Sofaer
c7360fe6ce
Document contact.sharing and receiving a little
2011-08-05 15:25:26 -07:00
Raphael Sofaer
5eadc7d41c
Fix the last broken jasmine spec by restoring the #no_posts div
2011-08-05 15:09:16 -07:00
danielgrippi
75c3107035
made signing up and accepting an invitation look a little nicer
2011-08-05 12:36:53 -07:00
Raphael Sofaer
c38c744156
Fix contact search in the facebook friend finder.
...
It was looking for #contact_list_search instead of .contact_list_search.
2011-08-05 12:34:48 -07:00
Raphael Sofaer
9e007f2b11
Actually add the facebook inviter partial
2011-08-05 11:55:00 -07:00
Raphael Sofaer
6d3da0d0d1
Memoize the facebook invitation form on the facebook finder page
2011-08-05 11:31:45 -07:00
Raphael Sofaer
0d864935cd
Make reshares helper a little more readable
2011-08-05 11:31:45 -07:00
Daniel Grippi
f63ba2c557
Merge pull request #1707 from TheLambdaCalculus/b1696-publisher-should-automatically-collapse-if-last-photo-removed-and-otherwise-blank
...
Issue #1696 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
2011-08-05 10:57:33 -07:00
Daniel Grippi
a0cdf6869c
Merge pull request #1732 from ticho/no-posts-message-outside-of-stream
...
Move no_posts_message rendering above the stream
2011-08-05 10:28:00 -07:00
Maxwell Salzberg
ab74c6fd6b
attempt #2 . sorry to the mailing list, we will get this fixed soon
2011-08-05 10:07:08 -07:00
Maxwell Salzberg
5d41c14e74
attempt to fix build
2011-08-05 09:44:35 -07:00
Andrej Kacian
2134fd2bc0
Move no_posts_message rendering above the stream, so that it doesn't get pushed down by new posts.
2011-08-04 21:45:22 +02:00
danielgrippi
6a56e3298c
only show connect to services if all services not already connected
2011-08-03 19:02:54 -07:00
Maxwell Salzberg
001d4ceaff
fix friend finder styling
2011-08-03 18:55:26 -07:00
danielgrippi
b11c1a899f
add invitations partial back, removed set_invites (yay)
2011-08-03 18:47:06 -07:00
danielgrippi
134e8a1b20
limit RSS rel link in layout to person pages
2011-08-03 18:30:25 -07:00
danielgrippi
9b24af717f
fix styling on featured users on getting started; added hovercards
2011-08-03 18:22:52 -07:00
Maxwell Salzberg
520b0dcf33
only show resend link
2011-08-03 18:18:00 -07:00
Maxwell Salzberg
275be550f8
aspects is not an li
2011-08-03 18:14:49 -07:00
danielgrippi
99ac976594
fix redirects around getting_started and aspect/index
2011-08-03 18:07:43 -07:00
danielgrippi
987d334764
fixed tests, translations, initalizer
2011-08-03 18:02:58 -07:00
danielgrippi
23c2eaf1c5
added a real profile description on the welcome tab
2011-08-03 18:02:58 -07:00
danielgrippi
7d01deb99d
don't show connect to cubbies in right bar if user is already connected
2011-08-03 18:02:58 -07:00
danielgrippi
e23439d193
fix cucumber; temporarily remove fetch featured users initilizer
2011-08-03 18:02:57 -07:00
danielgrippi
984eef25be
UsersHelper -> GettingStartedHelper
2011-08-03 18:02:57 -07:00
danielgrippi
e589dd88b2
added has_connected_cubbies?
2011-08-03 18:02:57 -07:00
danielgrippi
120cf9835b
added more translations; welcome text switch
2011-08-03 18:02:57 -07:00
danielgrippi
b8b4ad3d84
added helpers for each of the getting started steps; make step sections dull if completed
2011-08-03 18:02:56 -07:00
danielgrippi
303b23883d
added featured users, left nav, and search boxes into getting started
2011-08-03 18:02:56 -07:00
danielgrippi
d51e495925
fetch featured users from remote servers on app init unless already in the db
2011-08-03 18:02:56 -07:00
danielgrippi
6369eefdbe
added translations to getting started
2011-08-03 18:02:56 -07:00
danielgrippi
c9eeeb6150
ms dg; profile (step 1) finished
2011-08-03 18:02:56 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c2dc5fde08
dg iz reworked the getting started into a tab, need to remove the getting started steps
2011-08-03 18:02:56 -07:00
Maxwell Salzberg
1ae7b80c56
some tweaks for friend finder styling
2011-08-03 18:00:38 -07:00
Raphael Sofaer
f1040a237f
Put the new_aspect class on the notification page aspect dropdown, so that the focus js is triggered
2011-08-03 17:47:52 -07:00
Maxwell Salzberg
099d882814
fix aspect dropdown when friend on diaspora
2011-08-03 17:38:30 -07:00
Maxwell Salzberg
62f10c5b3c
add help
2011-08-03 17:25:04 -07:00
Maxwell Salzberg
7e8f17cc31
refactoring this stuff
2011-08-03 16:58:55 -07:00
Raphael Sofaer
1aac60bee3
Make sure that not deleting the service_users doesn't leave them stale
2011-08-03 15:39:23 -07:00
Raphael Sofaer
7d0c796762
Make sure that related data for fb users is attached to them
2011-08-03 15:30:58 -07:00
Raphael Sofaer
4d786d687c
Forget about postgres for now, depend on On duplicate key update
2011-08-03 14:39:38 -07:00
Raphael Sofaer
a8104da482
Strip exif in the scaling process
2011-08-03 14:34:54 -07:00
Raphael Sofaer
0fff54e074
We pass in nil as a size to person_image_tag, so we need to default it more forcibly.
2011-08-03 13:45:45 -07:00
Raphael Sofaer
67123a277c
Fix and simplify likes_container
2011-08-03 11:20:06 -07:00
Raphael Sofaer
5967f01dab
Take out PostsFake, now that we ajax in comments it's not worth the extra complications
2011-08-03 11:09:21 -07:00
Maxwell Salzberg
9cbb6c4d5e
you know, i should uncomment code before i commit it
2011-08-02 22:30:24 -07:00
Maxwell Salzberg
11ad3f2b78
silly hack to preventdefault tags from getting generated...
2011-08-02 22:28:40 -07:00
danielgrippi
25e4f5d0ae
dg ms; made no posts text on person show more explicit
2011-08-02 12:53:36 -07:00
Raphael Sofaer
a542bb7a6d
Take comments out of the photo show page, they were broken anyway.
2011-08-02 11:10:42 -07:00
Raphael Sofaer
be5453f0b4
Fix photo show pages with likes
2011-08-02 10:17:49 -07:00
Raphael Sofaer
406ab7a073
Delete a stray file, some cleanup
2011-08-02 09:47:17 -07:00
Raphael Sofaer
674ca883e5
Put class back into remote person_links
2011-08-01 18:25:31 -07:00
Raphael Sofaer
a469f09c01
Fix hovercard conflict with vanity urls
2011-08-01 18:22:29 -07:00
Raphael Sofaer
d7ac6c4713
Link the no_tags text to a tag page, we should make tags#index something meaningful one day.
2011-08-01 17:59:19 -07:00
danielgrippi
6daf7f5ad9
add prompt to add more contacts if user has less than 2 contacts on aspect index
2011-08-01 15:31:13 -07:00
danielgrippi
756a20ecd4
link a user to featured users if user has zero contacts
2011-08-01 15:19:51 -07:00
Raphael Sofaer
983d4e5598
Hopefully make youtube_titles a little less ridiculous
2011-08-01 12:30:21 -07:00
Maxwell Salzberg
773f207b17
fix the viewport for real this time. sorry about all of the emails
2011-07-31 21:57:26 -07:00
Maxwell Salzberg
2fb2cd0a80
fix mobile viewport for mobile site
2011-07-31 21:33:43 -07:00
Gaelan D'costa
ba98043412
Issue #1126 - When the last photo is deleted from the publisher, we now collapse the publisher if no status text had been entered.
2011-07-31 19:29:01 -04:00
Andrej Kacian
78c3d91abd
Show correct contact count in right bar when changing target aspect.
2011-07-31 12:29:56 +02:00
Gonzalo Rodriguez
3eb6d13f95
Issue #1431 : Suggest when the first letter typed, not the third
2011-07-30 15:56:28 -03:00
Maxwell Salzberg
bb8db654d6
add basic pod error logging, and added guard and removed autotest
2011-07-30 11:44:27 -07:00
Maxwell Salzberg
bbf8f2a15b
for tests, only try to connect with an actual person
2011-07-29 21:52:46 -07:00
danielgrippi
7504f66416
thumb small on comments
2011-07-29 19:34:50 -07:00
danielgrippi
91461ab2ad
fix tag duplication; photo sizes
2011-07-29 19:31:06 -07:00
Maxwell Salzberg
315ec29af2
typo in my link
2011-07-29 19:30:12 -07:00
danielgrippi
9037748d23
fixed search
2011-07-29 19:21:18 -07:00
danielgrippi
905a982d35
add two more default aspects for new users
2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7
added featured users dg iz
2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e42d7273a8
featured users section
2011-07-29 19:00:15 -07:00
Maxwell Salzberg
d55a21c458
just kidding. totally going to namespace users
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
d407be036e
i am not a number! include username in the main url of a local user!
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
540a3e68a6
remove an unused query, randomize the contacts on your home page
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
73616a3e7a
new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about)
2011-07-29 17:20:10 -07:00
Maxwell Salzberg
a320891df0
sample users so they are random, not the same all the time
2011-07-29 17:16:37 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
fd27fdc204
fix facebox not closing when adding a contact to an aspect via the dropdown menu
2011-07-29 15:06:24 -07:00
Raphael Sofaer
b8df1dca5c
remove pretty print
2011-07-29 14:56:06 -07:00
danielgrippi
e345f2dcbc
fix contacts index page
2011-07-29 14:15:28 -07:00
danielgrippi
2b550906fc
downcase query string for search
2011-07-29 14:05:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
16bd3e4c2f
less delay on search; start on 2 chars instead of 3
2011-07-29 12:26:04 -07:00
danielgrippi
f560321626
optimized people search
2011-07-29 12:04:10 -07:00
Raphael Sofaer
5e39368414
Get rid of 500 on mobile comment creation
2011-07-29 12:01:35 -07:00
Raphael Sofaer
6946d28243
Fix the build for socketing of comments.haml
2011-07-29 11:50:50 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e17fe1848f
removed unused file
2011-07-29 11:39:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
00571b84cd
completed donate option
2011-07-29 11:33:30 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7327c882b2
the working button in diaspora
2011-07-29 11:33:29 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
24fed68247
added the buttons
2011-07-29 11:33:29 -07:00
Raphael Sofaer
cac6d048f8
Fix mobile views of reshares
2011-07-29 11:21:13 -07:00
Maxwell Salzberg
7a43a812bf
show comment form for post show pages
2011-07-29 10:10:22 -07:00
Maxwell Salzberg
b2bce9e1b2
update jquery mobile to beta1
2011-07-28 23:32:41 -07:00
danielgrippi
68dafdbf0d
correct contact count on aspect/index
2011-07-28 16:23:31 -07:00
Raphael Sofaer
8ce5e72519
Use data-aspect_id, because integer html ids freak me out.
2011-07-28 15:51:00 -07:00
danielgrippi
ee95def580
removed js from the view. added grabbing hand while moving aspects
2011-07-28 15:34:01 -07:00
danielgrippi
dfa5824dc1
remove repeated link, fixed cucumber
2011-07-28 14:52:09 -07:00
Raphael Sofaer
87d0f9d6fd
Merge branch 'master' of github.com:diaspora/diaspora
2011-07-28 14:42:02 -07:00
Raphael Sofaer
b367a486d3
Add helper clone to aspect sorting js, so that dragging doesn't click
2011-07-28 14:41:19 -07:00
Raphael Sofaer
ddd4424df8
Merge remote branch 'manuels/842-sortable-aspects'
...
Conflicts:
app/models/user.rb
db/schema.rb
2011-07-28 14:36:41 -07:00
danielgrippi
6e25a6a0f1
touched up reshare view
2011-07-28 13:46:16 -07:00
Raphael Sofaer
37bb641227
Merge branch 'master' of github.com:diaspora/diaspora
2011-07-28 13:03:06 -07:00
Dennis Schubert
bbf28f9072
That fixes the mobile-interface for now
2011-07-28 21:45:42 +02:00
Raphael Sofaer
4fa5731d5e
Merge remote branch 'jancborchardt/1410-messages-conversation'
...
Conflicts:
app/views/conversations/new.haml
2011-07-28 12:45:40 -07:00
Raphael Sofaer
192ae3a52b
Merge remote branch 'ticho/followed-tag-listing-separate-file'
2011-07-28 12:33:14 -07:00
Raphael Sofaer
d043c74528
Merge remote branch 'ticho/highlight-unread-conversations'
2011-07-28 12:17:39 -07:00
Ryan Hughes
2a187ae770
Likes don't return 500 errors.
2011-07-27 23:26:54 -07:00
Raphael Sofaer
4a1bd27728
Merge pull request #1677 from ticho/conversations-send-button-action-string-fix
...
Use "Sending..." instead of "Posting..." for new conversation.
2011-07-27 17:54:35 -07:00
Raphael Sofaer
6406de89ee
Merge remote branch 'gandaro/1602-delete-profile-photo'
2011-07-27 17:19:47 -07:00
Andrej Kacian
e4a81fbc8a
Use "Sending..." instead of "Posting..." for new conversation.
2011-07-27 23:09:05 +02:00
Andrej Kacian
cb828ae9d4
Merge branch 'master' of git://github.com/diaspora/diaspora into highlight-unread-conversations
2011-07-27 22:50:59 +02:00
MrZYX
99751af5a8
let the direction_for helper return ltr instead of nothing for ltr text, this should fix #1668
2011-07-27 22:34:41 +02:00
Andrej Kacian
cc3ba8b076
Display unread post count for conversations in inbox, if appropriate.
2011-07-27 22:33:13 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
7b572bf40b
don't display connect to services unless services are configured on that pod
2011-07-27 00:11:24 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
73f9627338
moved invite people to the top
2011-07-26 23:31:42 -07:00
Andrej Kacian
77a654ef47
Updated copyright year in new file
2011-07-26 19:11:02 +02:00
Andrej Kacian
2dd09cfaa2
Updated to fit current upstream master
2011-07-26 19:11:02 +02:00
Andrej Kacian
658e836f4c
Make the "No tags" string translatable
2011-07-25 23:09:53 +02:00
Jonne Hass
384a71bdc4
Merge pull request #1614 from ticho/1603-likes-i18n-fix
...
Fix for issue #1603 - use different i18n string for comment likes count
2011-07-25 07:20:24 -07:00
maxwell
7a5852e73a
fix a bug with openssl keys in development. note to future max and
...
rafi. never monkey patch anything on the top of a completely random
model. never again. ever.
TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
2011-07-24 20:06:07 -07:00
Raphael Sofaer
56cdb7a3ad
Fix translation reference
2011-07-22 18:10:34 -07:00
Raphael Sofaer
241999f72a
MS RS translated reshares
2011-07-22 17:58:52 -07:00
Raphael Sofaer
00885be738
Provide feedback when a user tries to double-reshare
2011-07-22 17:43:05 -07:00
Raphael Sofaer
99aafb18cd
Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice
2011-07-22 17:13:31 -07:00
Raphael Sofaer
78bced56bb
Reshares and reshare retractions are green.
2011-07-22 16:00:19 -07:00
Raphael Sofaer
5a12636967
Clarify Reshare#after_parse
2011-07-22 14:38:56 -07:00
Raphael Sofaer
4b1d5b772d
Failing spec for the second retraction for a reshared post, reshares need to refer to guids
2011-07-22 14:19:58 -07:00
Raphael Sofaer
ad5dba052c
First reshare retraction spec is green
2011-07-22 13:12:12 -07:00
Andrej Kacian
c1e5a83f15
Fix for issue #1603 - use different i18n string for comment likes count
2011-07-22 19:57:18 +02:00
Raphael Sofaer
17774d8b3b
Getting repost back to almost green.
2011-07-21 19:15:47 -07:00
Raphael Sofaer
a1bf22fe7e
More work on retracting posts with reshares, one failing spec on User#retract
2011-07-21 18:23:34 -07:00
Raphael Sofaer
7382dfb7be
Multi-server spec now successfully passes along a reshare
2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8
Use authority instead of host in order to get the port as well.
2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7
Started working on repost integration test
2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54
wip integration servers
2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c
repost wip
2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c
fixed reshare specs; all specs green
2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460
2 more specs failing. wip
2011-07-21 18:22:18 -07:00
danielgrippi
a32ef3c1d8
added xml response to the post
2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746
marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back
2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9
moving to not including the post in the reshare xml
2011-07-21 18:22:17 -07:00
danielgrippi
7b3180e5da
user can retract a reshared post
2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1
DG IZ reshare retractions is WIP
2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c
fixed all specs; rebased.
2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766
not showing the reshare button to the users on things they can't reshare
2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f
wip removed some generated specs
2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77
WIP reshare
2011-07-21 18:22:17 -07:00
Raphael Sofaer
e2bdd54dd8
Undo part of the refactor so that StatusMessage validations work.
2011-07-21 17:56:53 -07:00
Raphael Sofaer
caf26a5c64
Upgrade rails.js, add CSRF token manually in the photo uploader.
2011-07-21 17:49:33 -07:00
Raphael Sofaer
20de3a5622
Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook
2011-07-21 16:30:00 -07:00
Maxwell Salzberg
09a43418ef
dont try to fix vanna max\!
2011-07-21 14:32:10 -07:00
Maxwell Salzberg
757c9169fc
updated gemfile
2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04
rspec is green
2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156
fixed the safe_buffer issues
2011-07-21 14:32:09 -07:00
Raphael Sofaer
8eea37cbdb
Fix people socketing
2011-07-21 13:41:46 -07:00
Raphael Sofaer
a5fd01cc09
Fix comment socketing
2011-07-21 13:21:48 -07:00
Raphael Sofaer
4de2ca9958
Get websocket pushing posts
2011-07-21 13:21:48 -07:00
Jakob Kramer
cb0124f48e
fixing #1602
2011-07-21 15:52:34 +02:00
Jan-Christoph Borchardt
5d998a8e93
Fix issue #1410 , remove cancel button in messages conversation
2011-07-20 11:20:18 +02:00
Raphael Sofaer
b01ffb4489
We don't use perform_delegate anymore
2011-07-19 10:55:23 -07:00
Raphael Sofaer
9797e04957
Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
...
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
Raphael Sofaer
9789d1d6cb
Fix issue #1579 , like.target, not like.post
2011-07-17 21:18:21 -04:00
Raphael Sofaer
d30228abb8
Merge remote branch 'untitaker/1589-remove-unicode-smileys'
2011-07-17 21:12:20 -04:00
Dan Hansen
6a11784a2e
Rewrote ContactsController#index, thoughts?
2011-07-17 15:44:07 -07:00
Andrej Kacian
713f4dcc9d
Fix for issue #1600 : Missing string for translation ("Recent notifications")
2011-07-17 17:04:51 +02:00
Markus Unterwaditzer
d4257f4a68
Removed unicode smileys, #1589
2011-07-17 10:45:06 +02:00
danielgrippi
22fdf7f895
fix 500 on posts show on mobile
2011-07-15 22:37:21 -07:00
danielgrippi
39da9302a1
Revert "deleted unused file". sorry!! :(
...
This reverts commit a6f2f82c5e
2011-07-15 22:33:55 -07:00
danielgrippi
a6f2f82c5e
deleted unused file
2011-07-15 21:44:12 -07:00
danielgrippi
c4b715f3ff
fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews
2011-07-15 21:22:29 -07:00
Raphael Sofaer
5d64611f2b
Include profile in contactsController index for the publisher
2011-07-15 14:49:35 -07:00
Raphael Sofaer
f60a748c21
Ajax in the contacts for mentioning after page load
2011-07-15 14:23:44 -04:00
Raphael Sofaer
37e939d476
Use activerecord-import in ReceiveLocalBatch. The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway.
2011-07-14 21:27:16 -07:00
Sarah Mei
bcb4fac465
Vanna doesn't include helpers so we have to include them in views separately to use them. The absence of this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails).
2011-07-14 18:24:33 -07:00
Raphael Sofaer
55009a8381
Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch.
2011-07-13 10:59:41 -07:00
Arzumy MD
03e79da171
fixed missing i18n key for no_services
2011-07-13 12:17:47 +08:00
Raphael Sofaer
0fae31dacf
Prevent people pagination links on tag pages from breaking lines
2011-07-12 17:21:02 -07:00
Raphael Sofaer
df5177a50d
Fix mobile AS photo page
2011-07-12 17:05:37 -07:00
Raphael Sofaer
874654b461
Reenable sessionscontroller after_filter
2011-07-12 17:01:40 -07:00
Raphael Sofaer
c3ecc59bee
Bring back the js people pagination on tag show, we need a js file for that page
2011-07-12 16:45:29 -07:00
Raphael Sofaer
14759b2c80
Use person_link in notifications_helper, move hovercard css out to a file
2011-07-12 16:21:03 -07:00
danielgrippi
6f807f263a
fix the specs; pull back guid in post_visibilities_controller
2011-07-12 15:18:28 -07:00
Raphael Sofaer
e30b82dd45
Fix resend links in inviter
2011-07-12 15:08:03 -07:00
MrZYX
9304db68f1
fix peoples#aspect_membership_dropdown
2011-07-12 20:04:55 +02:00
danielgrippi
dba8a6598c
don't constrain photos to squares on photo index
2011-07-12 00:21:44 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f6bf17897d
actually displaying the facebook results(first time connection), updating attributes instead of discarding the changes
2011-07-11 16:52:30 -07:00
Raphael Sofaer
58e844eb1f
fade in like action for comments
2011-07-11 16:53:14 -07:00
Raphael Sofaer
8f50c622fa
Fix contentUpdater spec, adjust migration and fix a couple of the js viwes
2011-07-11 16:17:11 -07:00
danielgrippi
67882c775e
Addded Diaspora::Likeable module. Corrected the unique index for likes to include author_id; extracted before_save callback needed for tags into Diaspora::Taggable.
2011-07-11 15:06:35 -07:00
danielgrippi
d364f158b8
cache counters in for likes. pending Diaspora::Likeable module...
2011-07-11 15:05:55 -07:00
danielgrippi
e0bbde4ce2
comment likes wip. need to backfill some tests, make views nicer
2011-07-11 15:03:28 -07:00
danielgrippi
797a6f5ca9
like comments js response wip
2011-07-11 15:02:46 -07:00
danielgrippi
2e15b6a61e
Likes in comments, cache counter disabled for now.
2011-07-11 15:00:48 -07:00
Raphael Sofaer
e59f49aace
Fix specs after merge
2011-07-11 14:38:51 -07:00
Raphael Sofaer
eafe6a7c85
Merge branch 'ajaxy-comments'
2011-07-11 14:05:45 -07:00
Raphael Sofaer
39ff51a9d7
Make comments index ajaxy
2011-07-11 14:03:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
594c9b02b1
A admin is now able to allow open invitations
2011-07-11 13:32:02 -07:00
Raphael Sofaer
3f555eefc4
Server side of ajaxy comments done, need to modify comments/_comments and make it work.
2011-07-11 09:11:16 -07:00
Maxwell Salzberg
0444613e38
fix for profile photto uploader preview
2011-07-10 23:01:11 -07:00
Raphael Sofaer
71dbfce23f
Doc new_comment_form
2011-07-10 21:44:34 -07:00
Raphael Sofaer
2fb0fce1a8
Nest likes and comments routes in the post route
2011-07-10 21:44:34 -07:00
danielgrippi
875eaffd42
added missing class to cubbies photos in the stream for the lightbox
2011-07-10 21:42:37 -07:00
danielgrippi
d69f89f689
forgot an attr on cubbies photos
2011-07-10 21:29:32 -07:00
danielgrippi
776368d45e
added left/right arrow events to the lightbox; lightbox only on stream element images for now
2011-07-10 21:09:00 -07:00
danielgrippi
e09ddef361
DH DG; lightboxin wip
2011-07-10 21:08:34 -07:00
Raphael Sofaer
97ca10ddda
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
2011-07-10 20:06:31 -07:00
danielgrippi
6a165c0e3d
made show pages wider for status messages. made names blue in comments for easier reading
2011-07-10 18:54:38 -07:00
danielgrippi
7b7f3fc086
fix up aspects/edit popup a little
2011-07-10 18:34:47 -07:00
danielgrippi
e84635dae2
constrain in the image uploader, don't crop
2011-07-10 17:03:38 -07:00
Manuel Schölling
0855144a0a
Issue #842 : Sortable aspects
...
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
2011-07-10 20:37:11 +02:00
Raphael Sofaer
c83276a9d9
OK, now I get what was going on.
2011-07-07 22:17:42 -07:00
danielgrippi
029e9c55c2
don't display public posting option if not posting to all aspects
2011-07-07 15:50:33 -07:00
Raphael Sofaer
968100860a
Don't show commented tags in the tag stream for now, until we optimize that
2011-07-07 15:39:28 -07:00
Raphael Sofaer
e98cc4b960
Sort on and index taggings, ftw
2011-07-07 15:14:29 -07:00
Raphael Sofaer
d0ce257107
Revert "Revert "Merge branch 'hashtags-in-comments'""
...
This reverts commit d2e26f6937
2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937
Revert "Merge branch 'hashtags-in-comments'"
...
This reverts commit f85d5ad6d4b8d70393f4
2011-07-07 13:39:15 -07:00
danielgrippi
9d506231b1
querying correctly in tagscontroller to include posts with comments containing hashtag
2011-07-07 12:27:48 -07:00
danielgrippi
310b9969f3
hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here...
2011-07-07 12:21:57 -07:00
danielgrippi
b8d70393f4
include authors and profiles on tags show page
2011-07-07 11:14:10 -07:00
Raphael Sofaer
8cf0fa8446
Don't get tags in the publisher
2011-07-07 10:48:07 -07:00
Raphael Sofaer
254d83b278
Simplify SocketsHelper in light of adding current_user helper to SocketsController
2011-07-07 09:06:24 -07:00
danielgrippi
e994c90559
don't show hovercard for current_user in likes field + fixed hovercard styling in likes field
2011-07-06 21:33:59 -07:00
danielgrippi
fdaa44ca9c
add hovercards to links in likes
2011-07-06 21:09:24 -07:00
danielgrippi
f0fa79bb09
Revert "ordered hash stuff"
...
This reverts commit 2d98b939d1
2011-07-06 19:13:34 -07:00
danielgrippi
2d98b939d1
ordered hash stuff
2011-07-06 19:11:53 -07:00
danielgrippi
b1fc87ea30
add basic overview page to admin controller
2011-07-06 19:08:09 -07:00
Raphael Sofaer
03df3e3e59
Fix manages_aspects feature
2011-07-06 19:00:28 -07:00
danielgrippi
f3d185fe41
hovercard on comments
2011-07-06 17:13:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381
moved the are you sure dialog into a translation
2011-07-06 16:34:51 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8d94115bbc
added the start conversation button back with a message if you try to add more than 16 people
2011-07-06 16:05:12 -07:00
danielgrippi
76382b074c
fix jammit warnings; specs
2011-07-06 14:32:40 -07:00
Raphael Sofaer
9765bdc391
Don't get posts for a hovercard request
2011-07-06 14:11:07 -07:00
danielgrippi
fd015129c4
final touchups to hovercard
2011-07-06 13:51:19 -07:00
danielgrippi
d51e9431a6
fixed some styling/positioning. don't display a hovercard for the current user's person links
2011-07-06 12:45:16 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0
made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses
2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485
wip. Person#as_json is breaking right now
2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382
HOVERCARD
2011-07-06 12:45:16 -07:00
Daniel Grippi
0cd3878bb8
Merge pull request #670 from galaxor/1137-bad_rsa_keys
...
1137 bad rsa keys
2011-07-06 10:00:44 -07:00
MrZYX
8c1c546bdf
fixed #884
2011-07-06 15:38:54 +02:00
danielgrippi
d74942877f
touch up message inbox view
2011-07-06 00:38:25 -07:00
Raphael Sofaer
4a9900dff6
Fix some ui bugs on the post show page
2011-07-05 18:52:00 -07:00
Raphael Sofaer
2a9fc776e6
Downcase tag name in tagscontroller
2011-07-05 18:03:46 -07:00
Raphael Sofaer
efd6275e68
Don't instantiate objects in tag_string
2011-07-05 17:56:38 -07:00
Raphael Sofaer
0ac28cd9ea
Pending spec for 500 on capital letters
2011-07-05 17:31:49 -07:00
danielgrippi
41be7a37b0
hide aspect dropdowns on tag show temporarily
2011-07-05 16:42:32 -07:00
danielgrippi
ecaf7974e3
removed fixed sidebar for tag following
2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5
Color the follow tag button
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096
tags controller fixed
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c
refactored the controller, moved flash message into translations
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
edac7601f5
checkedout the create.js from master
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d15673c3de
changed the variable name
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8
a user can now follow and unfollow a tag
2011-07-05 15:03:26 -07:00
danielgrippi
632eacc51f
css fix on followed tags nav
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7
WIP you can now follow a tag, needs a clean up, and ajax love
2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
77d28b4117
wip following tags
2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd
fix message focus bug
2011-07-05 12:17:23 -07:00
danielgrippi
f5e3c4c0d7
fixed the specs.
2011-07-05 11:29:45 -07:00
danielgrippi
ecd79766ce
remove aspect badges
2011-07-04 22:36:21 -07:00
Raphael Sofaer
162f035c62
Merge branch 'ajaxy-likes'
2011-07-04 22:12:12 -07:00
Raphael Sofaer
4f056dca8e
Ajax in likes in stream
2011-07-04 22:10:30 -07:00
danielgrippi
1aed8e7e16
testing fixing left nav on aspect/index
2011-07-04 21:55:04 -07:00
Ryan Hughes
00589c10c6
If one user has a bad rsa key, don't abort all sends.
2011-07-04 18:00:55 -07:00
danielgrippi
d75a682199
compress png
2011-07-04 17:26:34 -07:00
danielgrippi
9debec4410
fix the build.
2011-07-04 16:53:43 -07:00
danielgrippi
00448f615e
dont try to preload photos as they are only for StatusMessages. ugh.
2011-07-04 16:38:28 -07:00
danielgrippi
85d6eb70e7
fix cubbies info page (removed reference to token, changed infographic)
2011-07-04 16:14:05 -07:00
danielgrippi
9eac29d15e
preload people and their profiles in comments on aspects/index
2011-07-04 16:14:04 -07:00
Maxwell Salzberg
b645a77be9
translate a string in services#index view
2011-07-04 13:59:44 -07:00
Maxwell Salzberg
408690f0fa
remove stray puts
2011-07-04 13:57:23 -07:00
Maxwell Salzberg
2f1118f95f
refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect
2011-07-04 13:54:05 -07:00
Raphael Sofaer
04f8abcf13
Check for all aspects in selected_contacts link switch, take out a couple extra steps
2011-07-04 08:39:07 -07:00
Raphael Sofaer
a715630471
make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop.
2011-07-04 08:11:12 -07:00
Raphael Sofaer
af6547815e
Some view helper cleanup
2011-07-04 07:36:01 -07:00
danielgrippi
403d18bac4
fixed content expander in comments; comments have a smaller limit than posts
2011-07-03 22:06:58 -07:00
Michael Sofaer
d2b7168195
Use an explicit per_page param instead of switching on format
2011-07-03 21:16:58 -07:00
danielgrippi
511a651377
don't query for mentioned people if mention syntax isn't present in message text.
2011-07-03 20:36:46 -07:00
danielgrippi
829c86823d
remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them
2011-07-03 20:08:11 -07:00
danielgrippi
04e53fa1fc
remove unused aspect helper methods
2011-07-03 19:20:50 -07:00
Maxwell Salzberg
73172f9c22
remove completely unused method #yay
2011-07-03 18:04:00 -07:00
danielgrippi
45834f1edf
remove 'start a conversation button' until we have a limit, or a warning message if a person is sending a message to more than ~20 people
2011-07-03 14:50:37 -07:00
Maxwell Salzberg
a104f4e309
if a user is logged in, redirect them to the proper authenticated view, not the public route
2011-07-03 09:13:39 -07:00
Maxwell Salzberg
4b0157f5b0
fix notification mark all as read ui bug
2011-07-03 08:20:24 -07:00
Maxwell Salzberg
6f72a0cb38
order facebook friends
2011-07-02 19:01:58 -07:00
danielgrippi
8a8f8db9ad
Merge branch 'notifications'
2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c
visual touchups, show loading gif right away
2011-07-02 17:53:07 -07:00
Dan Hansen
eb0fbe519c
remove read/unread state, always mark notifications as read, only return 5 notifications for json requests
2011-07-02 16:39:01 -07:00
Raphael Sofaer
f161377480
Stop loading contact objects on the main page, all we need is people
2011-07-02 16:28:52 -07:00
danielgrippi
24d84d7756
fixed stupid 500 caused by publisher
2011-07-02 16:02:14 -07:00
danielgrippi
689bde2e5f
take out useless 'reshare'
2011-07-02 15:41:50 -07:00
Raphael Sofaer
86c06c4d15
Try taking out some contact loading again
2011-07-02 14:43:15 -07:00
Raphael Sofaer
6b46d69b65
Revert "Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost."
...
This reverts commit 7baeaebe57
2011-07-02 14:38:17 -07:00
Raphael Sofaer
7baeaebe57
Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost.
2011-07-02 12:39:25 -07:00
Maxwell Salzberg
2d9d9bd1a1
Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same""
...
This reverts commit 696779d589
2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589
Revert "remove perform delegate: use a gem that unobtrusivly does the same"
...
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9
2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9
remove perform delegate: use a gem that unobtrusivly does the same
...
thing. use built in resque inline method for single process mode
2011-07-02 11:57:10 -07:00
mb-log
64898c522e
Don't need edit button on public profiles
2011-07-02 16:56:09 +02:00
Dan Hansen & Daniel Grippi
b48b182c73
STYLIN'
2011-07-02 00:04:14 -07:00
Raphael Sofaer
49d905c719
Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string?
2011-07-01 23:27:53 -07:00
Dan Hansen
05688c2f43
notifications wip
2011-07-01 22:46:54 -07:00
danielgrippi
922ccd8423
limit contact photos in aspect/index.js
2011-07-01 22:30:21 -07:00
danielgrippi
24483548ec
need to grab all contacts on aspect index for autocomplete
2011-07-01 22:26:08 -07:00
danielgrippi
e0816ccc39
author info in stream element should be incased in a div. WHOOPS.
2011-07-01 22:12:43 -07:00
danielgrippi
8bf6ad45a5
various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine)
2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab
added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index
2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a
More visual cleanup; top nav; edit aspects
2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e
Almost done with left-nav, added link to aspect edit facebox, colored share button
2011-07-01 14:22:38 -07:00
danielgrippi
cd9be3904b
publisher rework
2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a
minor visual changes, more or less. facebox headers are now white.
2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe
add contact images to aspect index, removed comment background color, add vertical rule to people pages
2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550
DG RS left nav almost there. touched up publisher, among other things
2011-07-01 10:49:19 -07:00
Raphael Sofaer
d68c8a3a03
Merge pull request #657 from ndee/1050-cancel-message
...
Issue #1050 : Changed cancel-link of a new message to back
2011-07-01 10:46:27 -07:00
Sarah Mei
948a7c5d55
DH SM MS Fix showing image in the publisher when it gets uploaded
2011-06-30 20:36:15 -07:00
MrZYX
05907246e9
use an array of arrays instead of a hash to ensure order, thanks REE!
2011-06-30 23:40:41 +02:00
danielgrippi
4e48db23f0
aspect dropdown shows name of aspect if contact is only in one; green
2011-06-30 12:18:41 -07:00
Robin Wellner
91dd4f847a
Adds support for converting <-> to ↔ in markdownify
2011-06-30 14:27:39 +02:00
danielgrippi
3a5f0c9678
proper uniqueness validation in auth model
2011-06-29 17:32:55 -07:00
danielgrippi
38ddb4b744
correctly scoping the uniqueness validation dg iz
2011-06-29 17:24:05 -07:00
danielgrippi
55efe132c5
corrected authorizations_controller_spec to assert on response codes
2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577
only allow https and www.cubbi.es in authorizations controller for now
2011-06-29 16:40:43 -07:00
Raphael Sofaer
d1a149f9f6
Some stuff to not need an application.yml in CI
2011-06-29 11:52:13 -07:00
Raphael Sofaer
5243a3203f
Fix AS::Photo show page
2011-06-29 11:33:32 -07:00
Raphael Sofaer
f2e3102562
Make the aspect_dropdown_list_item easier to read
2011-06-29 11:21:44 -07:00
Raphael Sofaer
1ced4c502d
Put as_json back in person
2011-06-29 08:48:34 -07:00
danielgrippi
53c87562f4
switch aspect listings and info stuffs on aspect/index
2011-06-28 23:40:57 -07:00
danielgrippi
b8ea8e9e75
start a conversation with an aspect from contact index page
2011-06-28 23:09:11 -07:00
Raphael Sofaer
1af945de11
Merge branch 'master' into oauth
...
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
2011-06-28 17:13:38 -07:00
Michael Sofaer & Raphael Sofaer
d355e230b1
all aspects helper
2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
839756573d
set post correctly
2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041
notifications tests pass
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d
reset the notifications helper to master's version and monkey patch header
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f
Move some DB logic from helper to controller
2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
bc874e92cd
close link for notifications ajax
2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6
Handle multiple notification objects correctly
2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c
proof of concept for notifications overlay
2011-06-27 19:51:35 -07:00
Michael Sofaer
ef7580a698
Notifications page works with Vanna
2011-06-27 19:51:35 -07:00
danielgrippi
a6cb04aadb
wider!
2011-06-27 19:38:14 -07:00
danielgrippi
89ca5cf337
DG DH; fix the build
2011-06-27 19:26:03 -07:00
danielgrippi
73fe74c834
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
2011-06-27 18:58:29 -07:00
danielgrippi
00ffade884
sub menu for people only sharing with you on contacts page
2011-06-27 17:22:36 -07:00
Raphael Sofaer
b14271342a
Give more information in error message
2011-06-27 17:09:05 -07:00
Raphael Sofaer
240eb78b08
Change homepage_url to application_base_url
2011-06-27 16:44:18 -07:00
danielgrippi
44b77c58a3
just have a remove from aspect icon when viewing an aspect in contacts index
2011-06-27 16:26:54 -07:00
danielgrippi
f9a23b8120
added inf scroll to contacts index page
2011-06-27 15:54:03 -07:00
danielgrippi
9e92230cf7
make contact listings more compact on contact index (we don't need to know their tags here)
2011-06-27 15:32:39 -07:00
danielgrippi
f839714646
added aspect filtering to contact index. fixed rspec
2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de
don't group by
2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f
sort contacts by last name on contacts page
2011-06-27 14:00:15 -07:00
Raphael Sofaer
17917528f6
IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302.
2011-06-27 12:31:47 -07:00
danielgrippi
a2609f7dac
simple filter on contacts index page (my/all contacts)
2011-06-27 12:12:50 -07:00
Raphael Sofaer
c7b4e2b4f4
Merge remote branch 'drummondj/1049-unconfimed-tags'
2011-06-26 23:24:03 -07:00
Raphael Sofaer
b2f7ff5dd4
Fix notifications.
2011-06-26 21:59:04 -07:00
Raphael Sofaer
e468075ffd
Doc AS::Photo
2011-06-26 20:59:02 -07:00
Raphael Sofaer
d002c14aab
Initial implementation of allowing cross-origin requests in the webfinger flow, so that the unhosted guys can use Diaspora. May not work with caches-page on host-meta. We'll have to use X-Accel-Redirect or something.
2011-06-26 20:29:39 -07:00
Raphael Sofaer
a1a53b34e9
Link to post in text email for comment_on_post. Fix 1144
2011-06-26 20:09:21 -07:00
Raphael Sofaer
b9c2d3758b
What is this?
2011-06-26 20:09:21 -07:00
John Drummond
cc6f82fbc1
Added test for new plantext tag without a # symbol and fixed broken code.
2011-06-25 23:37:51 -07:00
John Drummond
f7abaab276
Issue 1049 fixed by pre-processing params[:profile][:tags_string] and adding # when required
2011-06-25 23:19:30 -07:00
Raphael Sofaer
4fef3b7172
Docs because I forgot what StatusMessagesController#new is
2011-06-25 16:17:38 -07:00
Raphael Sofaer
b3556870d3
Merge remote branch 'yithian/1049-allow-plaintext-tags'
2011-06-25 11:23:55 -07:00
danielgrippi
54ef22b83e
lol, just needed to remove 'http://' in the specs to get the controllers passing again
2011-06-24 18:38:30 -07:00
Raphael Sofaer
5884a900a2
Get rid of manage
2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8
cucumber is passing rspec is red
2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a
WIP getting rid of app_url in params
2011-06-24 11:22:44 -07:00
Raphael Sofaer
c01641b619
Avoid words in person_image_tag
2011-06-24 11:09:10 -07:00
Raphael Sofaer
2857de5f1b
doc a user method
2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507
Doc
2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0
added temporary special casing on app_url in authorizations controller
2011-06-23 19:13:26 -07:00
danielgrippi
15571ecff0
render ASPhoto show page just like status message show for now
2011-06-23 15:47:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f
fixed every spec but the activity stream photos controller spec
2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00
collapsed oauth2 migrations; made app factory
2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213
Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env.
2011-06-23 14:20:53 -07:00
danielgrippi
c91cf6f38c
properly display app icon on authorizations index
2011-06-23 13:59:03 -07:00
danielgrippi
a9b7cd1254
nicer auth prompt. wip.
2011-06-23 12:40:47 -07:00
Alex Chvatal
7a56322b60
Adds ability to parse plain-text tags
...
Tags that haven't been autocompleted and clicked on will be
added as tags as well. There should only be one tag like this
at a time, since adding a space between tags turns it into
a list item.
2011-06-23 12:23:16 -04:00
Dis McCarthy
d56cac1639
List diaspora id on profile pics, courtesy diasporg
2011-06-23 09:08:07 -04:00
Raphael Sofaer
40560680fe
Title on sessions#new
2011-06-22 18:57:02 -07:00
danielgrippi
13810336d3
load monkeypatched models in authorizations controller
2011-06-22 18:32:24 -07:00
danielgrippi
5917f0d695
added JWT verification support to diaspora
2011-06-22 16:15:03 -07:00
Raphael Sofaer
a987b198fd
Fix search in PG
2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417
Fix direct query execution issues in PG by using select_values/select_rows instead of execute.
2011-06-22 14:47:59 -07:00
Raphael Sofaer
02739259b6
Don't hide the forgot password link
2011-06-22 13:19:54 -07:00
Andreas Henrich
7b3711a788
Issue #1050 : Changed cancel-link of a new message to back
2011-06-21 18:48:34 -04:00
Ilya Zhitomirskiy
c09fb776fb
added a couple of validations on the Oauth models, added an index on a user's authorizations
2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5
put some dependent destroys on models for better sqlite compatability
2011-06-19 23:39:57 +02:00
Raphael Sofaer
2d3eeb9c46
Get another couple specs green on pg
2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7
Make contacts appear at the beginning of search results in postgreSQL
2011-06-19 16:16:30 +02:00
Maxwell Salzberg
1f11e51a9b
add object_aspect_ids to status_message controller
2011-06-16 15:59:03 -07:00
Maxwell Salzberg
41e8a32b28
tests for data methods
2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6
move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz
2011-06-16 11:17:14 -07:00
Ilya Zhitomirskiy
75a1012c1c
moved the monkey patching to a model, need to do a couple of validations
2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b3cee70ead
if the request is bad give it as a response
2011-06-15 17:51:29 -07:00
Ilya Zhitomirskiy
78253b6885
resetting the token instead if the app already exists, should move the lookup to be homepage url
2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491
green on all the cucumbers WOOT
2011-06-14 18:30:43 -07:00
Raphael Sofaer
cba63030c9
Use rescue_from in CommentsController
2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dca2eca67c
cucumber specs are green
2011-06-14 15:36:05 -07:00
Raphael Sofaer
800e701f89
Document User#accept_invitation
2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1
Take loop out of remove_mentions
2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2
Document liked? and like_for
2011-06-14 10:15:32 -07:00
Ilya Zhitomirskiy
2a4932ea34
WIP verifying sig in the pre-registration endpoint
2011-06-13 22:57:56 -07:00
danielgrippi
b446404348
Revert "Without loaded? I was confused by the liked? and like_for methods."
...
This reverts commit 2103d54fe4
2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4
Without loaded? I was confused by the liked? and like_for methods.
2011-06-13 17:14:00 -07:00
Raphael Sofaer
480d7c47cf
Documentation is so rad.
2011-06-13 17:02:18 -07:00
Ilya Zhitomirskiy
ef0e48a7ff
A user can now revoke an application's token iz ms
2011-06-13 16:48:52 -07:00
Raphael Sofaer
7171aa05ed
Do a little bit more documenting.
2011-06-13 16:31:40 -07:00
Raphael Sofaer
4815482354
Start some real docs
2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
3d77186d35
added authorizations page where a user can see all of their authorized applications
2011-06-13 15:40:55 -07:00
Patrick-Emil Zoerner
319863a7ed
fixed regex to non greedy. Therefore no strip needed.
2011-06-10 20:05:40 +02:00
MrZYX
0847d09950
ignore whitespace inside markdown links
2011-06-10 15:13:16 +02:00
Ilya Zhitomirskiy
56525c9f4f
made a slightly nicer heads up about nil ca_file
2011-06-09 16:28:45 -07:00
Raphael Sofaer
7fd86924ee
Fix pagination in AppsController
2011-06-09 16:23:15 -07:00
Raphael Sofaer
0790c3397e
Delete some useless JS
2011-06-09 16:23:15 -07:00
Ilya Zhitomirskiy
71dd8dc7f3
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/app_config.rb
2011-06-09 15:51:59 -07:00
Raphael Sofaer
e1fb5846b6
Use the example config file if travis
2011-06-09 15:45:01 -07:00
Raphael Sofaer
ac8587290a
Throw in a travis config file to try using travis
2011-06-09 15:31:16 -07:00
Ilya Zhitomirskiy
a03423309d
fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png
2011-06-09 15:12:35 -07:00
Raphael Sofaer
775dbda2b2
Chubbies now uses diaspora-client
2011-06-09 12:40:30 -07:00
Ilya Zhitomirskiy
b575983c22
WIP certs
2011-06-08 18:46:38 -07:00
Ilya Zhitomirskiy
808754f8bd
added the cert bundle for facebook http things
2011-06-08 18:20:47 -07:00
Raphael Sofaer
9453f65b7d
Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time.
2011-06-08 12:00:08 -07:00
Raphael Sofaer
d9d66a5c31
WIP auth form and more oauth stuff
2011-06-08 11:55:11 -07:00
Arzumy MD
c0f5571795
do not unnecessary build the feed in users_controller#public when we want to redirect anyway
2011-06-08 17:50:13 +08:00
danielgrippi
96fc104218
paginate looks for stream elements
2011-06-06 23:12:14 -07:00
danielgrippi
b8a6bf9f51
trying something different on app show page. worth a shot.
2011-06-06 22:59:31 -07:00
Raphael Sofaer
8a2fece0f5
Don't n-query in contacts_sharing_with
2011-06-05 01:03:34 -07:00
Raphael Sofaer
753be12a1f
Don't force a query on like count
2011-06-05 00:32:10 -07:00
Raphael Sofaer
6d105e5c09
Don't n query in UsersController#public
2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9
Tumblr service swallows exceptions raised by tumblbeasts.
2011-06-04 20:45:09 -07:00
Raphael Sofaer
21463582d4
Fix pagination on notifications page, it was getting all notifications for a user
2011-06-04 15:48:10 -07:00
Maxwell Salzberg
de55a1cbb3
remove remember aspects feature
2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7
Chubbies now uses sqlite to have tables of pods and users
2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d
chubbies tests mow take diaspora handle
2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03
Chubbies now sends manifest data to create a client
2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d
Chubbies now sees that it has no secret and registers itself.
2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d
Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow
2011-06-03 16:22:38 -07:00
danielgrippi
40ab168a5a
DH DG; fix re-liking a post after unliking it
2011-06-03 12:20:59 -07:00
Raphael Sofaer
686464c36e
move account deletion out of a tranaction and into a job
2011-06-03 12:05:57 -07:00
Maxwell Salzberg
149c086d5e
make the tumblr posting smarter
2011-06-02 17:02:29 -07:00
Dan Hansen
bc465848c9
MS DH fixed like sizes, everywhere
2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63
fix status message show page and break out Post to it's own javascript widget
2011-06-02 17:45:45 -05:00
MrZYX
82ca293825
fix services index with incomplete oauth_keys.yml
2011-06-02 13:20:22 +02:00
MrZYX
668c4ddfc5
d'oh
...
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
2011-06-02 12:32:21 +02:00
Maxwell Salzberg
f7181a7123
add tumblr translation
2011-06-01 22:43:23 -07:00
Maxwell Salzberg
72c6efe41c
basic specs
2011-06-01 22:38:15 -07:00
Maxwell Salzberg
5cbbdf2949
initial post to tumblr support
2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262
added pagination for people on tag pages
2011-06-01 18:59:15 -07:00
Raphael Sofaer
283e376712
Move initialize_signatures method out of user and into relayable
2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857
Change :on to :post in the comment and post methods
2011-06-01 16:45:29 -07:00
Sebastian
ea85daadc4
Added UsersController#confirm_email with route and some specs
2011-06-01 16:26:54 +02:00
Sebastian
f42055ae24
User#confirm_email with specs
2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153
Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update
2011-06-01 16:26:53 +02:00
Sebastian
602382e24e
Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en).
2011-06-01 16:26:53 +02:00
Sebastian
5b408ecca3
Added User#unconfirmed_email and #confirm_email_token with specs
2011-06-01 16:26:53 +02:00
MrZYX
de9e41a331
fixed total contact count
2011-06-01 12:23:37 +02:00
Raphael Sofaer
537de1ce4c
build_like and build_comment now take only an options hash, and call build_relayable
2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6
Move YoutubeTitles callback into module
2011-05-31 12:27:57 -07:00
Jonne Hass
1be2845687
Merge pull request #650 from yolk/1104-wrong-profile-picture-size
...
fixed #1104 wrong profile picture size
2011-05-31 10:33:26 -07:00
Sebastian
d4d0eacf49
fixed #1104 wrong profile picture size
2011-05-31 19:06:35 +02:00
Sebastian
d9f23b5e2a
fixed #1018 - aspects width on /aspects/manage
2011-05-31 18:29:24 +02:00
MrZYX
05aa73e93c
made everything in the sidebar translatable
2011-05-30 18:06:05 +02:00
MrZYX
3db4772652
ignore searchable if one searches by handle in people#index
2011-05-29 22:58:33 +02:00
MrZYX
502f467012
fix youtu.be links
2011-05-29 22:13:42 +02:00
MrZYX
42f5f7fc32
fixed find person by handle
2011-05-29 21:27:20 +02:00
MrZYX
cd887e9373
fixed unlike the right way
2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208
Rails, welcome to 2011. Fyi: string concatenation is bad
2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f
fix validation message if text is too long
2011-05-29 16:45:41 +02:00
MrZYX
0febee6fbb
fix unlike
2011-05-29 13:43:56 +02:00
Sarah Mei
828cbab792
Keep pod_url and pod_uri settings in sync.
2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de
Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE.
...
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
2011-05-28 19:44:40 -07:00
MrZYX
54f1effdf8
Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora
2011-05-27 19:35:39 +02:00
Jakob Kramer
0efaa77c46
fixes bug #1092
2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2
Photo association on GUID 2/2: replace status_message_id with status_message_guid
2011-05-27 18:56:24 +02:00
MrZYX
ba08c38a74
fixed activity_streams::photo controller spec
2011-05-26 00:01:10 +02:00
Maxwell Salzberg
52487e87de
added a very basic page for the stream of all public activity stream photos
2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e
record objectId in post (cant use object_id booo)
2011-05-25 12:16:52 -07:00
Maxwell Salzberg
56644c9d1e
use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n
2011-05-24 21:45:12 -07:00
Sarah Mei
5e56b8a0ee
HULK SMASH PENDING SPEC
2011-05-24 23:36:00 -04:00
MrZYX
db22be43a8
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386
remove text from token page explaining there is no FF cubbies extension
2011-05-24 07:42:37 -07:00
Maxwell Salzberg
20cc3f0c7d
change the smiley for a heart.... the smiley looked sad at that size..
2011-05-23 23:53:18 -07:00
Raphael Sofaer
fc7b2cfe3f
Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation.
2011-05-23 23:09:48 -07:00
Raphael Sofaer
609439f948
Destroy notifications on contact destroy
2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781
Gross, but hopefully temporary solution for namespaced classes and old versions of libxml
2011-05-23 16:24:28 -07:00
Raphael Sofaer
cc84051541
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0
Fix AS::Photo federation, hopefully
2011-05-23 13:56:42 -07:00
MrZYX
c732940b58
match trailing slash for vimeo links
2011-05-23 14:32:16 +02:00
danielgrippi
8e3149ca01
better page explaining cubbi.es and why we're promoting it on diaspora
2011-05-23 01:14:33 -07:00
Maxwell Salzberg
d776105558
grammer nazi cleanup of notification_people_link and refactor + tests
2011-05-22 17:18:44 -07:00
Maxwell Salzberg
90d62f3c8a
small ui tweak for mobile login page
2011-05-22 15:43:39 -07:00
Maxwell Salzberg
a4017ba16f
small linebreak for cubbies view for mobile
2011-05-22 15:25:37 -07:00
Maxwell Salzberg
59ae829254
there is a dumb bug where likes are targeting themselves
2011-05-22 15:02:01 -07:00
Maxwell Salzberg
77fc40d404
add application helper to notification helper spec, made the link an object_link rather than status_message_link
2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635
added failure test for deleted likes
2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf
notification page now has links for likes
2011-05-22 14:35:35 -07:00
Maxwell Salzberg
d4d3b1e44c
MSSM like notification are concatinated, and backfilled some like tests
2011-05-22 13:59:33 -07:00
MrZYX
a68031179b
prevent inviting yourself, #515
2011-05-22 14:48:07 +02:00
MrZYX
07395fb2c9
added maxlength attribute to aspect name input, fixed #675
2011-05-22 13:50:44 +02:00
danielgrippi
3fb81d37d0
missing closing tag in aspect_dropdown helper
2011-05-21 15:08:19 -07:00
danielgrippi
6a108104e8
add spacing
2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80
better right pane sections
2011-05-21 14:52:59 -07:00
danielgrippi
7c949f4377
show diaspora handle on token page
2011-05-20 21:48:45 -07:00
Raphael Sofaer
286f1b876d
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Maxwell Salzberg
1e3971da3d
i think we want to not prevent non admins...
2011-05-19 22:22:03 -07:00
Arzumy MD
a060acffeb
add spec for admins_controller#add_invites
2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5
removed user variable from admins_controller#user_search
2011-05-20 09:37:32 +08:00
Raphael Sofaer
93be5497a7
Small controller for generating an auth token, if you are an authable user
2011-05-19 18:29:53 -07:00
Raphael Sofaer
ed61c53e09
Wrap UsersController to not 500 when no params are submitted
2011-05-19 17:01:42 -07:00
danielgrippi
f2259e5e25
put link in via link translation, add via link to mobile site
2011-05-19 16:06:29 -07:00
danielgrippi
83756c5713
actually add the views. fix object_path
2011-05-19 15:34:39 -07:00
danielgrippi
d7899d10e3
Fix various links in to cubbi.es objects
2011-05-19 15:17:42 -07:00
Maxwell Salzberg
69e83bb065
remove whitespace on your own profile
2011-05-19 15:08:17 -07:00
Maxwell Salzberg
8796c5b722
fixed build, added debugging info for notification 500s
2011-05-19 14:48:09 -07:00
Maxwell Salzberg
3c4c62abd5
moved auth token to admins page, and added a link in the dropdown
2011-05-19 14:23:04 -07:00
danielgrippi
925292a7b2
hey, federation works.
2011-05-19 13:20:58 -07:00
danielgrippi
177061d1c5
added via links
2011-05-19 13:13:08 -07:00
danielgrippi
6c31867345
check for AS object in partial hack
2011-05-19 12:40:05 -07:00
danielgrippi
e7095ba788
Tests now pass, stream_element needs de-hacking
2011-05-19 12:19:27 -07:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0
only generate new token if admin
2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86
show photos from cubbies in the streams
2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520
Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed.
2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6
added token authenticatable to user model
2011-05-19 11:57:06 -07:00
MrZYX
331aa1ff60
you know the facepalm smiley? Here it is: m(
2011-05-19 20:10:35 +02:00
Ilya Zhitomirskiy
6cda0bf9ea
Revert "added a podwide email preference"
...
This reverts commit 60c0a9839b
2011-05-18 10:38:45 -07:00
MrZYX
66380fd33f
fixed some translations
2011-05-18 13:55:50 +02:00
MrZYX
b0e9f5388b
fixed a translation; added that missing </li> for you, fixed #1078
2011-05-18 13:22:05 +02:00
Ilya Zhitomirskiy
60c0a9839b
added a podwide email preference
2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08
Merge branch 'evant_log_post_merge'
2011-05-17 18:17:14 -07:00
Raphael Sofaer
c942f76d29
Turn off user collapse and turn up status messages to over 9000
2011-05-17 18:14:35 -07:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
Maxwell Salzberg
e95288e074
notifications by created at date so they stop jumping when you make them read
2011-05-17 14:44:42 -07:00
danielgrippi
0c62277961
add add to aspect dropdown on notifications page
2011-05-17 14:41:15 -07:00
Raphael Sofaer
d7980978fa
Render collection in services finder
2011-05-17 14:04:42 -07:00
danielgrippi
26ac8b8285
fix 500 on people index
2011-05-17 12:24:07 -07:00
danielgrippi
57a2a8fa71
remove button to add yourself to an asepct on your profile page:
2011-05-17 12:14:05 -07:00
danielgrippi
775e7b6b2b
Merge branch 'master' into follow
...
Conflicts:
features/step_definitions/user_steps.rb
2011-05-17 11:33:35 -07:00
Raphael Sofaer
5218bd89c6
Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated.
...
This reverts commit 0a8ce3b9f2f9ef9a4b47164226a3d7
2011-05-17 10:33:33 -07:00
MrZYX
1746f610b6
if we disable websocket in single process mode, there's no need for the JS
2011-05-17 19:26:37 +02:00
Raphael Sofaer
0a8ce3b9f2
Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge
2011-05-17 10:24:28 -07:00
Raphael Sofaer
f9ef9a4b47
Make FakeServiceUser assoc methods tolerant of nil
2011-05-17 10:14:39 -07:00
Raphael Sofaer
164226a3d7
Replace ServiceUser with fakes in ServicesController
2011-05-16 18:48:03 -07:00
danielgrippi
d70f10b609
made dropdown selectors sexi
2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2
Fix password reset, add cucumber feature
2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c
Merge branch 'master' into follow
...
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
2011-05-16 14:56:28 -07:00
MrZYX
956f0044a9
set @contacts_of_contact_count in photos#index, thanks LPrelle
2011-05-16 16:21:13 +02:00
MrZYX
e338886910
fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled
2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
2011-05-16 02:16:46 -07:00
Sarah Mei
43ab8cfcfa
Tell devise that :mobile is a navigational format.
2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6
Users can log in on their phones again.
...
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
2011-05-14 14:58:52 -07:00
danielgrippi
01be909e38
well, that was dumb. (fix cucumber)
2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc
misc visual cleanup on mobile
2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc
login as its own js file. accounted for the autofil state
2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b
update login page
2011-05-13 22:05:35 -07:00
danielgrippi
a02b9c01c8
eager loading aspect memberships
2011-05-13 18:22:42 -07:00
danielgrippi
30796de400
switching the order around to utilize eagerloading
2011-05-13 16:58:24 -07:00
danielgrippi
ee49fb3547
no more n-query in the view problem
2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410
Finish fixing password changing and keeping emails downcased
2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441
Downcase emails upon inviting
2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1
Don't use rails case_sensitive false, it is very slow.
2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1
update devise_invitable and devise
2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb
pulled new aspect into modal window
2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17
one cuke failing. wip
2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf
fixed cucumber with an exception of one step. added dropdowns to tag pages
2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500
slimming down application_helper, moved markdown and aspect related methods to individual helpers
2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992
fix 500 on tags#show
2011-05-12 12:32:31 +02:00
MrZYX
9f070593ff
check if we can all cleaned_is_rtl? before doing it in direction_for helper
2011-05-12 11:05:32 +02:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea
fixed the formatting on emails
2011-05-11 17:02:05 -07:00
Raphael Sofaer
970190fb7a
OMG SO MANY EMAILS, fixed
2011-05-11 16:07:24 -07:00
danielgrippi
c67d143719
dropdown in ContactsController#sharing now works
2011-05-11 15:47:13 -07:00
Raphael Sofaer
6fa433ced8
added the header back
2011-05-11 15:33:39 -07:00
danielgrippi
9f3044838d
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877
added translation to the likes popup, made the notification models a little clearer
2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c
few cucumber steps failing. wip.
2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f
unliking works right now minus on-page feedback
2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4
likes controller now has destroy method. commented out dislikes from views. unlike links not functional.
2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0
Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec"
...
This reverts commit bd74ab4acc
2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc
Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec
2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339
Working on styling the ContactsController#sharing
2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0
Fix facebook finder and tests
2011-05-10 11:22:52 -07:00
=
2a11bb208e
Add message inbox link to mobile menu
2011-05-10 12:08:05 -05:00
zhitomirskiyi
469d5b99a2
WIP added a share view, tests are red
2011-05-09 16:55:22 -07:00
danielgrippi
d34774f4e5
png favicon
2011-05-09 16:24:24 -07:00
danielgrippi
68601e392e
halfway to a better welcome/getting started page. wip.
2011-05-08 22:15:26 -07:00
MrZYX
3b7dd1906f
fixed 500 on /people/:person_id/photos
2011-05-08 21:36:27 +02:00
Raphael Sofaer
160e01f7bd
Fix broken sorting by activity
2011-05-07 00:50:26 -04:00
Maxwell Salzberg
7a2f6dae10
fixed js error on new comments on statusmessage show page
2011-05-06 15:29:39 -07:00
Arzumy MD
6ba2b00fb8
cleaned up formatting in application_helper, removed unnecessary return
2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8
spec for application_helper#page_title, with default text
2011-05-06 00:14:18 +08:00
danielgrippi
7e838fc778
only display contacts you are sharing with in aspect edit panes
2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32
split 'mutual' flag into 'sharing' and 'receiving' on Contact
2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10
#1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor
2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e
moar mappings for process_emoticons
2011-05-04 15:28:42 +02:00
Raphael Sofaer
87864bf4ff
people.diaspora_handle, not profiles.diaspora_handle
2011-05-03 11:39:34 -07:00
Raphael Sofaer
f89b6ae5be
Fix all contacts link
2011-05-03 11:02:08 -07:00
Raphael Sofaer
c7358c8664
Fix rendering into json for names with quotes
2011-05-03 10:50:13 -07:00
MrZYX
a92b28b4bf
general search and replace in markdownify ( #1042 )
2011-05-03 17:46:29 +02:00
Maxwell Salzberg
c20cd5381e
create a new notifciation if previous was read, only concatinate when it is the same unread message
2011-05-02 18:18:30 -07:00
Raphael Sofaer
567b440f3d
Use correct pagination in mobile person show
2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb
fixed adding contact feedback on people search result page
2011-04-30 17:00:52 +02:00
MrZYX
ff58d63191
minor cleanup to routes.rb
2011-04-30 16:28:39 +02:00
MrZYX
6623dbb1f1
fixed #1039
2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd
Fix pagination on tags, specs are red, need to take all helpers out of applicationController
2011-04-28 09:28:59 -07:00
Raphael Sofaer
b4e36878fe
Fix pages after 1 on tag page
2011-04-28 09:28:59 -07:00
Dan Hansen
c1366e0e04
Make photos display inline on StatusMessage#show
2011-04-27 17:06:26 -05:00
Dan Hansen
4a101f25d9
Notifications.js refactor, add specs
2011-04-27 16:22:56 -05:00
Raphael Sofaer
5dcfff104a
Merge remote branch 'ritchewilson/prev_next'
...
Conflicts:
public/stylesheets/sass/mobile.sass
2011-04-19 17:05:12 -07:00
maxwell
9850a3f124
change text on manage services popup
2011-04-18 18:38:03 -07:00
maxwell
62c164e1a4
fixed displays of the days based on locale
2011-04-18 18:29:55 -07:00
maxwell
d70ef86337
make the days the right size in notification page
2011-04-18 17:55:17 -07:00
MrZYX
c06b885aa7
fixed #1027
2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980
basically fixed
2011-04-18 15:10:47 -07:00
maxwell
2223c562c0
first fix of notification page
2011-04-18 15:10:47 -07:00
maxwell
5050307179
Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])"
...
This reverts commit 981d39d220
2011-04-18 15:10:46 -07:00
MrZYX
981d39d220
Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
...
This reverts commit a16e83df9e
2011-04-16 14:03:24 +02:00
danielgrippi
a16e83df9e
touched up notifications page
2011-04-15 10:42:21 -07:00
Raphael Sofaer
4870ffb944
Fix db seed, refactor aspect-filters a bunch, fix stream_element a little
2011-04-13 18:13:26 -07:00
Raphael Sofaer
f13304073b
The specs are green on my dev machine, let's see if CI is still red
2011-04-13 15:19:17 -07:00
Raphael Sofaer
efe79eb351
Fix stream on pages other than 1, rename raw_visible_posts to visible_posts
2011-04-13 14:35:20 -07:00
Raphael Sofaer
85993a694e
Fix people#show sort order
2011-04-13 10:30:32 -07:00
Raphael Sofaer
5afe5f667e
Move js out of notifications index, fix reference to notifications badge
2011-04-12 17:15:02 -07:00
Raphael Sofaer
8c0dcdde08
Notifications should be sorted by updated_at
2011-04-12 14:06:58 -07:00
Raphael Sofaer
363ef2c276
Fix some translations (thanks MrZYX)
2011-04-12 12:24:29 -07:00
Raphael Sofaer
d5ecce7ca6
Merge branch 'limit_similar_contacts'
...
Conflicts:
app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf
fixed disconnecting logic. specs&cucumber green
2011-04-11 15:10:51 -07:00
Raphael Sofaer
080f08187d
Disable typhoeus everywhere but the HTTPMulti specs
2011-04-11 14:52:21 -07:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
danielgrippi
1b8257e960
fixed 'destroy for nil class' warning in cucumber:
2011-04-11 11:11:32 -07:00
MrZYX
440fd26c14
hopefully finally fix #946
2011-04-11 19:15:14 +02:00
MrZYX
ffbe94f75c
revert moved add aspect button to the left for rtl languages, this is already done by CSS
2011-04-11 18:04:50 +02:00
MrZYX
2413b3c4bd
Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl
2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d
added dir attribute to html element; made tipsy gravity dependant on that
2011-04-11 18:00:28 +02:00
MrZYX
e91c153257
fixed #1013 thanks jbivins
2011-04-11 17:08:36 +02:00
MrZYX
fbe91aba3a
refetch profile if it's missing, comment out hydra stub for now because it breaks the specs
2011-04-09 15:20:28 +02:00
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec
specs green after moving ContactController#new to AspectsMembership#new
2011-04-08 11:44:09 -07:00
Raphael Sofaer
927ba96fcc
Take out broken 'start sharing' link from mobile site
2011-04-08 11:09:56 -07:00
Raphael Sofaer
f8359bd77d
Fix PeopleController#show mobile
2011-04-08 10:37:08 -07:00
Raphael Sofaer
761411e153
Mostly fix PeopleController#show for mobile
2011-04-08 10:37:08 -07:00
danielgrippi
aeda5a4e39
dispatching / receiving logic complete. following wip.
2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835
let admin give a user 10 ma user 10 more invites
2011-04-07 17:54:22 -07:00
Raphael Sofaer
a05b141366
Add tagged posts to db seed, make people#show and tags#show infinite scroll
2011-04-07 16:36:14 -07:00
Raphael Sofaer
157b117469
Just style links directly
2011-04-07 15:13:37 -07:00
Raphael Sofaer
d12ec38736
Fix mobile infinite scroll
2011-04-07 15:00:57 -07:00
maxwell
51b3cd9c77
attempt to fix the problem where people who wanted emails were no longer getting them
2011-04-07 14:05:40 -07:00
danielgrippi
4f972a23f6
drop requests table wip
2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
Raphael Sofaer
bbf1bf00cb
Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would.
2011-04-06 12:11:49 -07:00
Raphael Sofaer
fd0fa61d53
Fix query in TagsController#show
2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6
some better http status codes
2011-04-06 17:16:39 +02:00
MrZYX
e925fe622c
oh yeah, render nothing on update if we don't want to redirect
2011-04-06 16:02:52 +02:00
MrZYX
95de299e6e
fixed #953
2011-04-06 14:18:33 +02:00
MrZYX
21b5f7932f
fixed #997 by turning cancel link into a reset button
2011-04-06 13:31:56 +02:00
Raphael Sofaer
9454c3a1b9
Working on fixing infinite scroll, in particular for aspects with the number 2 in their id.
2011-04-05 19:28:40 -07:00
danielgrippi
847f4fd260
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
2011-04-05 18:53:10 -07:00
Raphael Sofaer
59334dfaf5
Remove extra js, fix mobile view
2011-04-05 16:18:04 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
Raphael Sofaer
746a0c38b3
Take another shot at fixing pagination
2011-04-05 13:59:15 -07:00
Raphael Sofaer
4037ce48c5
Delete unused show templates
2011-04-05 13:59:15 -07:00
MrZYX
e7d48a16ee
moved + to the left for rtl languages
2011-04-05 19:33:51 +02:00
Raphael Sofaer
fdb6675f28
Make things more postgres compatible
2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b
follow wip. 2 failures.
2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab
Still working on stream query
2011-04-04 13:06:15 -07:00
danielgrippi
c800b0bfef
use fixtures in request spec; collapsed xml specs
2011-04-04 11:57:25 -07:00
maxwell
94d8fb9f3a
Revert "fpossible fix for mobile site 500 on user login"
...
This reverts commit fe52acb931
2011-04-04 11:11:11 -07:00
maxwell
fe52acb931
fpossible fix for mobile site 500 on user login
2011-04-04 10:58:50 -07:00
maxwell
95c1edbab8
disable duplicate sending of a private message
2011-04-04 10:09:53 -07:00
zhitomirskiyi
eb66f18aaa
removed the hide comments button if there are less than 3
2011-04-04 00:15:22 -07:00
MrZYX
8639dc3a77
fixed #993
2011-04-03 18:36:34 +02:00
MrZYX
c9fd4e0e5b
fixed path in getting started
2011-04-03 15:42:24 +02:00
MrZYX
100d705c2f
fixed #992
2011-04-03 14:57:30 +02:00
MrZYX
b776bb52db
made string on mobile page translatable
2011-04-03 13:17:09 +02:00
MrZYX
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75
added detection of rtl languages on every user based input
2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36
fixed #589 , no CSS!
2011-04-03 02:10:41 +02:00
MrZYX
4b7c9315c8
log error when receiving a post instead of letting the job fail with weired error later in the chain
2011-04-02 17:44:48 +02:00
MrZYX
f98a4ee42c
correct links to atom feed
2011-04-02 17:35:23 +02:00
MrZYX
65263f1905
damn, typo
2011-04-02 16:02:51 +02:00
MrZYX
e8b006eadb
finally eliminate no method error when processing a photo
2011-04-02 16:01:54 +02:00
MrZYX
a1c3a6dc1e
lets see if that fixes the build
2011-04-02 15:53:58 +02:00
MrZYX
b086142b16
fixed #991
2011-04-02 15:09:41 +02:00
MrZYX
513e838482
do not stress the server too much
2011-04-02 14:42:50 +02:00
MrZYX
3eeecebb67
201 means created…
2011-04-02 14:18:46 +02:00
danielgrippi
bdff036cda
remove spacing from stream elements
2011-04-01 11:26:04 -07:00
maxwell
41bbcc9ac9
comment out comment delete on mobile site for now
2011-04-01 11:22:48 -07:00
danielgrippi
8b8ea03582
high res logo on mobile site
2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8
publisher now can handle services, and is on seperate page
2011-04-01 01:18:01 -07:00
maxwell
f2ca2c2357
fix up translations, and remote on publisher"
2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e
bunch of small mobile ui fixes
2011-03-31 23:38:38 -07:00
maxwell
3add704d4a
sm mobile site fix
2011-03-31 22:25:28 -07:00
maxwell
bf45026040
another small fix for the mobile site
2011-03-31 18:35:21 -07:00
maxwell
69befc059d
ms iz fixed a bit of the mobile site
2011-03-31 18:32:19 -07:00
maxwell
bb59df46f9
updating jquery mobile, fix the menu page a bit
2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
2011-03-31 17:23:54 -07:00
MrZYX
764e0c4aee
fixed #985
2011-03-31 18:59:00 +02:00
danielgrippi
b22b13d73f
Revert "popstate now in aspect-filters. back button now actually works on aspect/index."
...
This reverts commit 326155af54
2011-03-31 01:30:02 -07:00
zhitomirskiyi
bb4c2ee85d
added a character count to the publisher
2011-03-30 19:11:24 -07:00
danielgrippi
326155af54
popstate now in aspect-filters. back button now actually works on aspect/index.
2011-03-30 17:39:08 -07:00
Raphael Sofaer
3387c20b5f
Fix redirect away from conversation
2011-03-30 17:17:16 -07:00
Raphael Sofaer
1df287b2bb
Don't redirect ajax requests to getting_started
2011-03-30 17:02:19 -07:00
zhitomirskiyi
5a9ec82597
can now hide posts
2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc
wip holding off until the follow model is done
2011-03-30 16:43:28 -07:00
Raphael Sofaer
e3ad078ba5
Scope querying in PhotosController#show
2011-03-30 16:40:01 -07:00
danielgrippi
5fa2a7a6f3
use popState in message inbox
2011-03-30 16:22:25 -07:00
Raphael Sofaer
716a7f64b8
Make contacts_visible accessible
2011-03-30 15:43:44 -07:00
Raphael Sofaer
8c9a7e1c41
Fix PhotosController#show
2011-03-30 15:43:44 -07:00
maxwell
66a52a49d6
add a loader for profile photo upload
2011-03-30 15:14:18 -07:00
Raphael Sofaer
c9d58d9308
Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings"
...
This reverts commit 3b7063d44a
2011-03-30 14:47:40 -07:00
maxwell
c91baf9f04
pass the param to set the profile photo
2011-03-30 14:44:06 -07:00
Raphael Sofaer
3b7063d44a
Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings
2011-03-30 14:28:58 -07:00
maxwell
6364f2a332
clean activity streams, fix test
2011-03-30 14:27:20 -07:00
Raphael Sofaer
2d31d364f2
Don't will_paginate json requests on people search
2011-03-30 13:40:16 -07:00
danielgrippi
e922ef8f22
add includes() to search query for profiles
2011-03-30 13:24:47 -07:00
Raphael Sofaer
75354c1aba
fix error on mobite status message show
2011-03-30 12:51:02 -07:00
danielgrippi
d3c0f1b3d2
ruby objects, get outta my face. (conversationscontroller new)
2011-03-30 12:45:47 -07:00
Raphael Sofaer
5c7bd6298a
Fix 500 on tags index
2011-03-30 12:43:44 -07:00
MrZYX
d97939a18f
escape the ' in the json (don't ask me why the four \ are needed, it was trial and error :P)
2011-03-30 21:14:21 +02:00
maxwell
3ba7ce41f1
make the public page show the public profile if html request
2011-03-30 11:34:54 -07:00
zhitomirskiyi
70d1c31733
fixed the issue of nothing showing up for empty aspects
2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035
WIP
2011-03-30 11:29:12 -07:00
danielgrippi
c4295a7693
fix aspect_memberships_controller specs
2011-03-30 11:15:40 -07:00
Raphael Sofaer
22b9f92c27
FIx post socketing
2011-03-30 10:55:59 -07:00
danielgrippi
95578e79c6
fix removing from aspect -> contact removal bug
2011-03-30 10:44:55 -07:00
maxwell
86fe2db24e
update publish job to include .atom
2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29
make one translation absolute to attempt to fix 1.9 build
2011-03-30 10:39:40 -07:00
MrZYX
53bdb2cade
clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere
2011-03-30 17:17:36 +02:00
MrZYX
699264e7a3
made flash messages for conversations translatable
2011-03-30 16:52:43 +02:00
MrZYX
22b73c736b
fixed #976
2011-03-30 16:15:31 +02:00
danielgrippi
5b0da52e0a
fixed comment socketing bug, post ordering on own profile page.
2011-03-29 19:40:44 -07:00
danielgrippi
b3cb8e0a2b
temp fix for pagination. photos index fix
2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404
pass post to comments partial. use sql in raw_visible_posts
2011-03-29 17:31:57 -07:00
danielgrippi
371aa71ca8
add ordering to raw_visible_posts
2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599
Fix all specs, add foreign key constraints on post_visibility
2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91
8 failures left. wip.
2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5
Moving PostVisibility to aspects, WIP, model specs pass
2011-03-29 17:31:56 -07:00
zhitomirskiyi
0aaaefeba2
fix tag plugin
2011-03-29 16:53:48 -07:00
zhitomirskiyi
d54a8428d3
add some limits for conversation#new
2011-03-29 15:19:14 -07:00
zhitomirskiyi
8775ab9d69
fixed the conversations create
2011-03-29 15:03:10 -07:00
zhitomirskiyi
ba15ea940b
autosuggest on tags now works, bumped up the version of the autocomplete plugin
2011-03-29 15:03:09 -07:00
zhitomirskiyi
2e25d1d745
added the bookmarklet into a box
2011-03-29 15:03:09 -07:00
zhitomirskiyi
a5bb26a3c4
almost done
2011-03-29 15:03:09 -07:00
maxwell
bbe5f56292
you can now mention in the bookmarklet
2011-03-29 13:55:14 -07:00
MrZYX
98820c0866
do not display tags on the public profile
2011-03-29 22:25:03 +02:00
maxwell
5392b5c6ef
strip more than 5 tags when updating profile so people with broken profiles can update again
2011-03-29 10:56:11 -07:00
MrZYX
aa478ddd5c
string concatenation with translations is bad, especially if you leave on part of it untranslated :P
2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e
fix translations
2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc
translated bookmarklet, added post to main page
2011-03-28 19:57:06 -07:00
maxwell
9e5890288c
more bookmarklet improvements
2011-03-28 18:34:52 -07:00
maxwell
f08b5dfafe
basic functionality done, fixing rough edges
2011-03-28 18:11:59 -07:00
Raphael Sofaer
349aa13c05
Revert "reduce db quries on aspects#index"
...
This reverts commit 3af5e24ac6
2011-03-28 14:59:16 -07:00
Ritchie Wilson
a1b07d84e1
Next and Previous arrows for mobile photos
2011-03-28 16:04:29 -04:00
Raphael Sofaer
c33a952bbd
Forgot parens
2011-03-28 11:22:03 -07:00
Raphael Sofaer
a0d3921d72
Fix 500 on tag show with comments
2011-03-28 10:01:19 -07:00
MrZYX
c2a4c2157d
oh yeah it's delete_all on has_many, seems like I shouldn't code today…
2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad
dependent delete for likes
2011-03-28 17:54:07 +02:00
Sarah Mei
ffe48fe189
Refactor aspects#index to be easier to read; move some expensive operations after the guard clause
2011-03-27 19:19:25 -07:00
Sarah Mei
ae106e71ae
Move sort order to a before filter, because this index method is waaaaay too big.
2011-03-27 18:52:43 -07:00
MrZYX
5c4979ccf0
use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why
2011-03-28 00:09:07 +02:00
MrZYX
315fdabd76
let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases
2011-03-27 21:08:30 +02:00
MrZYX
e2f6427724
just realized that the change to AspectsController#index in the previous commit isn't needed
2011-03-27 17:26:17 +02:00
MrZYX
3af5e24ac6
reduce db quries on aspects#index
2011-03-27 17:22:35 +02:00
MrZYX
55417cf9e3
AspectsController#move_contact -> AspectMembershipsController#update
2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b
refactor of routes.rb done so far; further refactor needs design decisions
2011-03-27 00:05:35 +01:00
MrZYX
11b0a2c19d
dependent destroy for likes
2011-03-26 21:47:40 +01:00
MrZYX
92d6b618aa
ups that shouldn't be in the previous commit
2011-03-26 17:41:58 +01:00
MrZYX
985d79acb5
some more refactoring to routes.rb
2011-03-26 17:38:49 +01:00
danielgrippi
8a2dd36b7e
Fix autocomplete JSON
2011-03-25 17:28:04 -07:00
Raphael Sofaer
aed190dc6d
cucumber for comment retractions, modified views
2011-03-25 16:26:03 -07:00
Raphael Sofaer
fef226156c
Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable?
2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628
Relayable retractions pretty much done
2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb
Initial work on retracting comments
2011-03-25 16:09:37 -07:00
danielgrippi
40953d37bd
Put an upper limit on the per_page param
2011-03-25 15:31:23 -07:00
danielgrippi
f5a03fd6ed
Make public timeline of a user publicly accessible
2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8
Make pending specs green, I think there are still some to_jsons where there should be as_json
2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65
added users_profile_image, home_timeline, fixed public_timeline
2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802
statuses/ and users/ GET routes
2011-03-25 15:06:22 -07:00
maxwell
c5b6cdff4e
make a public search method
2011-03-25 15:06:22 -07:00
maxwell
310f529914
dumb api console
2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c
initial public api'
2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01:00
danielgrippi
b6d5165f2d
scroll to post on page if you can see it (via notification popup)
2011-03-23 17:16:30 -07:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
zhitomirskiyi
18c7c467c7
made the manage email prefs work
2011-03-23 16:36:16 -07:00
danielgrippi
535e686b2c
fixed tag ordering in stream_element partial
2011-03-23 16:24:12 -07:00
zhitomirskiyi
7a31531258
added location to the profile
2011-03-23 15:56:46 -07:00
Raphael Sofaer
ec8aed12bb
Limit similar contacts, need a see all page
2011-03-23 15:02:26 -07:00
zhitomirskiyi
804b0b534a
moved the tooltips to be under the icons
2011-03-23 14:23:25 -07:00
zhitomirskiyi
24db7a3b87
added tooltips to the service icons
2011-03-23 14:13:54 -07:00
danielgrippi
fb5bc2805d
fix cucumber
2011-03-23 12:42:07 -07:00
Raphael Sofaer
73d4bf4327
Remove unneeded callback
2011-03-23 12:00:47 -07:00
zhitomirskiyi
9abe22d5d2
added a dependant destroy to the service_users
2011-03-23 11:56:15 -07:00
zhitomirskiyi
8a9a95d854
added a flash notice
2011-03-23 11:45:06 -07:00
Raphael Sofaer
cc39243c88
Check for nil in facebook finder
2011-03-23 11:42:33 -07:00
zhitomirskiyi
1cfba68416
this should fix the getting started, going to test on staging first
2011-03-23 11:05:04 -07:00
Raphael Sofaer
dd11edf033
Take out extra callback
2011-03-23 10:42:27 -07:00
Raphael Sofaer
55c5b4e525
Just enqueue a job on service create for now, since our queues are empty. Resque status will let us run the job and show the user a spinny without locking up a thin
2011-03-23 10:41:34 -07:00
Raphael Sofaer
3e8f455cbc
Add after_create to queue an updateserviceusers job on service create. We'll see how it works
2011-03-23 10:41:34 -07:00
danielgrippi
b9b9d7e07d
renamed home to all aspects in header, made clicking aspect names on right trigger filtering
2011-03-23 10:29:34 -07:00
danielgrippi
43315e14f9
sort contacts by name, not by a potentially nil field
2011-03-23 10:16:55 -07:00
zhitomirskiyi
e45a3503d0
on aspect edit the contacts are now sorted by first name
2011-03-22 18:01:17 -07:00
danielgrippi
0cab18d5aa
autofocus username on login page
2011-03-22 17:43:11 -07:00
danielgrippi
fe44ee8230
fix tab order in publisher; removed 'to mention...' text
2011-03-22 17:29:03 -07:00
danielgrippi
2b8b824230
fixed private mention popup in firefox
2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6
added text to private message notification; user picture in popup
2011-03-22 17:14:37 -07:00
MrZYX
643a066691
moar translatable
2011-03-22 22:45:36 +01:00
Raphael Sofaer
8835559ae5
Additional logging to debug extra pvs
2011-03-22 13:44:55 -07:00
Sarah Mei
631163ec02
"Add contact" buttons on tag page are smaller and don't appear on top of names.
...
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
maxwell
a036a8035f
add a plaintext layout for emails, and include a link to change your email settings in the emails
2011-03-22 12:26:38 -07:00
zhitomirskiyi
9f9082fbbd
Merge branch 'master' of github.com:diaspora/diaspora
2011-03-22 11:28:01 -07:00
zhitomirskiyi
23d6441d77
start people off with invites if the pod is open
2011-03-22 11:27:29 -07:00
maxwell
dc60181033
404 googlebotz left and right on public remote person pages
2011-03-22 11:26:39 -07:00
danielgrippi
728d0537cb
comment out likes just in the views for now
2011-03-22 10:53:46 -07:00
MrZYX
deff67f486
fixed a translation
2011-03-22 13:47:44 +01:00
Raphael Sofaer
fdd158d86a
Make urls not change on processing
2011-03-21 18:42:36 -07:00
Raphael Sofaer
85e0736e5b
Remove stray puts
2011-03-21 17:12:54 -07:00
Raphael Sofaer
2b997e70c2
Refactor image processing to use 2 uploaders. Federation and s3 need testing
2011-03-21 16:40:53 -07:00
Raphael Sofaer
a45103d0ef
Make post not found redirect clearer
2011-03-21 16:40:53 -07:00
zhitomirskiyi
4517c7c1b1
move service icons to right on publisher. swap out RSS for world icon
2011-03-21 16:23:27 -07:00
zhitomirskiyi
c929ce21ad
fixed validation on tag length in profile
2011-03-21 16:01:34 -07:00
zhitomirskiyi
058b74846a
removed the bring your friends message from the stream
2011-03-21 15:23:34 -07:00
zhitomirskiyi
821703f4d4
fixed url. photo
2011-03-21 14:56:50 -07:00
zhitomirskiyi
93d69c4ec7
fixed the views for the friend finder
2011-03-21 14:56:50 -07:00
zhitomirskiyi
aa5bef0c3f
calls the job on login does a sync call if the cache friends was not called before, fixed the views
2011-03-21 14:56:50 -07:00
zhitomirskiyi
dcc80d5b43
almost done, need to figure out how whats the deal with the controller not being called
2011-03-21 14:56:50 -07:00
zhitomirskiyi
70d71ec491
service users is green
2011-03-21 14:56:50 -07:00
zhitomirskiyi
ede7d4e8e2
made the job, broke outthe save_users, still need to do lifecycle callbacks
2011-03-21 14:56:50 -07:00
zhitomirskiyi
3afa14d341
wip
2011-03-21 14:56:50 -07:00
MrZYX
a2715ca963
fixed migration naming, fixed translation
2011-03-20 23:00:56 +01:00
MrZYX
1b1a23aa8f
likes/dislikes WIP TODO: better icons, better styling, integration on photo show page
2011-03-20 18:10:58 +01:00
Sarah Mei
c3612ee66d
Remove empty helper and spec files.
2011-03-19 22:39:21 -07:00
Sarah Mei
c3b9da8d37
Add specs to conversations#new. Unpending spec for create.
2011-03-19 22:30:58 -07:00
Sarah Mei
0b1fa4d014
You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files.
2011-03-19 20:53:55 -07:00
Sarah Mei
c1bf68068f
Pull relationship action button from search results out into a partial.
...
Copyedit messages.
2011-03-19 15:59:56 -07:00
MrZYX
7cd1789669
allwow https youtube links
2011-03-19 22:19:31 +01:00
MrZYX
dce54f3d40
fixed #947
2011-03-19 15:05:45 +01:00
MrZYX
a05c9b0010
fixed a translation, keep up the new format in en.yml, set pagination labels in application controller
2011-03-19 14:04:11 +01:00
Raphael Sofaer
42a361dcce
Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests
2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d
PostsController#index -> TagsController#show
2011-03-18 20:57:39 -07:00
maxwell
8f9f24f383
fix for photo urls before they are processed
2011-03-18 19:00:24 -07:00
maxwell
5aa969559c
add processed to post, which is set to default false for photos
2011-03-18 18:51:53 -07:00
maxwell
91a96adb4b
fix syntax error
2011-03-18 18:15:57 -07:00
maxwell
358fdb9521
return the right url for gifs
2011-03-18 18:12:20 -07:00
Raphael Sofaer
e2f78a8b8c
Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.'
2011-03-18 14:52:27 -07:00
maxwell
300f592a64
do not process gifs, just let them be.
2011-03-17 22:43:18 -07:00
maxwell
93f7f28b07
if you search for a hash (with a '#') it will just take you to that hash page
2011-03-17 19:16:29 -07:00
maxwell
924dc13adc
profile tagging now federates #FO #REAL
2011-03-17 18:05:49 -07:00
zhitomirskiyi
379f242a1f
removed the mention_popup class inless in profile
2011-03-17 16:29:04 -07:00
maxwell
562c0d40ac
profile tags now federate
2011-03-17 16:28:17 -07:00
Raphael Sofaer
e5f9876256
Don't socket the unsocketable, for real this time
2011-03-17 15:51:19 -07:00
Raphael Sofaer
a993c48060
Revert "Don't socket the unsocketable"
...
This reverts commit bf53ad9f58
2011-03-17 15:50:43 -07:00
Raphael Sofaer
bf53ad9f58
Don't socket the unsocketable
2011-03-17 15:50:07 -07:00
maxwell
b2c0cfb173
remove stray br in stream_element
2011-03-17 15:24:00 -07:00
Raphael Sofaer
bef06d18d8
Move notifying iteration into resque job
2011-03-17 15:19:26 -07:00
zhitomirskiyi
43fc2c4d63
fixed the style on the share with list element
2011-03-17 15:19:12 -07:00
zhitomirskiyi
6cc085d64e
addded slideToggle
2011-03-17 14:32:07 -07:00
zhitomirskiyi
2b6165d8ea
wip
2011-03-17 14:32:07 -07:00
zhitomirskiyi
433db9fc8b
wip, still need to auto hide, and expand on click the contact setting, styling, also would be nice to cache the friend list, and maybe on login queue up a job to refresh it
2011-03-17 14:32:06 -07:00
maxwell
37fefc5bc9
take out gif exception for processing
2011-03-17 14:16:08 -07:00
maxwell
1de52d3ba2
fixed failing cucumber
2011-03-17 13:59:53 -07:00
maxwell
14ff1e0143
ms dg improved styling, fixed delete
2011-03-17 13:59:53 -07:00
maxwell
61bffb50d6
remove puts from photoscontroller
2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe
wrote a test for the callback, need to make it pass...
2011-03-17 13:59:53 -07:00
maxwell
58282b91cb
move processing to photo callback
2011-03-17 13:59:53 -07:00
maxwell
7ba90a5a98
stuff works
2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3
photos are now successfully delayed
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
maxwell
516b620148
gif and delayed processing wip
2011-03-17 13:59:53 -07:00
Raphael Sofaer
52691920f7
Change 406 to 422
2011-03-17 13:13:47 -07:00
Raphael Sofaer
d2cdc20e2b
Finish receive local batch job
2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9
SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to
2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3
added job and spec for BatchLocalReceive. wip
2011-03-17 12:56:23 -07:00
MrZYX
149b1832fd
added newline to stream element partial, otherwise timeago & comment won't display if aspect badge is too big
2011-03-17 20:51:08 +01:00
zhitomirskiyi
574a3b45b1
made it flash the sm on the profile page
2011-03-17 11:54:13 -07:00
maxwell
eed32f70be
add a missing space for notifications with less than 4 people
2011-03-17 10:50:11 -07:00
MrZYX
78eebc8920
fixed #935
2011-03-17 16:59:02 +01:00
MrZYX
a78710690a
moar translations
2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795
fixed the css, added a space
2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e
moved the fixture to the right place
2011-03-16 18:10:50 -07:00
danielgrippi
e9c094fc2f
add styling on tag header
2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f
add a people count on tag page
2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-16 16:35:30 -07:00
MrZYX
e7b4d4e494
the build was failing for a reason
2011-03-16 15:40:56 +01:00
danielgrippi
20b5ca7570
added tag helper text on profile, edit on hover
2011-03-15 22:10:20 -07:00
Raphael Sofaer
7636fec270
Fix select in postscontroller
2011-03-15 18:36:27 -07:00
danielgrippi
68479481cf
made websockets far less dumb. don't render partials for people not connected.
2011-03-15 18:21:09 -07:00
danielgrippi
9115a8f1f5
Only show searchable people in postscontroller
2011-03-15 16:22:17 -07:00
danielgrippi
8c7ad9a0a3
Remove unused receive local job
2011-03-15 16:13:09 -07:00
danielgrippi
4943531013
Add stream class to side_stream
2011-03-15 15:20:02 -07:00
danielgrippi
67de069469
Inline the person partial on posts index
2011-03-15 15:13:43 -07:00
danielgrippi
be42ccfa16
Be less glib
2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a
fixed translations
2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb
a user can put tags in their profile and they show up on the person/show page.
2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
MrZYX
73f852c6c2
fixed video embedding in comments
2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a
fixed some 500 on mobile site
2011-03-15 17:02:04 +01:00
MrZYX
cf66e3aebb
fixed test in invitation email
2011-03-15 16:25:47 +01:00
Ritchie Wilson
81661d61fc
changes the 'You are not sharing with...' button to static text instead of inserting the persons name
2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6
made 3+ plus collapse in notifications index
2011-03-14 18:09:51 -07:00
Raphael Sofaer
1666843aa9
Fix 500 in publicsController
2011-03-14 16:48:07 -07:00
maxwell
b14ac9606f
fix typo, puts in a test, and made the emails types a constant in UserPreferences
2011-03-14 12:21:30 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50
more tests for mailing. the bug was i think we have to restart the resque workers
2011-03-14 11:32:59 -07:00
maxwell
28fc093a01
fix bug in user edit mailer view
2011-03-14 11:32:59 -07:00
maxwell
d91fda656c
Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious"
...
This reverts commit ab997e2d21
2011-03-14 09:51:06 -07:00
MrZYX
2a5d41cc82
fixed translations for comments
2011-03-13 21:16:43 +01:00
Kiran Soumya
7c3a173010
Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post
2011-03-12 11:08:40 +05:30
MrZYX
ed8d4db3a8
some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones
2011-03-12 03:27:28 +01:00
maxwell
e52d14f1e9
attempting to fix bug #913
2011-03-11 17:43:55 -08:00
maxwell
ab997e2d21
js hack to see bigger version of photo thumbnails in the stream without being abnoxious
2011-03-11 17:16:43 -08:00
maxwell
50d9d76562
update translations for email settings, and missing translation for aspect#new
2011-03-11 16:02:24 -08:00
maxwell
d825eeaaa0
updated to listen to disable mail
2011-03-11 15:43:40 -08:00
maxwell
52b970098b
add specs for updating email settings in the controller, and user#mail
2011-03-11 15:43:29 -08:00
maxwell
e9a843b095
email prefs are now saved. need more tests and use it in user#mail
2011-03-11 15:42:53 -08:00
Raphael Sofaer
9f368bf82f
Change person show page to created_at ordering, since you're looking at that person's content
2011-03-11 10:15:17 -08:00
Raphael Sofaer
fbfd46a506
change peoplecontroller order, fix grammar in public default
2011-03-11 10:12:37 -08:00
MrZYX
879672576f
fixed #919
2011-03-11 19:11:03 +01:00
MrZYX
e3c5e7ba05
person -> author in app/views/comments/_comment.mobile.haml
2011-03-11 16:20:05 +01:00
MrZYX
e4be5db881
there can be no reason to not set the locale
2011-03-11 15:37:33 +01:00
Michael Nutt
c7362707b3
fix js error; stream ajax success handler should expect json
2011-03-11 00:31:43 -05:00
maxwell
ffa6b9879f
added default development page so it doesnt look so terrible
2011-03-10 20:31:39 -08:00
danielgrippi
54130b49b7
Revert "fix a few invalid html tags"
...
This reverts commit 004d9b5028
2011-03-10 19:42:37 -08:00
danielgrippi
9ad96726de
just use tag search for now
2011-03-10 19:42:24 -08:00
Michael Nutt
004d9b5028
fix a few invalid html tags
2011-03-10 22:18:40 -05:00
Dan Hansen
490a2c6a9e
remove extra protocol in the link
2011-03-10 21:16:45 -06:00
Raphael Sofaer
35903514f5
remove wasteful join
2011-03-10 18:53:23 -08:00
Raphael Sofaer
b86098055e
Add tag search on public page
2011-03-10 18:37:45 -08:00
Raphael Sofaer
c35f143b29
always link to hashtag.
2011-03-10 18:37:45 -08:00
Raphael Sofaer
ea98b1ca81
Tags now link to meaningless query in PostsController
2011-03-10 18:37:45 -08:00
Raphael Sofaer
f19857cc40
Simplify regex madness
2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c
TAGS ARE SO COOL
2011-03-10 18:37:45 -08:00
Dan Hansen
c9545920f8
title on landing page
2011-03-10 18:40:54 -06:00
Dan Hansen
214c677169
process videos last so there aren't conflicts with other markdownify methods
2011-03-10 18:29:08 -06:00
Dan Hansen
d7c7775b6c
fallback gracefully, break build if videos can't embed
2011-03-10 18:26:55 -06:00
Dan Hansen
93bdf1e91e
add space before link
2011-03-10 18:01:08 -06:00
danielgrippi
2cf0503310
put text below photo in stream
2011-03-10 15:28:44 -08:00
Raphael Sofaer
05f9d79689
Fix public posts page when signed in
2011-03-10 15:26:55 -08:00
danielgrippi
1f3261b2ef
make photos larger in the stream
2011-03-10 15:17:41 -08:00
Raphael Sofaer
8f929d2b85
Show local public posts in /p
2011-03-10 14:41:03 -08:00
Michael Nutt
8837632dd9
User should be able to comment on their own photo
2011-03-10 16:42:07 -05:00
Michael Nutt
8c5621158d
notification now only created when message is received, not when message is first saved
2011-03-10 16:41:03 -05:00
Raphael Sofaer
ddbd5febb3
Make people pages publicly accessible
2011-03-10 12:55:05 -08:00
maxwell
7b0a354677
slight tweaks to pubsubhubub publishing
2011-03-10 12:17:34 -08:00
MrZYX
58796dcde2
uhm, --amend
2011-03-10 15:35:40 +01:00
MrZYX
7bf256ecfa
we need @all_aspects not only in html views
2011-03-10 15:29:49 +01:00
maxwell
1baafac84b
added content to rss feed
2011-03-09 19:11:09 -08:00
maxwell
af43a60b62
only grab statuses for public feed
2011-03-09 18:12:36 -08:00
Raphael Sofaer
584684560e
Make conversation delete clearer
2011-03-09 17:58:29 -08:00
Raphael Sofaer
e6836c46a7
Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests
2011-03-09 17:50:46 -08:00
Raphael Sofaer
f2cc51dd0d
Take current user id out of avatar
2011-03-09 17:50:46 -08:00
maxwell
1ac688f82c
moved an ostatus builder query out to the controller, where it belongs, and corrected the order
2011-03-09 17:33:47 -08:00
maxwell
9d480b0961
remove status_message#public_message: we never use it
2011-03-09 17:14:37 -08:00
maxwell
f9279f9bbc
fixed public route not fetching posts, also an error in status_message activity markup
2011-03-09 17:08:41 -08:00
Raphael Sofaer
eafa965504
Try explicitly querying rather than getting postvisibilities
2011-03-09 16:17:48 -08:00
Raphael Sofaer
f8c0906db7
Instrumenting activerecord object instantiation to do some profiling
2011-03-09 13:54:28 -08:00
MrZYX
dc7a672d9f
fixed some translations
2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7
added title to padlock on aspect edit pane
2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
Raphael Sofaer
c259fc65f0
You can now pass hashes to the logger
2011-03-09 11:48:29 -08:00
MrZYX
5631e45b6d
--amend
2011-03-09 15:49:16 +01:00
MrZYX
0d1133cd51
fixed some translations
...
do not escape html in private_message text only email
2011-03-09 15:33:46 +01:00
zhitomirskiyi
c697df4b5a
markdownafy the private message text
2011-03-08 23:12:04 -08:00
danielgrippi
dda477410d
use conversations_url() with a param in private message emails
2011-03-08 22:11:34 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5
added missing translation
2011-03-08 19:22:49 -08:00
zhitomirskiyi
c252cfa025
added the email notification, the notification is not persisted, fixed the receive callback spec
2011-03-08 18:24:56 -08:00
danielgrippi
d38e3a6b29
added translations to all conversation/message views. tweaked css
2011-03-08 15:51:46 -08:00
zhitomirskiyi
84198e4750
Merge branch 'private_messages' of github.com:diaspora/diaspora into private_messages
2011-03-08 11:57:49 -08:00
MrZYX
5f841b9add
do not escape html in text only emails
2011-03-08 20:45:02 +01:00
danielgrippi
78e30ff459
update unread count in conversation visibility when hitting conversationscontroller#show
2011-03-08 11:43:58 -08:00
MrZYX
7b5b980095
link to public feed of the person on the profile person show page instead of to the one of current_user
...
fixed #700
fixed #864
fixed #774
2011-03-08 20:30:48 +01:00
zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
danielgrippi
fb5e5cc341
cleaned up new message facebox
2011-03-07 20:14:22 -08:00
danielgrippi
fca5310c77
dispatch the conversation in ConversationsController
2011-03-07 17:54:25 -08:00
Raphael Sofaer
b7c3f93d25
Use delegation in PostFake, use render => :collection in stream
2011-03-07 12:20:46 -08:00
danielgrippi
97aff09140
added autocomplete on message 'to' field, minor css tweaks to inbox
2011-03-07 11:22:59 -08:00
Raphael Sofaer
a45f46828a
re-enable commenting box on show page without comments, but it looks kind of ugly
2011-03-07 10:18:50 -08:00
Raphael Sofaer
909a198380
Post photos without text
2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a
pulling in
2011-03-06 21:37:27 -08:00
Raphael Sofaer
e00a033e9e
Update rspec-instafail, test git headers
2011-03-06 10:18:37 -08:00
danielgrippi
8fafc48d32
more private message wip.
2011-03-04 18:17:49 -08:00
danielgrippi
d50863cc90
added the ability to message someone from their profile page
2011-03-04 11:28:09 -08:00
danielgrippi
48fff29bf6
fixed conversation receive. made visibilities on conversation :dependent => :destroy
2011-03-04 11:19:01 -08:00
danielgrippi
5f55dfa1bc
private message inbox wip
2011-03-03 17:32:26 -08:00
Raphael Sofaer
eb9705c82d
Adjust batch invite text
2011-03-03 17:23:20 -08:00
Raphael Sofaer
435451bc5b
admins can resend invitations
2011-03-03 16:59:33 -08:00
MrZYX
f0ba62be59
replaced ▼ with ▼, this fixes #904 and shouldn't harm anything.
2011-03-03 21:32:44 +01:00
Raphael Sofaer
3d0831f2b2
Merge remote branch 'mnutt/photo_upload_status'
2011-03-03 11:43:16 -08:00
Raphael Sofaer
da12954d22
Move statusmessage create view out to partial
2011-03-03 11:10:44 -08:00
zhitomirskiyi
2522ab7ee4
refactoring the conversation views, wip
2011-03-03 10:39:32 -08:00
Raphael Sofaer
685130cbd4
Take out n-query on home page
2011-03-02 13:34:06 -08:00
zhitomirskiyi
9d7611f8d8
addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling
2011-03-02 12:27:57 -08:00
Raphael Sofaer
770091e82b
Don't retrieve all the user's contacts again unnecessarily
2011-03-02 12:11:25 -08:00
zhitomirskiyi
f58c477673
added the forgotten files
2011-03-01 23:55:11 -08:00
Sarah Mei
ba6afa50e8
Removing extra csrf tag. Thx feanor12.
2011-03-01 22:25:05 -08:00
zhitomirskiyi
3812612c86
added a validation of participant, as well as messages controller spec wip
2011-03-01 19:24:07 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397
private messages wip
2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b
broke out some comment logic to a replayable module
2011-03-01 12:28:33 -08:00
zhitomirskiyi
bd908a9b95
conversations federate
2011-03-01 12:25:55 -08:00
danielvincent
1072806d8f
PrivateMessage -> Conversation, Message.
2011-03-01 12:25:55 -08:00
danielvincent
a179bac689
fixed migrations, added unread to PrivateMessageVisibilities
2011-03-01 12:25:54 -08:00
danielvincent
979d9d7fb4
added delete actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
090c412690
touched up AspectMembership resource
2011-03-01 12:14:31 -08:00
danielvincent
c5801ffb37
basic views / controller actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
Raphael Sofaer
a7f149e399
Possible performance gain from not hitting posts relation
2011-03-01 11:42:57 -08:00
Raphael Sofaer
00cca370ad
Add translation key method, should be replaced with separate partials.
2011-03-01 11:03:58 -08:00
Raphael Sofaer
1c1fba63e7
Refactor notification to have subclasses, just a start
2011-03-01 10:30:29 -08:00
Raphael Sofaer
809ee8a678
Started notifications refactor
2011-03-01 10:30:29 -08:00
MrZYX
00ebf6469b
it can happen that the http referer is nil when we expect it to be set (for example if the user has a privacy extension enabled
2011-03-01 18:38:40 +01:00
Raphael Sofaer
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
Michael Nutt
208a47162c
add onAllComplete event to fileupload.js; hide mention helper during upload
2011-02-27 12:44:56 -05:00
Michael Nutt
b6dc32959c
place thumbnails inside status message form and add spacing
2011-02-27 02:04:43 -05:00
MrZYX
afecfe5e93
save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db
2011-02-26 14:22:14 +01:00
maxwell
782dc55d63
remove puts, fix admins controller test
2011-02-26 14:22:13 +01:00
maxwell
b95c9b2e66
actually send email from admin interface inviter
2011-02-25 14:54:07 -08:00
Raphael Sofaer
22d83ec502
update http_multi to adjust urls when you get a redirect
2011-02-25 14:46:21 -08:00
Raphael Sofaer
f3202e15d6
add follow_location to typhoeus default jobs
2011-02-25 13:38:24 -08:00
Raphael Sofaer
7693c162c2
LOG MORE, better logging in http_multi failures
2011-02-25 12:16:17 -08:00
zhitomirskiyi
ec93faa2c4
added the post to services icon on every page added a manage icon and moved the RSS link to the public explain
2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631
can now select individual services to be added
2011-02-24 17:31:54 -08:00
zhitomirskiyi
e61cc2fd34
made the postzord take the services in individually
2011-02-24 17:31:54 -08:00
zhitomirskiyi
126925f28f
wip
2011-02-24 17:31:54 -08:00
zhitomirskiyi
78b242b110
removed post to services since we are not using it
2011-02-24 17:31:54 -08:00
Raphael Sofaer
c030e8b21e
Move the @ inside the mention links
2011-02-24 15:52:47 -08:00
Raphael Sofaer
40dea1f625
LOG MORE, when http to another pod fails
2011-02-24 15:52:37 -08:00
Raphael Sofaer
736783abd7
You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating
2011-02-24 11:13:25 -08:00
Raphael Sofaer
e964490a9a
Escape xml before dispatch
2011-02-23 16:06:55 -08:00
Raphael Sofaer
faf026dec6
Update dispatcher to use HttpMulti job
2011-02-23 16:06:55 -08:00
maxwell
bb5d5fc2c0
typhoeus fixes and a few changes to the chef scripts
2011-02-23 16:06:55 -08:00
maxwell
638311125f
typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install
2011-02-23 16:06:55 -08:00
maxwell
c9dd2d5b50
add files
2011-02-23 16:06:54 -08:00
MrZYX
98cdee97c0
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections
...
Conflicts:
Gemfile
app/controllers/application_controller.rb
app/controllers/posts_controller.rb
app/controllers/publics_controller.rb
2011-02-24 00:33:34 +01:00
zhitomirskiyi
e106ec6a79
added post author to the subject of the also commented email as well as the notification
2011-02-23 13:03:11 -08:00
zhitomirskiyi
97e00f9ee3
changed the delete to a destroy on retraction, also removed a puts
2011-02-23 12:00:42 -08:00
maxwell
16e8ecc72c
fixing debugging statement in smcontroller, also fix the spec
2011-02-22 22:38:23 -08:00
maxwell
e446dcaeb5
make sm_controller show the error in the js
2011-02-22 22:21:48 -08:00
maxwell
5bce2d1615
remove mongomapper error handler in photos_controller#create
2011-02-22 22:02:58 -08:00
maxwell
ec21230756
make status_message_controller#create return the error message
2011-02-22 22:01:08 -08:00
Dan Hansen
e4ba498d70
whoops
2011-02-22 23:21:50 -06:00
Dan Hansen
f41bc0c14d
<3z
2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09
make video urls have correct href
2011-02-22 18:51:40 -08:00
maxwell
eb9a943724
parinoid checks for admin page thx dangold
2011-02-22 15:43:10 -08:00
Dan Hansen
9ef6606f80
load jquery from google only if local copy fails
2011-02-22 13:41:05 -06:00
Dan Hansen
e04685e7ab
remove unused javascript that's in a view
2011-02-21 23:25:38 -06:00
MrZYX
feb47df97e
total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit
2011-02-21 17:13:11 +01:00
Sarah Mei
49adf5034f
Revert javascript move
2011-02-20 20:05:40 -08:00
danielvincent
3d6d742def
move js to body bottom
2011-02-20 16:31:06 -05:00
MrZYX
da244f8438
reintroduced remember me on the login page
2011-02-20 21:49:08 +01:00
MrZYX
ab706f4127
fixed sort by css for languages different from english
2011-02-20 19:00:13 +01:00
MrZYX
77cac72ed5
fixed #306
2011-02-20 13:34:22 +01:00
MrZYX
2b625c468a
Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora
2011-02-20 13:03:33 +01:00
MrZYX
af14fa76a1
fixed #881
2011-02-20 13:00:30 +01:00
Gonzalo Rodriguez
ea3b719253
Fixed notifications time-ago calculation
2011-02-20 05:13:34 -02:00
Sarah Mei
77adc02cbd
Fix spec failure related to presence of app config settings. Also, you can't test application controller directly.
2011-02-19 22:17:22 -08:00
MrZYX
aa6ac41d68
remeber sort order
2011-02-19 17:06:26 +01:00
MrZYX
11f95ee596
fixed broken css for other languages at account settings page
2011-02-19 14:27:45 +01:00
Jonne Hass
02f7f10ef1
Minimal fix to admins_controller.rb
2011-02-19 04:49:05 -08:00
MrZYX
124ac738ea
'sort by:'translatable
2011-02-19 11:39:28 +01:00
Gonzalo Rodriguez
778afa2889
Update locale before loading flash notice on user language update
2011-02-19 02:25:03 -02:00
zhitomirskiyi
199d5fbdc1
the alt text now displays the correct number of contacts in an aspect
2011-02-18 17:44:47 -08:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8
made toggle for post time on aspects#index
2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f
stream order can take created at to be sorted by origin post time
2011-02-18 16:07:22 -08:00
maxwell
37a699ace1
stream order can take created at to be sorted by origin post time
2011-02-18 16:01:04 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
maxwell
e3b298c5d4
this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in"
...
This reverts commit dfa5d875c5
2011-02-17 19:01:42 -08:00
maxwell
2540c5adb9
adding person and profile to show
2011-02-17 18:15:35 -08:00
zhitomirskiyi
8196ee33dd
making instantiating an empty contact
2011-02-17 18:05:22 -08:00
zhitomirskiyi
23754ec3fb
added the files
2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
zhitomirskiyi
25671f07c7
refactor of a line
2011-02-17 18:05:21 -08:00
zhitomirskiyi
ba779e18d6
aspect memberships are now dependant delete_all on contact
2011-02-17 18:05:21 -08:00
zhitomirskiyi
1e6bf9c80e
MS IZ the cucumber now passes
2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb
aspect membership refactor complete
2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705
wip
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
maxwell
6858e2e543
crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging
2011-02-17 18:00:59 -08:00
Raphael Sofaer
2304827569
Only save the connected person if it has changed
2011-02-17 20:30:38 -05:00
danielvincent
fc9d9a4c55
make the invite friends dialog more obvious
2011-02-17 15:58:37 -05:00
MrZYX
b7ce51d206
Merge branch '680-error-on-login-goes-away-quickly' of https://github.com/grzuy/diaspora into flashmsg
2011-02-17 15:34:42 +01:00
Raphael Sofaer
cd7e4d6e8f
Requests create a read, rather than unread, notification
2011-02-16 23:44:25 -05:00
Gonzalo Rodriguez
11e431f640
Add flash message above the login form
2011-02-16 23:37:28 -02:00
MrZYX
dfa5d875c5
I18n: Workaround for a weired caching issue when multiple users are logged in
2011-02-16 22:40:18 +01:00
danielvincent
a636ceec7f
search does not wildcard on both sides of search term; is less dumb.
2011-02-16 12:41:45 -05:00
danielvincent
41f077e039
posts are ordered by recent comment activity instead of time created
2011-02-16 02:04:46 -05:00
Dan Hansen
e2ec4c0424
possibly fix the problem with js i18n that occurs on joindiaspora
2011-02-15 22:43:06 -06:00
zhitomirskiyi
90897099bd
not double saving photos
2011-02-15 17:24:35 -08:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
MrZYX
f7de3a216a
fixed a translation
2011-02-15 15:02:36 +01:00
MrZYX
54feaca998
redirect to the start page if there's no referer in photos#show
2011-02-14 22:25:21 +01:00
MrZYX
b4b3fd2bb3
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-14 21:50:54 +01:00
MrZYX
fbaf9d6e84
fixed translation in request accepted mail
2011-02-14 21:50:38 +01:00
maxwell
4111a0ae4e
make notifications return json for MuGMaN
2011-02-14 11:59:58 -08:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
MrZYX
965f4e2ea5
another weired case where a photo can have a .status_message_id but no .status_message
2011-02-13 21:08:32 +01:00
MrZYX
20e1316491
it can somehow happen that a person has no profile. somehow. idk why.
2011-02-13 19:29:04 +01:00
danielvincent
ca0d52c8e2
log character counts of status messages and comments
2011-02-13 00:17:34 -08:00
David Morley
6df0a25327
fix link to facebox
2011-02-12 14:57:35 -08:00
Raphael Sofaer
6a0a945986
Switch dispatch_post and add_to_streams
2011-02-12 13:36:46 -08:00
MrZYX
a572637e4c
fix a translation
2011-02-12 18:06:56 +01:00
MrZYX
3c089506ff
localize emails
2011-02-12 17:35:12 +01:00
zhitomirskiyi
936a51578a
renamed log line
2011-02-11 23:42:50 -08:00
zhitomirskiyi
971a319764
contacts size
2011-02-11 23:41:21 -08:00
Raphael Sofaer
de475ec4eb
Take error out of posting status messages with photos
2011-02-11 19:20:19 -08:00
Raphael Sofaer
3e2c9b4b94
set photo-message relations based on guid on federation
2011-02-11 18:47:26 -08:00
Raphael Sofaer
ff0f37ceea
eliminate one source of dup pvs
2011-02-11 18:25:57 -08:00
maxwell
2784f641ba
fix 500 when viewing a nonexsitaint status message
2011-02-11 18:13:01 -08:00
maxwell
e78ab6bca1
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
2011-02-11 18:00:07 -08:00
maxwell
c6bdbc987a
strip whitespace on comments
2011-02-11 17:54:37 -08:00
maxwell
4b47de5b9e
do not 500 on public photo viewing, also redirect if there is no photo rather than 500ing
2011-02-11 17:47:29 -08:00
zhitomirskiyi
34dbc5a872
added mention created logging statement
2011-02-11 17:36:21 -08:00
zhitomirskiyi
ea3afa6720
added the mention explanation text
2011-02-11 17:31:23 -08:00
maxwell
dc08efacf9
strip mention html for services
2011-02-11 17:13:48 -08:00
zhitomirskiyi
2b650e6b6d
removed person can't be blank error message
2011-02-11 16:29:19 -08:00
zhitomirskiyi
9f239789b9
can remote the person from the last aspect from edit contact pane
2011-02-11 12:58:01 -08:00
Raphael Sofaer
bc22851dd2
Add a little bit of info to create_invitee logging
2011-02-11 12:09:02 -08:00
zhitomirskiyi
3b2d323448
fixed the notifications to call the base_class
2011-02-11 11:49:47 -08:00
Raphael Sofaer
cb73922a26
Take extra / out of view, thanks NPerry
2011-02-11 11:23:32 -08:00
Raphael Sofaer
b413513999
Merge remote branch 'rtzn/master'
2011-02-11 11:13:01 -08:00
zhitomirskiyi
6441977a7c
added the post author name to the text also commented email
2011-02-11 10:31:20 -08:00
zhitomirskiyi
0e9fdeeab0
destroy
2011-02-10 19:55:30 -08:00
zhitomirskiyi
4033c19323
destroy_all so that the callbacks are called
2011-02-10 19:50:21 -08:00
zhitomirskiyi
36d7973005
fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is
2011-02-10 19:23:01 -08:00
Raphael Sofaer
bb58544a70
Add logging for GC (slight slowdown, but worth it for the data)
2011-02-10 15:52:00 -08:00
Raphael Sofaer
0b6375ae63
Increase comment size limit
2011-02-10 15:51:59 -08:00
Raphael Sofaer
d6f886fbe2
Double comment length limit
2011-02-10 15:51:59 -08:00
maxwell
a27b1b2648
make the mention in html email not a link
2011-02-10 14:43:23 -08:00
Raphael Sofaer
25aa4255dc
Add unix timestamp to request log
2011-02-10 13:57:16 -08:00
zhitomirskiyi
ca7b4e5477
fixed the build
2011-02-10 13:42:31 -08:00
zhitomirskiyi
717d2e09c9
fixed the translation in the email
2011-02-10 12:39:05 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
zhitomirskiyi
7b1abacfe6
wip
2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1fe913527
Change up logging a little bit
2011-02-10 11:52:00 -08:00
Raphael Sofaer
a307519e94
Put avatar on cmment form all the time, fix socketed comment form
2011-02-10 11:05:12 -08:00
zhitomirskiyi
1296dde15b
this should speed up the finder
2011-02-09 22:39:13 -08:00
Raphael Sofaer
5eb487ed20
204, not 201
2011-02-09 18:04:44 -08:00
zhitomirskiyi
1da965616b
added an option to remove a contact from the last aspect, after a prompt
2011-02-09 17:47:27 -08:00
Raphael Sofaer
04f33c8034
Render an empty 201 in users update with a js request
2011-02-09 17:22:45 -08:00
Raphael Sofaer
7b3a2b07ee
Removed n-query, created mentions table
2011-02-09 16:07:25 -08:00
Raphael Sofaer
056bebd4f4
Autocompletion contacts now change with changing aspect selection
2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0
Actually close the publisher on and with Publisher.close()
2011-02-09 16:07:25 -08:00
Raphael Sofaer
f8cec95d7a
no authentication, n-query in stream
2011-02-09 16:07:24 -08:00
Raphael
0000185875
Status messages now process mentions and output links
2011-02-09 16:07:24 -08:00
danielvincent
3efc31c68f
mention js working minus tracking keypresses with the hidden message field.
2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer
150f676332
Do a bunch of work on publisher autocompletion JS
2011-02-09 16:07:23 -08:00
Raphael
216a2c3cdb
write formatted_message
2011-02-09 16:07:23 -08:00
Raphael Sofaer
51e129b5c6
Don't call hashes_for_people if it is a json request in search
2011-02-09 16:05:02 -08:00
zhitomirskiyi
e75c285049
added created_at
2011-02-09 15:07:47 -08:00
zhitomirskiyi
e4d9ec64cd
moved tests and slayed the profile not updating bug
2011-02-09 13:33:42 -08:00
MrZYX
4328f72bfb
fixed piwik
2011-02-09 19:37:05 +01:00
Nicolas Berens
60b08b9b08
Merge remote branch 'upstream/master'
2011-02-09 06:56:07 +01:00
zhitomirskiyi
41d21c78ef
mend
2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0
added the pending request to the finder
2011-02-08 18:53:18 -08:00
danielvincent
80117d8ab6
added piwik and ga options to mobile layout
2011-02-08 17:39:41 -08:00
zhitomirskiyi
eecf1d5d82
fixed cucumber, localization, and css
2011-02-08 17:14:37 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
a398184081
WIP
2011-02-08 16:35:33 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08:00
zhitomirskiyi
a06ba9105b
uniqueness of aspect name through user non case sensitive
2011-02-08 14:52:47 -08:00
maxwell
a649d18cd7
add tests to see if timestamps are updated on recevie...they are not
2011-02-08 14:07:25 -08:00
Nicolas Berens
024ecc1752
Fixed small layout glitch
2011-02-08 17:11:09 +01:00
MrZYX
6e0e46435e
localize dates
2011-02-08 16:26:56 +01:00
danielvincent
151999c582
reference the right thing in mobile views
2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2
fixed build
2011-02-06 23:42:01 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
danielvincent
42993de739
added back to comments; avatar.
2011-02-06 09:26:24 -08:00
zhitomirskiyi
c2d26e21c3
added a mobile invitation acceptance view, skipping getting started for now
2011-02-05 20:19:47 -08:00
zhitomirskiyi
e3170504b8
using blank instead of checking for nil, since mongo import make these bank
2011-02-05 16:53:14 -08:00
zhitomirskiyi
80da5917fa
gave more space to the already invited span
2011-02-05 15:56:08 -08:00
zhitomirskiyi
78c30b847e
added files
2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01:04 -08:00
maxwell
ce010c24ec
update jquery mobile to a3
2011-02-03 20:41:38 -08:00
maxwell
ee02a073cd
toggle mobile site, when mobile device
2011-02-03 18:43:56 -08:00
maxwell
1ed737c3b9
make aspects a link, and remove a big db query from the view
2011-02-03 16:15:51 -08:00
zhitomirskiyi
41bb7a8564
blank instead of nil
2011-02-03 15:16:00 -08:00
zhitomirskiyi
d905021252
comment emails have text
2011-02-03 13:07:26 -08:00
danielvincent
8269e4b300
touched up photo show and status message show pages
2011-02-03 13:05:25 -08:00
Raphael
636242283b
Fix cucumber features
2011-02-02 18:49:45 -08:00
Raphael
3114672989
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-02 18:13:03 -08:00
Sarah Mei
e7cf5fc841
Fix/expand cucumber feature for new user signup.
...
Replace "wait for aspects page"-type steps with general wait for step.
2011-02-02 17:17:00 -08:00
Raphael
8a2e0eef7c
No semicolons in names
2011-02-02 16:57:04 -08:00
Raphael
cd8d9989cf
Refactor publisher JS, use hidden field for submitting
2011-02-02 14:27:14 -08:00
maxwell
34a0abe0c8
fix 500 on mobile notifications page
2011-02-02 13:14:34 -08:00
Raphael
3fb6b0e072
Fix saved state cucumber feature
2011-02-02 11:52:56 -08:00
danielvincent
693ad112ba
stream element sockets in non-mobile
2011-02-02 11:29:37 -08:00
Dan Hansen
82db655a56
make the markup between _comment and _stream_element more consistent, fix embedder in comments
2011-02-02 12:55:16 -06:00
maxwell
67ed035f21
make notifications updated_at rather than created at
2011-02-01 21:45:36 -08:00
zhitomirskiyi
34e5ba99bc
removed the image or default
2011-02-01 18:11:02 -08:00
zhitomirskiyi
21e3c2ae73
Merge branch 'open-aspects'
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046
storing it as a boolean in the aspect
2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271
now updating the open aspects in js
2011-02-01 16:58:33 -08:00
Raphael
bbe47fbb55
Correct limit on search autocomplete
2011-02-01 14:35:14 -08:00
MrZYX
423cd7807b
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 22:45:28 +01:00
MrZYX
7ca8391739
Javascript I18n: fallback to DEFAULT_LANGUAGE for missing keys
2011-02-01 22:45:02 +01:00
Raphael
cfd6639f4d
Revert "Merge branch 'open-aspects'"
...
This reverts commit 181bd823c42c3ed2ab73
2011-02-01 13:15:20 -08:00
zhitomirskiyi
bc058332d3
commented on post email now includes the comment
2011-02-01 12:54:05 -08:00
zhitomirskiyi
27f1231479
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4
Merge branch 'open-aspects'
2011-02-01 12:10:12 -08:00
zhitomirskiyi
55403d9bea
the saved aspects works properly now
2011-02-01 12:07:18 -08:00
Raphael
7d18e2bcd8
Finish autocomplete
2011-02-01 11:56:56 -08:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -08:00
Raphael
7be232e33e
autocomplete wip
2011-02-01 11:56:56 -08:00
Raphael
9080649180
Starting work on an autocomplete feature
2011-02-01 11:56:56 -08:00
Dan Hansen
cdb5cf37e7
show publisher if it was closed when you select another aspect
2011-02-01 00:40:11 -06:00
maxwell
7bb7bb396a
Revert "persists open aspects across logins also fixed the status message controller spec broken in master"
...
This reverts commit 9e7f03236e
2011-01-31 21:41:05 -08:00
zhitomirskiyi
9e7f03236e
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:31:41 -08:00
Raphael
c56eaadfa0
Make person profile a little bit aware of an incoming request
2011-01-31 15:47:01 -08:00
Raphael
e3a5102624
incoming request on person show should just link to share_with
2011-01-31 15:28:43 -08:00
Raphael
906de27922
Make notifications/read_all non-ajax, link back to index page
2011-01-31 15:28:43 -08:00
zhitomirskiyi
a6c1b5bf59
mark notification as read on the status message show page
2011-01-31 15:26:20 -08:00
zhitomirskiyi
7a667abc73
unread true on notification receive
2011-01-31 15:09:01 -08:00
zhitomirskiyi
d6ab633e2c
Merge branch 'notification-migration'
2011-01-31 14:41:15 -08:00
MrZYX
391a9b0de5
translate contacts in _header.haml
2011-01-31 19:48:36 +01:00
zhitomirskiyi
ac50a0119a
spec for not raising on already existant actor
2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e
all green
2011-01-30 20:10:34 -08:00
zhitomirskiyi
a4988a28b4
WIP
2011-01-30 10:00:03 -08:00
zhitomirskiyi
17dde3a7b9
farther along towards getting the specs to pass
2011-01-29 23:58:48 -08:00
zhitomirskiyi
17a2c9e311
moving over some code migration successful
2011-01-29 23:34:11 -08:00
maxwell
348ae0b61d
small hack to add some feedback when links are tapped on the mobile site.
2011-01-29 18:42:50 -08:00
maxwell
5267365b4f
move js strings to application helper
2011-01-29 13:54:28 -08:00
Dan Hansen
b89a59ca55
update timeago usages
2011-01-29 13:30:32 -08:00
Dan Hansen
0831ad6e40
move i18n.loadLocale to the application template, remove localize controller & helper, renamed localize to get_javascript_strings_for and added it to the application helper
2011-01-29 13:29:54 -08:00
Dan Hansen
3078156dbb
javascript i18n wip
2011-01-29 13:28:43 -08:00
zhitomirskiyi
9d4d0cecdb
wip
2011-01-28 22:39:29 -08:00
zhitomirskiyi
f48d7a0826
wip
2011-01-28 22:37:38 -08:00
danielvincent
e3f4ae1cc7
fixed button styling
2011-01-28 17:42:04 -08:00
Raphael
d545900759
Delete comments of a deleted person, until we implement tombstoning
2011-01-28 17:34:32 -08:00
zhitomirskiyi
9d091bbf6a
facebook invitations actually work
2011-01-28 17:22:18 -08:00
Raphael
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
Raphael
8151f3b540
correct partial name
2011-01-28 16:54:30 -08:00
Raphael
7339e46bfb
Moving remote friend view out to a partial
2011-01-28 16:42:43 -08:00
zhitomirskiyi
a8ac403e30
share with action for people who are already on diaspora
2011-01-28 16:37:11 -08:00
Raphael
605e70f095
Do application side join to retrieve contacts for fb finder, rather than n query
2011-01-28 16:26:52 -08:00
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
