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
