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

5422 commits

Author SHA1 Message Date
Maxwell Salzberg
5f4ebc94bb small typo [ci skip] 2012-02-13 17:06:55 -08:00
Maxwell Salzberg
ef40350bae fix authorizations page css to use media box 2012-02-13 17:06:18 -08:00
Maxwell Salzberg
7a565b051d added some methods to make it easier to figure out how many active users a pod has 2012-02-13 16:56:25 -08:00
Jakob Kramer
dfe30e1fe0 fix server-side markdownify to sanitize links 2012-02-11 22:23:06 +01:00
danielgrippi
44e072c330 DC DG; a participation is created in StatusMessageController 2012-02-10 16:42:21 -08:00
danielgrippi
ecdbd1bb26 remove joindiaspora specific home page from repo [ci skip] 2012-02-10 15:45:48 -08:00
danielgrippi
3c7ebe3200 forgot to save a template [ci skip] 2012-02-10 15:24:47 -08:00
danielgrippi
3e4d2fe7e8 adding custom landing page for heroku 2012-02-10 15:20:15 -08:00
danielgrippi
b866d9356a Merge branch 'master' of github.com:diaspora/diaspora 2012-02-10 15:18:49 -08:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
Maxwell Salzberg
232e620637 make posts have empty photos so reshared stop messing up 2012-02-10 13:45:41 -08:00
Dennis Collinson
04bd507025 federated generators take a user 2012-02-09 19:01:01 -08:00
Dennis Collinson
5e26a7e6bb Participate stream query uses participations 2012-02-09 19:01:01 -08:00
Dennis Collinson
14b9f5dc5b move user modules into user namespace. 2012-02-09 19:01:01 -08:00
Dennis Collinson
f3c1eff3e9 Refactor Relayable Creation 2012-02-09 19:01:00 -08:00
Dennis Collinson
9e1816dc12 Participations are a federated, relayable model :) 2012-02-09 19:01:00 -08:00
danielgrippi
2b15bc7938 fix syntax in comment.rb 2012-02-09 18:29:52 -08:00
danielgrippi
7a5838a363 allow comments to be 65535 chars long (as opposed to 2500) 2012-02-09 18:26:20 -08:00
danielgrippi
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
danielgrippi
398ca3d97b Participate / Explore have been upgraded to top-level status. 2012-02-09 14:29:01 -08:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +01:00
Diaspora Europe
8eda9aaf52 added user_is_following method, added 2 model specs 2012-02-09 14:17:43 +01:00
Diaspora Europe
47f7e10860 tags should be case insensitive 2012-02-09 14:17:43 +01:00
Dennis Collinson
74409d64b5 cleanup, yoq 2012-02-08 17:25:25 -08:00
Maxwell Salzberg
062204e963 Merge pull request #2848 from beardedninja/master 
#2847 Users can now toggle nsfw on and off
 2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323 Merge pull request #2839 from diasp/2036-fix-private-messages-navigation 
#2036 Fix private messages are sometimes displayed without navigation
 2012-02-08 16:59:50 -08:00
Dennis Collinson
94a7f5bb91 unsfw - sorry Kinky Joe! 2012-02-08 16:35:55 -08:00
Florian Staudacher
9fcc2a4ffa make previously added specs green 2012-02-09 01:01:28 +01:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Alex Harrison
0cbdf51e6a #2847 Users can now toggle nsfw on and off 2012-02-08 23:01:02 +01:00
Diaspora Europe
3c4b37dad7 PMs should always be displayed with the navigation. 2012-02-08 16:53:48 +01:00
danielgrippi
a819f38b99 touch interacted_at on Post#after_create 2012-02-07 21:32:10 -08:00
Dennis Collinson
8ae18bb393 nsfw's users posts are now nsfw 2012-02-07 19:14:44 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Dennis Collinson
efd99344eb git status 2012-02-07 18:29:51 -08:00
Maxwell Salzberg
7d325cb29b sad fix for stupid app config problem in development [ci skip] 2012-02-07 13:41:03 -08:00
Dennis Collinson
ff1cbb48cc remove excess call to appconfi#setup 2012-02-06 17:42:01 -08:00
Dennis Collinson
a399572995 MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things 2012-02-06 16:51:32 -08:00
danielgrippi
de757db48b fix ruby reshare model; extract sortOrder in app.models.Stream. 2012-02-06 08:26:11 -08:00
danielgrippi
fa5424653a fix markup display on reshares. DERP. [ci skip] 2012-02-06 08:02:27 -08:00
danielgrippi
5d051fcc52 we're now rolling 100% handlebars for our templates, with jammit handling them as static assets. 2012-02-05 16:42:34 -08:00
danielgrippi
36e5ca431f replace two more underscore templates with handlebar counterparts [ci skip] 2012-02-05 13:40:34 -08:00
danielgrippi
5a72f868d3 replace two underscore templates with their handlebars counterparts 2012-02-05 12:50:28 -08:00
danielgrippi
39ff47150b allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing. 2012-02-04 15:50:36 -08:00
Dennis Collinson
354ed7ef05 paginating participate stream 2012-02-03 17:55:06 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
danielgrippi
a3e13e3c0e User#like! method. 2012-02-03 14:42:03 -08:00
Dennis Collective
6dbd644b01 Merge pull request #2719 from stwf/return-contact-popup-to-notify 
aspects popup menu missing from 'started sharing' notifications
 2012-02-03 00:42:10 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
Hrishi
a2d427f06c fix for the bug 8 (The back-to-top button covers the send button on the private message page) 2012-02-02 13:15:52 +05:30
Sarah Mei
085d6552b3 Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring. 2012-02-01 17:52:11 -08:00
danielgrippi
488e064e11 swap pin for heart [ci skip] 2012-02-01 16:53:22 -08:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -08:00
Maxwell Salzberg
f826340336 push stream listings to the side a bit 2012-02-01 13:56:52 -08:00
Maxwell Salzberg
51e5b0e02f reorder side stream to insinuate new groupings 2012-02-01 13:39:21 -08:00
Jakob Kramer
eb445e45ba fix missing translation in mentioning-lightbox 2012-01-31 22:16:48 +01:00
Jonne Haß
7a8bd7595b do not auto follow back if already sharing 2012-01-31 14:34:09 +01:00
Maxwell Salzberg
5914ed4ef1 defer comments posting in comment controller 2012-01-30 11:34:50 -08:00
Steven Fuchs
5ea4bc0a1b Merge remote branch 'upstream/master' into return-contact-popup-to-notify 2012-01-29 18:13:30 -05:00
danielgrippi
bcbabc5fd2 Switch boilerplate for bootstrap 2 on mobile. [ci skip] 2012-01-29 11:51:47 -08:00
Sarah Mei
e4fa8d8466 Fix tags_helper, add specs 2012-01-29 11:46:51 -08:00
Lennart Prelle
5deab956c0 use a form with a configurable paypal id 2012-01-29 20:14:31 +01:00
danielgrippi
0797460586 whats on your mind -> start a conversation 2012-01-29 09:19:36 -08:00
Jakob Kramer
44ff6ae8d8 fixed a link titled 'RSS' linking to an atom feed 2012-01-29 15:20:34 +01:00
Jonne Haß
0e7b084713 fix 500 in PostsController#show for non existing post 2012-01-29 14:47:51 +01:00
Jonne Haß
9b07ce07d6 --amend [ci skip] 2012-01-29 13:13:08 +01:00
Jonne Haß
03f119ede7 fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip] 2012-01-29 13:09:03 +01:00
Maxwell Salzberg
13d1e68540 refactor people#index 2012-01-28 23:48:37 -08:00
Sarah Mei
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -08:00
Sarah Mei
03e3d8e993 Refactor contacts#index to have explicit html and mobile formats again, because apparently infinite scroll wants the html version, not the json version. 2012-01-28 15:31:11 -08:00
Sarah Mei
a27b17bc68 Slight refactor to contacts#index 2012-01-28 15:31:11 -08:00
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -08:00
Sarah Mei
7d4a81560d Move contact pagination to controller - fixes #2760 2012-01-27 21:56:27 -08:00
danielgrippi
f250b79105 post owners can now delete any comments on their own posts. fixes #2652 2012-01-27 18:24:46 -08:00
danielgrippi
d773749374 comment stream now uses handlebars. 2012-01-27 17:46:35 -08:00
danielgrippi
8529293eee resque deals with stringified hashes, not symbolized ones [ci skip] 2012-01-27 16:48:28 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
67432bfaf4 suppress annoying resque errors; add a task to clear Resque failures 2012-01-27 14:57:04 -08:00
danielgrippi
d8c6dc0d79 added source to stream element js template. [ci skip] 2012-01-27 13:51:24 -08:00
Maxwell Salzberg
c69df0fb29 fix photos controller test 2012-01-27 13:06:27 -08:00
danielgrippi
ff71bc5a44 remove @backbone reference in people/show (thx @mrZYX for the catch); added loaders to people and tag pages 2012-01-27 10:53:03 -08:00
Maxwell Salzberg
e2cb572c15 random cleanup; delete some unused methods, clean up some logic in some 
controllers; update the default referee to /stream [ci skip]
 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
c100f8bfdd clean up Person scopes, and re-use one in contact controller to deprecate a controller method 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
7cef6a8d22 remove unneeded line from apps_controller [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
46da8310f5 small styling changes 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
8002091d67 kinda refactor another sucky controller method 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
cc5334ce9a make this scary join a scope [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
c43bb90794 we never use this data [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
117acdd17f move mention regex to a constant in mention 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
718c4fd38c refactor status_message_controller#create to suck less. it still sucks 2012-01-27 02:23:37 -08:00
danielgrippi
0da5f18ad5 add placeholder in CommentStreamView. [ci skip] 2012-01-26 19:58:00 -08:00
danielgrippi
5a78796ec0 Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders 2012-01-26 19:52:27 -08:00
danielgrippi
fa1ee731af DG MS; made an imageUrl handlebars helper for assets served through handlebars templates. 2012-01-26 17:04:03 -08:00
danielgrippi
c133c16dc2 DG MS; don't fetch people or contact objects (you don't need) on multi stream. 2012-01-26 14:52:31 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Maxwell Salzberg
c23e6d9afd dispatcher#post should not take opts 2012-01-26 13:24:53 -08:00
Steven Fuchs
9e337fc8b0 read_all button on notifications page redirects to stream. 2012-01-25 19:03:31 -05:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -08:00