nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10011 commits 4 branches 0 tags 121 MiB
Commit graph

10011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jakob Kramer
b8dbf1d81e fixed 500 error if one is opening people's photos view and there are no images in the user's stream 2011-11-06 13:29:57 +01:00
Jonne Hass
13297eadc8 give correct scope in order clause 2011-11-06 09:26:14 +01:00
Jonne Hass
ca3c5fc6e8 do not assume mysql ordering in StatusMessage#tag_stream 2011-11-06 08:24:07 +01:00
Jonne Hass
09766288b0 do not send Expect header as many server don't like it 2011-11-06 07:11:55 +01:00
Sarah Mei
c2893a2e3d Fix require problem with the acts_as_taggable patches 2011-11-05 22:38:14 -07:00
Sarah Mei
ac065e1706 Differentiate between oauth features and non-oauth features for travis. 2011-11-05 21:09:56 -07:00
Sarah Mei
a9ac7329d1 Add oauth features to travis as a separate build. Combinatoric explosion FTW 2011-11-05 20:40:16 -07:00
Sarah Mei
c30e3ee362 Merge branch 'master' of github.com:diaspora/diaspora 2011-11-05 19:58:25 -07:00
Sarah Mei
2143e0f9ba Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN. 2011-11-05 19:57:51 -07:00
Jonne Hass
ff590d1080 improved UX for ca_file setting [ci:skip] 2011-11-06 02:39:31 +01:00
danielgrippi
9a2ee973a3 make service icons larger 2011-11-05 18:13:31 -07:00
danielgrippi
c9f069d000 Revert "add participant_users to conversations" 
This reverts commit 655558cb95.

Revert "MS DG; for real this time?"

This reverts commit f85a047f6f.

Revert "MS DG; actually fix the bug"

This reverts commit cde12ec232.

Revert "fix small commenting email bug #oops"

This reverts commit a552fc80c0.

Revert "dont ban diasporahq  stuff"

This reverts commit 2c12b94e67.

Revert "Merge branch 'participants'"

This reverts commit 7417801886, reversing
changes made to abd211ba72.
 2011-11-05 18:08:32 -07:00
Jonne Hass
74892b33da give warden a failure app 2011-11-06 01:53:27 +01:00
Sarah Mei
3e70398c40 Run ostatus builder spec that sometimes causes nokogiri to segfault 2011-11-05 16:06:27 -07:00
Sarah Mei
04352d9771 Merge branch 'master' of github.com:diaspora/diaspora 2011-11-05 16:05:24 -07:00
Sarah Mei
92c28857b3 Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory. 2011-11-05 16:05:13 -07:00
Jonne Hass
2b5963437f updated 54 locale files [ci skip] 2011-11-05 23:44:12 +01:00
Jonne Hass
80e41f1ebb decode the cookie through rails in the websocket server. Hopefully this is more stable 2011-11-05 23:13:46 +01:00
Dan Hansen & Maxwell Salzberg
2a4abc5483 show service icons on mobile site 2011-11-05 13:23:29 -05:00
Jonne Hass
f335c1881b websocket really should stay running so catch TypeError too 2011-11-05 16:05:56 +01:00
Jonne Hass
6b9e7ef3ec ugly thing to prevent crashing websocket for dmorley, hopefully 2011-11-05 15:59:33 +01:00
Jonne Hass
655558cb95 add participant_users to conversations 2011-11-05 12:09:36 +01:00
Jonne Hass
9ee3b2d080 improved closing account experience and fixed the cuke 2011-11-05 11:30:21 +01:00
Ricardo
ab4446e063 kill transparency in header gradient 2011-11-05 14:53:03 +08:00
Sarah Mei
1ecdba9bae Fix facebook spec 2011-11-04 22:22:39 -07:00
Sarah Mei
0b329bf385 Fix notify local users spec 2011-11-04 22:16:55 -07:00
Sarah Mei
d17ecd6101 Fix user controller spec 2011-11-04 22:06:56 -07:00
Sarah Mei
c65bf16c8e Oh yeah, change travis config too. :p 2011-11-04 21:36:17 -07:00
Sarah Mei
29f5ce1577 try breaking up travis build into components 2011-11-04 21:35:06 -07:00
Daniel Grippi
a87ba6cbfa Merge pull request #2315 from Pistos/ie-make-user-menu-work 
Total hax, but this is better than the user menu completely not working.
 2011-11-04 21:02:25 -07:00
Maxwell Salzberg
f85a047f6f MS DG; for real this time? 2011-11-04 19:56:53 -07:00
Maxwell Salzberg
cde12ec232 MS DG; actually fix the bug 2011-11-04 19:37:21 -07:00
Maxwell Salzberg
a552fc80c0 fix small commenting email bug #oops 2011-11-04 19:24:48 -07:00
Maxwell Salzberg
2c12b94e67 dont ban diasporahq stuff 2011-11-04 19:08:08 -07:00
Maxwell Salzberg
7417801886 Merge branch 'participants' 2011-11-04 18:46:58 -07:00
Maxwell Salzberg
b7d0ec7564 fix spelling and update job to use less obtrusive query 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
c3dc3d103b include post author in participats 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24 MS DG add participants 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
dfd1286521 dry up multi stream 2011-11-04 18:46:43 -07:00
Maxwell Salzberg
abd211ba72 dry up multi stream 2011-11-04 18:45:51 -07:00
Maxwell Salzberg
5baaa6dae2 fix update public_tag_stream 2011-11-04 18:45:20 -07:00
Ilya Zhitomirskiy
41db42a7a4 displaying public tags in the multi stream 2011-11-04 18:14:34 -07:00
Maxwell Salzberg
016032cf95 do not pull back all tag ids; way to go maxwell :( 2011-11-04 16:54:34 -07:00
danielgrippi
39b6abaa88 do includes before last(3), as last() returns an array, not an AR object 2011-11-04 16:46:30 -07:00
Dan Hansen & Maxwell Salzberg
3cfa0c4602 use the stream element partials for testing the StreamElement widget instead of Aspects#index 2011-11-04 18:40:24 -05:00
danielgrippi
3296477531 eager load author and profile for comments 2011-11-04 16:40:14 -07:00
Ilya Zhitomirskiy
f3183a11e1 message explaining that we're populating things in the background 2011-11-04 16:20:51 -07:00
Maxwell Salzberg
2d4e6e4915 forgot to uncomment a line 2011-11-04 16:04:37 -07:00
Maxwell Salzberg
745e4dea8c queue facebook lookup job, dont do it in process 2011-11-04 16:02:17 -07:00
Maxwell Salzberg
7784156e3b retry less 2011-11-04 15:11:16 -07:00