Maxwell Salzberg
87c994fa47
MS DG cleaned up and fleshed out salmon specs
2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f
MS IZ DG moar salmon refactoring
2011-09-12 14:05:31 -07:00
Maxwell Salzberg
e0429ee823
MS DG pulling apart salmon and making our custom hacks more obvious
2011-09-12 14:05:31 -07:00
Maxwell Salzberg
6b0507949c
updated salmon to let us not always encrypt the header
2011-09-12 14:05:31 -07:00
Lennart Prelle
5a3445150c
move _donate.html.erb to _donate.html.haml and make it translateable
2011-09-12 18:29:07 +02:00
danielgrippi
293afd80ff
all_public scope in Post for clarity
2011-09-11 19:28:52 -07:00
Jonne Hass
4b0c45d895
rescue unmeaningful exception from settingslogic if the namespace doesn't exists and replace it with meaningful error message
2011-09-12 01:05:49 +02:00
danielgrippi
2d1bb92a5a
added missing sample() in _selected_contacts.html.haml
2011-09-11 15:18:46 -07:00
danielgrippi
1d0bec11f7
Add counter cache for comments on posts
2011-09-11 15:02:24 -07:00
Jonne Hass
fcc6d95067
Merge branch 'refactor_models_2' of https://github.com/buddhamagnet/diaspora
2011-09-11 23:46:13 +02:00
danielgrippi
1bd37038cc
fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream
2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec
initial tests for AspectStream
2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905
Created AspectStream; removed all logic from AspectsController#index
2011-09-11 14:16:48 -07:00
buddhamagnet
010024c4f9
continuing refactor of model validation calls to rails 3 syntax
2011-09-11 21:39:02 +01:00
buddhamagnet
cfa659c47e
refactored model validations to use newer rails 3 syntax
2011-09-11 21:31:39 +01:00
Lennart Prelle
8041fea96c
added mobile version to the change
2011-09-11 17:29:23 +02:00
Lennart Prelle
40ac7b7620
make string in authorizations translateable
2011-09-11 17:20:54 +02:00
Jonne Hass
a614985d83
made single process mode configuration more consistent
...
* SINGLE_PROCESS_MODE environment variable takes precedence over
application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
SINGLE_PROCESS_MODE environment variable to be backward compatible
2011-09-11 13:54:14 +02:00
Daniel Grippi
95aad7f15d
Merge pull request #1940 from alda519/profiles_helper-image
...
default profile photo is no longer marked as set
2011-09-10 19:25:47 -07:00
Sarah Mei
ae32ffc667
Merge branch 'master' of github.com:diaspora/diaspora
2011-09-10 13:38:12 -07:00
Sarah Mei
8b789bfe35
Notifications don't 500 anymore, but I don't know how to make it render the mobile view.
2011-09-10 13:38:01 -07:00
Jonne Hass
523d565dd5
Merge pull request #1939 from everplays/css-rtl
...
fixed html markup which broke applied direction
2011-09-10 13:27:19 -07:00
danielgrippi
fe915ecb09
don't redirect to AspectsController#new from AspectsController#index if no aspect is present
2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e
touched up AspectsController#index for readability's sake
2011-09-10 09:24:35 -07:00
alda519
b5f8f49ddd
default profile photo is no longer marked as set
2011-09-10 17:31:34 +02:00
Daniel Grippi
4ab112645f
removed a puts in Person.search
2011-09-10 07:40:35 -07:00
behrooz shabani (everplays)
22bb6177d4
<p> can't be inside another one - breaks direction detection
...
we are applying direction of content on <p> & markdownify always
generates a <p> so we have something like <p
class="ltr"><p>...</p></p> but paragraph can't be inside another
paragraph & browsers sees something like <p
class="rtl"></p><p>...</p></p> so applied direction will be ignored
2011-09-10 16:14:30 +04:30
Ilya Zhitomirskiy
ad11bd2a31
the Devise email regex was not catching pods that were anything other than a standard url
2011-09-09 18:05:58 -07:00
danielgrippi
961272d1bd
tweaked search a little (don't put a double wildcard on diaspora_id) -- this is a quick fix; solr pending
2011-09-09 11:54:10 -07:00
Maxwell Salzberg
1fa01a811e
DG MS; updated text to reflect the fact that hiding posts now
...
mutes notifications as well
2011-09-09 10:52:19 -07:00
Maxwell Salzberg
bea76a4801
move the ugly type check into the ugly method, to keep all the ugly in
...
one place; restore listening to single process mode in resque; move the
exception handling to inside the method, rather than around the
intializer, and log when resque errors happen in development in single
process mode
2011-09-09 08:58:06 -07:00
Sarah Mei
9e4c450eea
Not all notifications are for posts :)
2011-09-09 06:55:15 -07:00
Maxwell Salzberg
91eabf0fce
attempt to add muting of notifications when post has a hidden visibility; i am getting a load path error in resque now, but that seems to be independent of this commit
2011-09-08 23:21:13 -07:00
Manuel Schölling
0b28376216
Fixed some texts in "Getting Started" that were not translatable
2011-09-09 01:15:54 +02:00
Sarah Mei
c72ee05ca1
Merge branch 'master' of github.com:diaspora/diaspora
2011-09-08 12:01:55 -07:00
Maxwell Salzberg
9917dac4c2
block diasporahq from posting to federation for today
2011-09-08 11:57:06 -07:00
Sarah Mei
1363021859
Update some oddly-worded comments
2011-09-08 11:55:29 -07:00
danielgrippi
c5fbe1584a
fix the build; don't test on enqueueing a job to fetch facebook friends every time we hit the facebook finder -- only do this on log in
2011-09-08 10:59:35 -07:00
Maxwell Salzberg
7f6104d27b
dont queue service user fetching every inf scroll
2011-09-07 13:25:00 -07:00
danielgrippi
1844226077
paginate facebook friends.
2011-09-07 13:00:21 -07:00
Daniel Grippi
26ae8b17b2
Merge pull request #1910 from diaspora/aspect_listings_split
...
Refactor aspect listings partial. Splited in two, one for aspects and other for contacts
2011-09-07 08:34:50 -07:00
Jonne Hass
c0780f3af2
only touch post on comment creation, fix #1911
2011-09-07 15:55:48 +02:00
Jonne Hass
bc4872d3a5
ensure handle is downcased on search, fix #1912
2011-09-07 15:17:42 +02:00
Gonzalo Rodriguez
1a6ee84ed5
Refactor aspect listings partial. Splited in two, one for index and
...
other for contacts.
2011-09-07 00:09:39 -03:00
Gonzalo Rodriguez
4a2b609d53
Join two aspect_ids calculations into one
2011-09-06 23:12:03 -03:00
danielgrippi
341d105e75
updated buttons, mixin declarations
2011-09-04 22:48:37 -07:00
danielgrippi
66836e53d2
Aspect dropdowns read 'All Aspects' if all aspects are selected
2011-09-03 18:38:12 -07:00
Maxwell Salzberg
0780491d4f
fix for 'undefined method 'post' for nil:NilClass' in Mail::AlsoCommented
2011-09-03 16:06:30 -07:00
Maxwell Salzberg
1853720513
MS SM fix for 'No method limit for []'
2011-09-03 16:05:44 -07:00
Maxwell Salzberg
26151263c5
put receiving in a transaction, to prevent the crazy duplicate index errors and hopefully fix federation visibility.
2011-09-03 16:04:53 -07:00
