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

4603 commits

Author SHA1 Message Date
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
aed08d6283 removed unused method; moved includes() out of scope 2011-09-14 00:10:04 -07:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
015cc9e451 actually fix specs/cucumber 2011-09-13 18:21:16 -07:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Maxwell Salzberg
3184d7aad1 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:32:50 -07:00
The Lambda Calculus
b7399cda8f Merge pull request #1970 from TheLambdaCalculus/b1126-additional-refactoring 
Refactoring for B#1126 fix. Photo model is now fatter with #destroy logic while Photo controller is thinner.
 2011-09-13 07:15:29 -07:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
danielgrippi
2022187942 sprinkle a little documentation around lib, mostly just specifying return types 2011-09-12 23:01:47 -07:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
0ab0526cd6 DG MS; put validates_associated in relayable, removed from receiver logic 2011-09-12 15:06:17 -07:00
Maxwell Salzberg
5177e5b218 DG MS test receive_relayable 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
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
Maxwell Salzberg
eb6263084e MS DH fix liking of posts and comment js; instansiate streamElement widgets when they are socketed 2011-09-03 12:09:34 -07:00
Gonzalo Rodriguez
2afb646286 Minor changes on status message 2011-09-03 03:47:33 -03:00
Gonzalo Rodriguez
8dd05a5e5b Fixing method signature semantics 2011-09-03 03:36:38 -03:00
Gonzalo Rodriguez
0aeab944bf Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es 
What i did was to redirect to the tag without dots, in this case cubbies
I didn't consider a good idea to add route support for /tags/cubbi.es
since it get messed with request formats
 2011-09-03 00:22:27 -03:00
Gonzalo Rodriguez
eae9c14168 Use named helper instead of hardcoded route 2011-09-02 22:49:16 -03:00
vcuculo
8919d0c0ce fixed bookmarklet 2011-09-02 10:28:32 +02:00
danielgrippi
af569204b8 Revert "Merge pull request #1874 from vcuculo/1785-fix-bookmarklet" 
This reverts commit e278b39421, reversing
changes made to d0f21cb444.
 2011-09-01 16:31:49 -07:00
vcuculo
6518a89302 fixed bookmarlet 2011-09-02 00:44:56 +02:00
Maxwell Salzberg
48cdf7c79f fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected 2011-09-01 12:03:07 -07:00
Daniel Grippi
00ffc996e4 Merge pull request #1866 from TheLambdaCalculus/b1126-deletion-of-all-photos-from-a-post-with-no-words-should-result-in-the-post-being-deleted 
B1126 deletion of all photos from a post with no words should result in the post being deleted
 2011-09-01 10:04:10 -07:00
vcuculo
8270a486ae dont forget mobile site :) 2011-09-01 09:48:57 +02:00
The Lambda Calculus
9d7b8d7f5d Have passing Cucumber tests [Finishes issue #1126] 2011-09-01 01:59:51 -04:00
The Lambda Calculus
98b71f92ab We now do a check on photo deletion to ensure that any associated status messages are also deleted if now empty [Issue #1126] 2011-09-01 01:59:51 -04:00
Sarah Mei
2e747e814f Turns out we need that absolute option after all. 2011-08-31 21:21:55 -07:00
Sarah Mei
1e50137815 Fix person_href 2011-08-31 20:29:53 -07:00
Maxwell Salzberg
b8ca4bfcab added Link to profile page in webfinger profile to make federation a bit easier 2011-08-31 19:57:46 -07:00
Maxwell Salzberg
62aea0e820 fix for mention links, and the first tag links #ohYEAH 2011-08-31 18:06:30 -07:00
danielgrippi
7e72a29401 fixed aspect edit pane (removed diaspora ids) 2011-08-31 14:55:23 -07:00
Maxwell Salzberg
272ab55482 Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown 2011-08-30 22:15:52 -07:00
Dan Hansen
f788de17fd allow the user to see who has liked a specific comment. 2011-08-30 21:13:12 -05:00
Dan Hansen
dc947e449b fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. 
make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)
 2011-08-30 21:07:40 -05:00
Brian Wisti
a6e87ebcb2 placeholder commit, working on mentions in markdown merging. 2011-08-30 14:44:49 -07:00
Brian Wisti
8aafc61071 merged with blank markdownify check 2011-08-30 12:55:52 -07:00
Maxwell Salzberg
bb8a9f0b3f small bug in markdownify to prevent barfing with a nil message 2011-08-30 11:34:54 -07:00
Maxwell Salzberg
e25decedc3 Merge pull request #1845 from fermionic/1811-mobile-share-button 
1811 mobile share button
 2011-08-30 11:27:36 -07:00
danielgrippi
4d1c93d95b Removed , but not the table. Record all in httpmulti success 2011-08-30 10:14:32 -07:00
danielgrippi
0dfcbca51b Revert "removed the pod_stats table (was the cause of bloat on the database)." 
This reverts commit 902c40e42d.
 2011-08-30 10:03:56 -07:00
danielgrippi
902c40e42d removed the pod_stats table (was the cause of bloat on the database). 2011-08-30 10:01:59 -07:00
Zach Prezkuta
dfe9e15107 Issue #1811: Share button missing in mobile version 2011-08-29 21:22:07 -06:00
Sarah Mei
e8eb496e66 Ruby 1.9 can find markdownify. 2011-08-29 20:01:57 -07:00
Maxwell Salzberg
3bde507a3a DC MS fix crazy status.net linkback accept header 2011-08-29 18:44:31 -07:00
danielgrippi
1198670383 Added Foreman gem. Run Diaspora using foreman start (will start everything except mySQL. Passing in a -p flag will let you specifiy the port. Also: I took single_process_mode out of app config and made it an environment variable. If you want to boot a lightweight server, run SINGLE_PROCESS=true rails s. 2011-08-29 14:38:07 -07:00
Maxwell Salzberg
f479a9a144 Merge branch 'brianwisti-1305-full-markdown' 2011-08-29 10:56:48 -07:00
Sarah Mei
b60101b9ad Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. 
Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.
 2011-08-28 16:08:57 -07:00
Gonzalo Rodriguez
b9dbe0ecdd Closes #1827. Minor text fix on Getting Started page 2011-08-27 21:32:58 -03:00
Gonzalo Rodriguez
b048d1dd54 When deleting an aspect from contacts page do not redirect to aspects page 2011-08-27 19:24:21 -03:00