Ilya Zhitomirskiy
352be4d0c0
added the have support section and reworded the donation section to be clearer
2011-09-19 15:29:19 -07:00
Ilya Zhitomirskiy
41abb5790e
changed the to proc syntax to explicit block syntax
2011-09-19 14:16:26 -07:00
Ilya Zhitomirskiy
ed4b91249d
added a publisher to the tag page
2011-09-19 11:38:55 -07:00
Jonne Hass
473642234d
updated locales and pulled in NN
2011-09-19 15:36:12 +02:00
Jordi Mallach
ff5919f43f
Change "Click this link" to "Follow this link".
...
As discussed with @rsofaer in 9797e04957 ,
"follow" is more device-neutral, better for mobile browser users.
2011-09-18 22:46:31 +02:00
Jordi Mallach
1e7029ef26
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-09-18 22:42:30 +02:00
Sarah Mei
18b1f360d8
Have our CI run only cucumber
2011-09-17 22:39:42 -07:00
Jordi Mallach
d006ca9850
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-09-18 03:21:57 +02:00
Jonne Hass
661d5d3bbc
pull in ur-PK
2011-09-18 00:56:04 +02:00
Jordi Mallach
5bd32af4bd
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-09-17 21:51:13 +02:00
Jordi Mallach
98aa2a0196
Update Catalan translation to 91e6499.
2011-09-17 21:50:37 +02:00
Jordi Mallach
021f704de7
Add trailing dot.
2011-09-17 21:47:57 +02:00
Dan Hansen
746cb746b3
Merge pull request #2001 from johnedmonds/master
...
Opera header gradient
2011-09-17 10:12:11 -07:00
John Edmonds
cfd174bd2c
Make header gradient work in Opera.
2011-09-17 13:01:51 -04:00
Jonne Hass
d498110b3d
updated 117 locale files [ci skip]
2011-09-17 17:32:01 +02:00
Maxwell Salzberg
b1e15f6a80
make specs pending
2011-09-16 18:36:58 -07:00
Maxwell Salzberg
bc1aef4999
MS IZ start to implement followed tags in the stream
2011-09-16 18:19:34 -07:00
Maxwell Salzberg
3d275868ce
make spec pending rather than commented out
2011-09-16 16:44:51 -07:00
Maxwell Salzberg
cbbaa2f80d
more verbose not valid object error
2011-09-16 16:43:03 -07:00
Maxwell Salzberg
3bc81aeb67
stupid test polution :(
2011-09-16 16:42:35 -07:00
Maxwell Salzberg
f963e4cb4e
get better info on failing federated posts
2011-09-16 16:18:14 -07:00
Maxwell Salzberg
e26b614e1d
added intergration test for dispatcher
2011-09-16 15:56:18 -07:00
Maxwell Salzberg
defeb42721
get some comma seperated resque job logging for method params in hoptoad"
2011-09-16 15:22:20 -07:00
Maxwell Salzberg
3d6169395f
add another dispatcher spec
2011-09-16 15:22:20 -07:00
Jonne Hass
eeb01f4e74
travis: do not notify #diaspora-de anymore [ci skip]
2011-09-16 23:08:20 +02:00
Maxwell Salzberg
e865dfc269
fix a bug with emailing in posts going to tumblr
2011-09-16 13:57:38 -07:00
Ilya Zhitomirskiy
e6e15483cd
more verbose testing of grouped_people
2011-09-16 13:34:56 -07:00
Maxwell Salzberg
17b5e7b066
move admin rack to its own file
2011-09-16 13:33:05 -07:00
Jonne Hass
7ab963f859
whoops, fix my typo
2011-09-16 22:27:19 +02:00
Jonne Hass
b706edf76f
pull in parallel_testing to speed up rspec
...
- Initally run rake parallel:create
- After each schema change run rake parallel:prepare
- To run rspec super fast run rake parallel:spec
- Todo fix upstreams summary logger
2011-09-16 22:14:12 +02:00
Jonne Hass
fcff5a6774
do not break on not updated application.yml for mount_resque_web
2011-09-16 22:03:38 +02:00
Maxwell Salzberg
55999bc443
resolve route conflicts
2011-09-16 12:49:47 -07:00
Maxwell Salzberg
5ca5db213f
add the opposite test, fix a typo in my previous test declaration
2011-09-16 11:31:01 -07:00
Maxwell Salzberg
1343188ccb
dont do the comments in a transaction, we build other jobs
2011-09-16 11:26:28 -07:00
Maxwell Salzberg
6c414d8562
add tests for object_should_be_processed_as_public? and delegegated public to the parent of relayable objects
2011-09-16 11:24:13 -07:00
Jonne Hass
01f7625649
fix Postzord::Dispatcher#object_should_be_processed_as_public?
2011-09-16 19:44:41 +02:00
Maxwell Salzberg
b63b6cbcd5
remove job alias
2011-09-16 10:33:15 -07:00
Maxwell Salzberg
d1fc3caae0
remove salmon hack
2011-09-16 10:30:37 -07:00
Maxwell Salzberg
7ae003c88c
alias receive salmon
2011-09-16 10:20:03 -07:00
Maxwell Salzberg
05816733ce
alias job
2011-09-16 10:14:32 -07:00
Maxwell Salzberg
9e0446f707
conversations are not public
2011-09-16 09:53:32 -07:00
Maxwell Salzberg
d3b6143a45
remove heroku gem'
2011-09-16 09:44:03 -07:00
Jonne Hass
7b06d3039e
bump fixture builder since only 0.3.0 is available through rubygems.org
2011-09-16 18:37:24 +02:00
Ilya Zhitomirskiy
482e423f45
Merge branch 'federation_update'
2011-09-16 08:53:39 -07:00
Ilya Zhitomirskiy
f1a8b1fd6f
added the namespace constraint back to the envelope, protocol route, data type is now plain xml
2011-09-16 08:53:13 -07:00
Ilya Zhitomirskiy
c98189b057
refactored the salmon models and the xml, added a pending spec to strip '='
2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b7288c8d8e
removed the algo field and a commented line
2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
4cdfe8431b
signing with SHA256, have a temp fallback on verification
2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e2e6e7ea5b
just noticed the nonadded migration
2011-09-16 08:53:13 -07:00
danielgrippi
ce9c17fa2e
use ActiveSupport's Base64 encoding methods instead of calling Array#pack directly; strip new lines.
2011-09-16 08:53:13 -07:00