Manuel Schölling
|
85fde3b7a3
|
Revert "Fix translation reference"
This reverts commit 56cdb7a3ad.
|
2011-07-24 20:21:23 +02:00 |
|
Raphael Sofaer
|
56cdb7a3ad
|
Fix translation reference
|
2011-07-22 18:10:34 -07:00 |
|
Raphael Sofaer
|
dfa6539ef2
|
Merge branch 'repost'
|
2011-07-22 18:00:02 -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
|
f74bf04798
|
Fix infieldLabels selector
|
2011-07-22 16:44:24 -07:00 |
|
Raphael Sofaer
|
0e2936f069
|
Reshare spec, not repost spec
|
2011-07-22 16:03:54 -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 |
|
Jonne Hass
|
d75ee2aa62
|
Merge pull request #1637 from anassahmed/991-rtl-stylesheet
#991 RTL stylesheet for conversations
|
2011-07-22 01:31:08 -07:00 |
|
Anass Ahmed
|
eaef931703
|
final commit
|
2011-07-22 09:34:19 +02:00 |
|
Anass Ahmed
|
fd4f88c8eb
|
Merge branch '991-rtl-stylesheet' of https://github.com/anassahmed/diaspora into 991-rtl-stylesheet
|
2011-07-22 09:30:56 +02:00 |
|
Anass Ahmed
|
3c8d21fde5
|
Edited RTL conversations stylesheet
|
2011-07-22 09:20:55 +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 |
|
Raphael Sofaer
|
70be713b15
|
Drop the integration databases in rebuild
|
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
|
bf59bf1c72
|
Delete old jqueries
|
2011-07-21 18:13:49 -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 |
|
Raphael Sofaer
|
a58a06a010
|
Fix youtube embedder, scale it down into the stream
|
2011-07-21 15:18:09 -07:00 |
|
Raphael Sofaer
|
ae29e2478a
|
Merge branch 'upgrade_rails'
|
2011-07-21 14:51:26 -07:00 |
|
Maxwell Salzberg
|
09a43418ef
|
dont try to fix vanna max\!
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
ad8ccbbeb9
|
added test for admin inviter
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
757c9169fc
|
updated gemfile
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
9ac88a8c39
|
update gemfile
|
2011-07-21 14:32:10 -07:00 |
|
Maxwell Salzberg
|
0cc018dd6b
|
i think this works. there is some weird stuff in vannacontroller, but that might have always been there
|
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
|
1ba49caeca
|
Fix like socketing to use GUIDs
|
2011-07-21 13:59:02 -07:00 |
|