Jordi Mallach
dcda19bc17
Update Catalan translation to e88c1510.
2011-07-25 16:53:54 +02:00
Jordi Mallach
1707612628
Add missing space.
2011-07-25 16:40:12 +02:00
Jordi Mallach
986306f03c
Fix overcapitalisation in reshare strings.
2011-07-25 16:27:29 +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
MrZYX
6425bdc47c
added esperanto to the available languages
2011-07-25 15:38:17 +02:00
MrZYX
47e2f70e96
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-07-25 13:25:42 +02:00
MrZYX
072e48462b
updated locales
2011-07-25 13:25:16 +02:00
MrZYX
67ffdd71aa
update rails-i18n
2011-07-25 12:54:25 +02:00
Jordi Mallach
e88c151031
Harmonise spelling of ‘email’ and capitalisation.
...
Use ‘email’ everywhere and avoid capitalisation where it’s not needed.
2011-07-25 12:37:40 +02:00
Jordi Mallach
7503b0775c
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-07-25 12:26:00 +02: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
Manuel Schölling
ae0d655d5d
Revert "Revert "Fix translation reference""
...
This reverts commit 85fde3b7a3
2011-07-24 20:41:05 +02:00
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
