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

4714 commits

Author SHA1 Message Date
danielgrippi
645af37358 more touchup; added placeholder for reaction tabs on post show; added more mobile boilerplate / compatability; apple splash page asset 2011-09-27 21:09:26 -07:00
danielgrippi
9e3ff7338e ditch unused css rules; move js to body bottom 2011-09-27 21:09:26 -07:00
danielgrippi
00e561dd01 comments -> reactions 2011-09-27 21:09:26 -07:00
danielgrippi
ab3d220b57 always sort by created_at on mobile 2011-09-27 21:09:26 -07:00
danielgrippi
8c586c4567 added html5 boilerplate meta tags to mobile; stripped functionality to add back 2011-09-27 21:09:25 -07:00
Uiri
3aa3b9aea8 Better regex solution 2011-09-26 23:59:33 -04:00
Uiri
82feff7fb4 Links in the message translate into a proper link on Facebook when sending to facebook. 2011-09-26 23:59:33 -04:00
danielgrippi
49bee9bf19 fix the build 2011-09-26 20:53:06 -07:00
Gonzalo Rodriguez
e0ffd7c63e Merge branch 'master' into aspect_nav_rework 
Conflicts:
	features/posts_from_main_page.feature
	public/javascripts/aspect-filters.js
	spec/javascripts/aspect-filters-spec.js
 2011-09-27 00:08:05 -03:00
Ilya Zhitomirskiy
d36da2a266 ms iz made the aspect stream ajax in 2011-09-26 19:34:35 -07:00
Ilya Zhitomirskiy
f9172c8733 added aspect dropdown to the getting started page, renamed the button to be add contact 2011-09-26 17:32:37 -07:00
Ilya Zhitomirskiy
675908a57d added an expanation of what connecting services does(getting started), also indicate services whick are connected connected services 2011-09-26 16:04:25 -07:00
Ilya Zhitomirskiy
afd1913de4 added a link to resque-web from admin page 2011-09-26 10:25:29 -07:00
danielgrippi
4bd1f0997d fix build 2011-09-25 13:14:09 -07:00
danielgrippi
131166841a added logged out page referencing mobile 2011-09-25 11:58:44 -07:00
Maxwell Salzberg
049eb74ab2 added route to grab users profile picture if you know their username 2011-09-24 23:33:14 -07:00
Gonzalo Rodriguez
be00536810 Remove extra whitespace inside person_link that's causing bad formatting on likes list 2011-09-24 19:07:17 -03:00
Ilya Zhitomirskiy
461cb22109 in the getting started featured tags are now followable 2011-09-23 17:06:21 -07:00
Ilya Zhitomirskiy
494ab8b13b added community welcome and a non-mandatory wording 2011-09-23 14:56:33 -07:00
Ilya Zhitomirskiy
f8c05851f6 added an email link to the right section 2011-09-21 14:40:59 -07:00
Ilya Zhitomirskiy
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -07:00
Ilya Zhitomirskiy
386697f711 added a nil check, for pre-mongo days 2011-09-21 13:37:37 -07:00
Ilya Zhitomirskiy
c98f2d1664 added a weekly user stat for admin 2011-09-21 13:23:09 -07:00
Gonzalo Rodriguez
24be48d660 Strip full name considering cases where first or last name omitted 2011-09-20 22:18:35 -03:00
Maxwell Salzberg
8187fb9ddb clean up and move help widget up the page 2011-09-20 10:05:39 -07:00
Ilya Zhitomirskiy
2cebfa54cc fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher) 2011-09-19 15:52:25 -07:00
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
Maxwell Salzberg
bc1aef4999 MS IZ start to implement followed tags in the stream 2011-09-16 18:19:34 -07:00
Maxwell Salzberg
e865dfc269 fix a bug with emailing in posts going to tumblr 2011-09-16 13:57:38 -07:00
Maxwell Salzberg
55999bc443 resolve route conflicts 2011-09-16 12:49:47 -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
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
danielgrippi
36f5e45c25 change Base64.encode64 to Base64.encode64s (encode without newlines) 2011-09-16 08:53:13 -07:00
danielgrippi
58abbcc058 DG MS; activate dispatcher switch in Dispatcher; remove diasporahq blocker 2011-09-16 08:53:13 -07:00
danielgrippi
999efbd451 IZ DG MS; fix method call in public receiver 2011-09-15 19:37:56 -07:00
Gonzalo Rodriguez
2bb2c6e3e8 Add links to person profile for post hidden text 2011-09-15 23:16:13 -03:00
Loïc Guitaut
a739c4f308 Ability to mount resque jobs monitoring directly into Diaspora* routes 
As resque-web is considered as a debug tool, route is disabled for
production by default, and can be enabled via the `mount_resque_web` key
in application.yml.
 2011-09-16 02:40:57 +02:00
danielgrippi
60cb9e43a7 DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route 2011-09-15 15:33:28 -07:00
danielgrippi
ba8e50e34c DG MS; renamed a file; fixed the build 2011-09-15 15:16:34 -07:00
danielgrippi
97f80272b2 DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class 2011-09-15 12:42:53 -07:00
danielgrippi
ec011f0800 DG MS; optimized local comments to be batched; backfilled more tests 2011-09-15 11:22:47 -07:00
danielgrippi
cfa260927d DG MS; remove unusused job 2011-09-15 11:22:47 -07:00
Daniel Grippi
380b980f8b Merge pull request #1985 from alda519/featured_user_tag_link 
fixed links to featured user's tags on getting_started page
 2011-09-15 09:28:08 -07:00
danielgrippi
7216f76801 added some docs to Request [ci skip] 2011-09-15 08:39:21 -07:00
alda519
b2c141a221 fixed links to featured user's tags on getting_started page 2011-09-15 17:03:17 +02:00
danielgrippi
656640ee94 call Postzord::Receiver::Private explicitly in receive_salmon 2011-09-14 19:19:00 -07:00
danielgrippi
b3534ed5f4 Revert "show redis connection" 
This reverts commit 6a887a6d99899b9876e3145fb0a8b92ce2a405cf.
 2011-09-14 18:07:54 -07:00
danielgrippi
e0bdbef281 show redis connection 2011-09-14 18:07:53 -07:00
danielgrippi
4da9425480 fix pod_uri bug in app_config 2011-09-14 18:07:53 -07:00
danielgrippi
2f9ea6cd43 try accessing env var if present in app_config 2011-09-14 18:05:40 -07:00
danielgrippi
57079ef5cd set ENV['HEROKU'] explicitly in the heroku:config task 2011-09-14 18:05:40 -07:00
danielgrippi
f55a086752 edit app+_config to look for heroku's ENV['STACK'] config var; load settings from ENV hash instead of application.yml if on heroku 2011-09-14 18:05:40 -07:00
danielgrippi
fab6f9ccd9 DG MS; fixed tests; explicitly send in dispatcher in httpmulti 2011-09-14 17:51:25 -07:00
Maxwell Salzberg
60ace5c297 DG MS; Broke out HydraWrapper in HttpMulti job 2011-09-14 15:50:07 -07:00
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
Gonzalo Rodriguez
04786bc43e Improvements on aspect navigation rework 2011-09-08 02:13:15 -03: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