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

664 commits

Author SHA1 Message Date
Dan Hansen & Maxwell Salzberg
0eb33b371b blocked users works for multi stream, cuke passes 
fixed scoping stuff
 2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9 wip 2011-11-03 12:31:24 -07:00
Pistos
db4bfb73a9 Fix issue #2213: multi-underscore hashtags no longer get Markdown <em>phasis applied. 2011-11-01 23:35:34 -04:00
Pistos
e912bf3eda Whitespace cleanup. 2011-11-01 23:35:21 -04:00
Dan Hansen
066f8d1235 Mention the person who invited a user on first message 2011-10-31 22:16:58 -05:00
danielgrippi
dd00523616 show flash messages when adding a person to an aspect 2011-10-26 16:36:47 -07:00
Maxwell Salzberg
7e73865147 mangle oembed stuff to prevent content warnings, only support services that work when you mangle them; please let us know if your favorite service works when you gsub out all of the https links 2011-10-26 15:11:31 -07:00
Pistos
3ce0806cbc Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login 
Conflicts:
	app/controllers/comments_controller.rb
	app/helpers/comments_helper.rb
 2011-10-25 22:21:08 -04:00
danielgrippi
9fba69cd5b added person stream; temp hack for photos 2011-10-25 16:29:45 -07:00
danielgrippi
aec8ca5c5e remove diapsora ids from titles on small avatars; add twispys to contact sidebar 2011-10-24 15:04:58 -07:00
danielgrippi
e63e8299b9 fixed up stream/publisher logic; fixed cukes 2011-10-24 14:41:15 -07:00
danielgrippi
59e4955727 added translation keys; some css cleanup 2011-10-24 14:11:36 -07:00
Ilya Zhitomirskiy
431fa3fd04 removing getting started on first post and having tooltips in the 
publisher
 2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy
1ccf965194 publisher lib, prefill, open, still need to do public first message for new users 2011-10-24 14:11:35 -07:00
Gonzalo Rodriguez
63f0dac922 Don't allow to reshare someone else's rehare of your post. Fixes #2214. 2011-10-23 05:06:09 -02:00
danielgrippi
794247d07b MS DG; rename soup to stream; fix a bunch of translations 2011-10-21 14:44:02 -07:00
danielgrippi
79ec50a16c DG MS; added setting for displaying spotlight members in soup stream 2011-10-21 14:44:02 -07:00
Maxwell Salzberg
19d91908e3 fix the aspect stream 2011-10-21 14:44:01 -07:00
Maxwell Salzberg
defaba504a functional 'show me where this post came from' in soup 2011-10-21 14:44:01 -07:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
Gonzalo Rodriguez
66f79b13ed Minor aspect_listings cleanup 2011-10-19 00:02:37 -02:00
danielgrippi
b61246c168 fixed all but two jasmine specs... 2011-10-17 16:54:18 -07:00
danielgrippi
4896d056c7 move public option into aspect dropdown in publisher 2011-10-17 15:04:35 -07:00
Manuel Schölling
02a3c3f88b Introduced Shareable 2011-10-16 13:58:35 +02:00
Maxwell Salzberg
d6e9809be1 MS SM finished tag stream refactor 2011-10-15 20:40:20 -07:00
Maxwell Salzberg
2dda160990 tag stream wip 2011-10-15 18:57:35 -07:00
Pistos
153615e651 Fix more specs. Added an explicit spec for all_comments . 2011-10-15 16:21:26 -04:00
Pistos
fae9aee425 Fix specs. 2011-10-15 14:47:09 -04:00
Pistos
35a0c56346 This fixes issue #2032. Anyone can now view all comments on a public post without needing to log in. 2011-10-15 00:18:17 -04:00
Pistos
39dd39e9e3 Refactor: Remove superfluous local variable. 2011-10-15 00:07:12 -04:00
Maxwell Salzberg
44b0887e0a who wants a goat that fetches SOAP?!! 2011-10-13 22:26:15 -07:00
Maxwell Salzberg
8acd9acb08 tests moved and passing 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
cfb28db00f wip, but the refactored code works 2011-10-11 16:12:32 -07:00
Maxwell Salzberg
139ddd726a wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good. 2011-10-11 16:10:14 -07:00
Maxwell Salzberg
963d5c1a69 wip 2011-10-11 16:10:14 -07:00
Manuel Schölling
f3ea8f424f Added oEmbed support 2011-10-11 16:08:47 -07:00
Your Name
dcb4903711 use tag name instead of its id for pagination 2011-10-11 10:42:46 -07:00
Manuel Schölling
1135c0ad79 Allow new lines (<br>) 2011-10-10 20:41:54 +02:00
Your Name
5b9fbd19ed moar specs, a little perf upgrade for base_stream#person 2011-10-06 17:13:04 -07:00
Your Name
55ffc44a42 wip 2011-10-06 17:13:04 -07:00
maxwell
53c98e16e7 fix inf scroll on featured users stream 2011-10-06 12:31:08 -07:00
Your Name
619f5fd56e move featured users to the other side and make a little sidebar widget for it 2011-10-06 12:27:02 -07:00
maxwell
c854ac51a3 fix inf scroll on featured users stream 2011-10-06 11:03:27 -07:00
Maxwell Salzberg
cdce54bbda MS SM featured users stream. because we do what we want 2011-10-05 21:12:02 -07:00
Dan Hansen
8c15ca2a4b PMs and comments contain author name in "From" header 
refactor notifier
 2011-10-04 23:48:28 -05:00
maxwell
eef054dc5e wip 2011-10-04 18:20:14 -07:00
danielgrippi
1ab2ead10c check for current user on tag pages 2011-10-03 19:42:19 -07:00
danielgrippi
543bf458a2 extracted methods to helpers 2011-10-03 18:53:25 -07:00
Maxwell Salzberg
9a4c478a7b these spes are really green. too bad we need #moar 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
ad9dcd8542 holy guacamole. mentions page and tag following pages, plus a huge stream refactor 2011-10-03 15:23:10 -07:00
Maxwell Salzberg
429ac42502 added tag follow feature, mention page feature. is now pretty easy to add new types of streams, but some more refactoring could make it even nicer 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
b5c3f2c615 wip 2011-10-03 15:22:14 -07:00
Maxwell Salzberg
0f073387ac IZ MS refactor commenting disabled 2011-10-03 15:20:43 -07:00
Maxwell Salzberg
647bc585cc always remember me on the mobile. make previous helpers shorter 2011-10-02 09:30:05 -07:00
Maxwell Salzberg
7c9eb065ba make some shared devise logic into a helper 2011-10-02 09:15:02 -07:00
Maxwell Salzberg
cd2eb4292e fix cuke for inf scroll(dont rely on session for sort order) 2011-09-29 17:23:53 -07: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
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
4fb62afa2d getting stated links open in new tabs, translated a string 2011-09-21 14:12:37 -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
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -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
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
alda519
b5f8f49ddd default profile photo is no longer marked as set 2011-09-10 17:31:34 +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
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
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
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
Sarah Mei
e8eb496e66 Ruby 1.9 can find markdownify. 2011-08-29 20:01:57 -07:00
Maxwell Salzberg
c66b7d584d Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown 
Conflicts:
	Gemfile.lock
 2011-08-27 14:13:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8c9a585337 reshares now have notifications, slight refactor of the notification helper 2011-08-25 17:16:09 -07:00
Raphael Sofaer
dec10e3de9 Finish setting up sesssions#new prefill when logged out by authorizationsControlelr 2011-08-23 16:37:51 -07:00
Raphael Sofaer
89edfb7ed6 WIP prefilling username on logout of user is almost there 2011-08-23 16:37:50 -07:00
Maxwell Salzberg
fe78a69161 combine invitation emails 2011-08-19 12:15:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962 Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"" 
This reverts commit a407f12463.
 2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463 Revert "Merge branch 'issue1586-aspectdropdown-when-posting'" 
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
064ae972b3 the cucumber is now passing & renamed the partial to conform with convention 2011-08-18 15:38:27 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
b1e95def4a Merge branch 'master' into issue1586-aspectdropdown-when-posting 2011-08-18 12:59:00 -07:00
Maxwell Salzberg
0473037d1b fix notification links 2011-08-18 11:12:58 -07:00
Brian Wisti
736b179888 Turn on all the redcarpet options 2011-08-16 21:48:48 -07:00
Brian Wisti
b87c7bb489 Improve code block support 2011-08-16 21:48:48 -07:00
Brian Wisti
03127cd592 basic support for Redcarpet Markdown 2011-08-16 21:48:48 -07:00
Raphael Sofaer
89639edb3a Use the Contact#in_aspect? helper in aspect_membership_dropdown 2011-08-16 15:01:48 -07:00
Raphael Sofaer
cc3eeac98e Merge the aspect dropdown in the publisher with master, some things are still broken 2011-08-16 14:59:53 -07:00
Raphael Sofaer
140268365c Simplify aspect dropdown views 2011-08-16 12:43:08 -07:00
Raphael Sofaer
f0583de36c Some optimizations to ServicesController#finder. Apparently setting an association on an unsaved record to an empty array hits the database. 2011-08-13 09:40:31 -07:00
danielgrippi
1c5f61fb78 dropdown images as embedded assets and not 2 separate image tags 2011-08-12 18:18:58 -07:00
danielgrippi
75f3accd37 moved facebook friend inviter/finder into contacts layout & re-added search 2011-08-12 17:05:01 -07:00
Raphael Sofaer
7f69714d08 Fix paul.elicker link, refactor people_helper 2011-08-11 16:26:14 -07:00
danielgrippi
08f12ee348 fixed the 'a post' bug in notification emails 2011-08-11 14:40:45 -07:00
danielgrippi
db645e8da8 merged publics/show and posts/show 2011-08-10 18:07:38 -07:00
danielgrippi
1e7a2f327b use post_message in all mailer html views 2011-08-10 15:31:39 -07:00