Maxwell Salzberg
8cab4cb2e2
open up tag show publisher, have a cuter message on the page
2011-11-08 12:34:06 -08:00
Jonne Hass
730d2d9754
add missing .html_safe
2011-11-08 21:32:15 +01:00
Maxwell Salzberg
5c2b59da22
add a link to the tag show page from the search page
2011-11-08 11:47:17 -08:00
Ilya Zhitomirskiy
e1253c4018
fade in on hover, larger x on the welcome div
2011-11-07 23:11:48 -08:00
Ilya Zhitomirskiy
d1d24a049c
added close buttons which clear getting started when they're all closed
2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e
pop-over close buttons, wip
2011-11-07 21:59:29 -08:00
danielgrippi
6f7c9e9301
Remove resque_rescheduler as it was killing our app servers (receiving
...
http requests).
Revert "retry less"
This reverts commit 7784156e3b80cdcd4eddbcbc86e502
2011-11-07 12:50:02 -08:00
danielgrippi
9d91b70f9d
fix scope
2011-11-07 12:18:23 -08:00
danielgrippi
8da1d6a7fc
multi stream hotfix (re: cache)
2011-11-07 12:15:24 -08:00
Maxwell Salzberg
35216808e0
do not specifiy order for a scope that does not have to do with order
2011-11-06 21:16:57 -08:00
Sarah Mei
0fc43b580b
Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx.
2011-11-06 20:27:36 -08:00
danielgrippi
de88c0ab48
correct newrelic_ignore
2011-11-06 19:35:30 -08:00
Pistos
14842c1b43
Merge remote-tracking branch 'johnedmonds/issue1144'
2011-11-06 22:21:53 -05:00
Jonne Hass
78e03056e8
little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set
2011-11-06 23:03:20 +01:00
Jonne Hass
9a556f7cb2
Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug
...
2307 private inbox bug
2011-11-06 13:12:03 -08:00
buddhamagnet
d8a22da275
amended view to pass in time to translated string for private inbox thread time display
2011-11-06 18:47:51 +00:00
buddhamagnet
77474b214a
added translateable text to inbox thread times
2011-11-06 18:08:51 +00:00
Jonne Hass
af1558831b
Improved reshare receive
...
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
2011-11-06 18:26:10 +01:00
Jonne Hass
50baa4ba92
also link to the translated tag
2011-11-06 18:06:26 +01:00
Jonne Hass
a1eee6e90f
made help tags translatable so that local communities can take care of the new users, also fixed #2327
2011-11-06 16:43:13 +01:00
Jonne Hass
9ffeef9d20
Merge branch 'new_user_language' of https://github.com/alda519/diaspora
2011-11-06 15:17:05 +01:00
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
Sarah Mei
c2893a2e3d
Fix require problem with the acts_as_taggable patches
2011-11-05 22:38:14 -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
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 655558cb95f85a047f6fcde12ec232a552fc80c02c12b94e677417801886abd211ba72
2011-11-05 18:08:32 -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
Dan Hansen & Maxwell Salzberg
2a4abc5483
show service icons on mobile site
2011-11-05 13:23:29 -05: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
Sarah Mei
d17ecd6101
Fix user controller spec
2011-11-04 22:06:56 -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
b7d0ec7564
fix spelling and update job to use less obtrusive query
2011-11-04 18:46:43 -07:00
Maxwell Salzberg
95c206df24
MS DG add participants
2011-11-04 18:46:43 -07:00
Ilya Zhitomirskiy
41db42a7a4
displaying public tags in the multi stream
2011-11-04 18:14: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
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
Ilya Zhitomirskiy
ecd2a52553
added a password field before account closure
2011-11-04 10:25:19 -07:00
Maxwell Salzberg
9bdde0d9af
another hack
2011-11-04 00:49:30 -07:00
Ilya Zhitomirskiy
ce199e770d
dk iz querying by id in status message tag_stream
2011-11-03 22:20:06 -07:00
Sarah Mei
f9a9654c86
Allow non-logged-in users to see public photos
2011-11-03 22:07:48 -07:00
danielgrippi
acf6936d7c
fix specs in contact
2011-11-03 20:48:02 -07:00
