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

3138 commits

Author SHA1 Message Date
danielgrippi
8cecedc53b TIMELINE TIME. 2012-05-02 23:28:56 -07:00
danielgrippi
1b6c33aff5 show a user's full profile info if she's on her own page. duh. 2012-04-28 17:41:22 -07:00
danielgrippi
d5f511c325 hitting profiles.json publically displays only public stuff; if you're connected to a user, it shows that user's complete profile response 2012-04-28 17:05:25 -07:00
danielgrippi
c3b0bbd425 show new profile pages for those who have it activated 2012-04-28 16:06:36 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
danielgrippi
52efb3710c show a follow button for users with pre-existing contacts (legacy beta testers) 2012-04-28 14:13:43 -07:00
danielgrippi
699b0cff16 don't expose follow/unfollow to a user in the UI 
following is good for bookkeeping in the database, but provides confusion, and could limit likes and/or commenting to start receiving notifications in a conversation.
 2012-04-28 11:07:18 -07:00
Jonne Haß
008ed32e9e unambigousify community spotlight query in the multi stream, fix #3196 2012-04-28 12:28:07 +02:00
danielgrippi
7f4af0359f add bootstrap tooltips for great justice (and clarity) [ci skip] 2012-04-27 20:45:26 -07:00
danielgrippi
889b86f9cb implicitly expand / contract a post by clicking on it. use the permalink icon to go to the show page. (user tested, mother approved) 2012-04-27 19:38:06 -07:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can 
also now add a beta role
 2012-04-27 16:14:43 -07:00
danielgrippi
562e6641e1 fix jasmine 2012-04-27 16:02:44 -07:00
Jonne Haß
9cb803831f improve webfinger failure handling 
* do not raise if profile xrd isn't found
* error out on a ssl error rather than on the unexpected nil value later
* be more verbose about failed xrd fetches
 2012-04-27 16:53:26 +02:00
danielgrippi
c9d0879d3d fav by clicking on something yeahhhh 2012-04-26 18:39:43 -07:00
Maxwell Salzberg
2b3bc5a0f0 fix profile json birthday response with some tests. 2012-04-26 16:00:23 -07:00
Jonne Haß
2357d9b0f1 update xrd fixture to include namespace and remove namespace before trying to set fields in webfinger profile 2012-04-27 00:05:28 +02:00
Dennis Collinson
c3c3d57d69 huge basketball shorts 2012-04-25 16:59:06 -07:00
Maxwell Salzberg
d22a98cd96 monkey patch to_xs for ruby 1.8, and fix a test as a result 2012-04-25 11:38:42 -07:00
Dennis Collinson
7346921473 MS DC; you can now kill a post on your profile. 2012-04-24 20:46:09 -07:00
danielgrippi
9853197063 only show edit and new post controls if you're on your profile page 2012-04-24 19:24:45 -07:00
danielgrippi
570de98365 animate isotope! and inject image height in relation to ratio for quicker organization. [ci skip] 2012-04-24 16:38:17 -07:00
Dennis Collinson
8149648e5b MS DC; youtube videos now display thumbnail, and sound cloud embeds are not total train wrecks; 2012-04-24 16:18:00 -07:00
Dennis Collinson
8cca2f028b extract oembed view to seperate view 2012-04-24 15:38:38 -07:00
danielgrippi
91ebff75dd added tests and stuff for own profile checking... for some reason something isn't getting triggered properly in the presenter call, though :( 2012-04-24 01:04:49 -07:00
danielgrippi
84bd1fb1fc return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection 2012-04-23 23:31:39 -07:00
danielgrippi
dbe3b48aee now you can click on an entire post to favorite / unfav it. yay. [ci skip] 2012-04-23 23:04:53 -07:00
Dennis Collinson
e8cfe01c8a reLayouts when something is favorited, whoa 2012-04-23 12:35:13 -07:00
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
danielgrippi
ab7ac667d8 only focus on photos for now with ratios. one thing at a time, yo. 
i've temporarily removed all the arbitrary text switching for now (which is still in version control // which we will get to later)
also moved photo dimensions into a dimensions hash in photo.rb.
 2012-04-21 20:42:50 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
aa4c554177 DG MS; added photos and more styling to the canvas view. 2012-04-21 13:12:57 -07:00
danielgrippi
32d8cfd48d MS DG; basic style enumeration for profile 2012-04-21 13:12:57 -07:00
Dennis Collinson
f46dd08cb5 canvas view is infinite stream 2012-04-21 13:12:57 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
danielgrippi
f62b9f9698 wip. 2012-04-21 13:12:56 -07:00
Maxwell Salzberg
63a0a37171 width and height should now federate 2012-04-20 12:53:02 -07:00
Maxwell Salzberg
1b2440f68a we now store image height and width locally; still need to federate the values 2012-04-20 12:22:12 -07:00
Maxwell Salzberg
6d7f6129fe remove puts in spec [ci skip] 2012-04-19 17:47:32 -07:00
Dennis Collinson
7f3c4c209e fix post spec 2012-04-19 14:37:46 -07:00
Dennis Collinson
f7d320b622 MS DG; checkboxes are togglable, with tested css magick 2012-04-19 14:05:55 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
danielgrippi
e379a6df0f Merge branch 'master' into stream-for-photos 
Conflicts:
	app/assets/javascripts/app/views/stream_view.js
 2012-04-18 18:30:54 -07:00
Maxwell Salzberg
ab48ca260b kinda ugly hack for ports in url with iframes 2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
31172a9959 basic oembed provider set up... too tried to finish this now 2012-04-18 16:12:56 -07:00
danielgrippi
a307b60dd2 DC DG extract infininte scroll to a mixin 2012-04-18 12:34:43 -07:00
Florian Staudacher
8eb70c8a80 use app.models.Stream instead of app.models.Photos, 
change naming a bit to be more general since its posts+photos now
(re #3158)
 2012-04-18 20:20:56 +02:00
danielgrippi
3621576717 add/remove hidden class for pagination instead of manipulating HTML contents on every page load. 2012-04-18 10:27:22 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
danielgrippi
3479cb7bdd refactored stream and Stream View 
streamView no longer abuses render with fetching
moved post collapsing into contentView
subtle nicification.
 2012-04-17 21:06:34 -07:00
danielgrippi
37cd6f616e refactor stream fetching logic 2012-04-17 19:18:12 -07:00
Dennis Collinson
16223d003f change new publisher to public by default to make testing easier 2012-04-17 16:43:42 -07:00
Florian Staudacher
fe130caf10 moved non-ascii url markdown tests to text_formatter_spec, added test case + fix 2012-04-16 23:41:05 +02:00
Florian Staudacher
6c34207e01 freeze at a valid time, not 0000-01-01 ... 2012-04-15 13:03:33 +02:00
Florian Staudacher
d9d7bbb74b using timecop for interactions + whitespaces removed 2012-04-15 03:10:18 +02:00
Maxwell Salzberg
9f6ad65d73 update schema, views spec 2012-04-13 18:32:35 -07:00
Dennis Collinson
a0ea8c8542 Update aspects dropdown to say number of selected aspects 2012-04-13 17:49:49 -07:00
Dennis Collinson
9e50d0efb6 Newspaper theme selected by default, template picker object 2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88 Wallpaper frame selected when post has one photo 2012-04-12 11:56:27 -07:00
Jonne Haß
83103c4761 deterministic stream order take 2, this time with spec 2012-04-12 16:33:02 +02:00
Dennis Collinson
d767410e6d mentions are clickable in framer 2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f can mention in new composer 2012-04-11 17:07:53 -07:00
danielgrippi
a1d4ca9bec Refactor composer and framer to user same layout 
composer touchup; added controls to the bottom; centered input area; removed forms.Base view

Fix tests
 2012-04-10 11:38:35 -07:00
Florian Staudacher
0bd4d63640 fix jasmine test for publisher textarea "resets height on close" 2012-04-06 22:24:13 +02:00
Florian Staudacher
d7eb4b242f this seems to be in fact a bug in ruby 1.9.2, disabled for now 
... when running with 1.9.3 everything's peachy :/
 2012-04-06 03:42:37 +02:00
Florian Staudacher
518346deab try setting a higher swappiness, take other val for mem calculation 2012-04-06 01:55:07 +02:00
Florian Staudacher
248e9d9ae7 add more output (swapping), increase swapfile size 
MY FIRST COMMIT <3 (it would be so awesome if this would make travis green)
:P
 2012-04-06 01:16:37 +02:00
Maxwell Salzberg
e1d86bddcf some tweaks so it fails gracefully on systems that do not have free command 2012-04-05 14:29:41 -07:00
Florian Staudacher
fc941fa88b try monitoring used memory an GC by that 2012-04-05 22:21:30 +02:00
Maxwell Salzberg
20fee66eee dont do speedup magic on travis 2012-04-05 12:28:07 -07:00
Maxwell Salzberg
2e86d069b8 try two seconds 2012-04-05 12:15:17 -07:00
Maxwell Salzberg
f65a3d760e defer gc for half as long to prevent travis dying 2012-04-05 12:08:15 -07:00
Florian Staudacher
4051651737 speeding up rspec by deferring garbage collection 
-> https://makandracards.com/makandra/950-speed-up-rspec-by-deferring-garbage-collection

on my machine the rspec tests went from taking 5min 02sec to 3min 29sec :O
(31% improvement)
 2012-04-05 15:59:23 +02:00
Maxwell Salzberg
9c9562d0fd fix http urls with 3 slashes 2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d DG DC; visual fixups 2012-04-04 18:59:19 -07:00
danielgrippi
6098890783 redirect to post show on create 2012-04-04 18:59:19 -07:00
danielgrippi
9b02633dff framer has better styling 2012-04-04 18:59:19 -07:00
Dennis Collinson
06110b8732 newspaper template WIP 2012-04-04 18:59:19 -07:00
Maxwell Salzberg
f5754d2b71 small fix for jasmie that works in chrome and ff 2012-04-03 17:26:13 -07:00
Maxwell Salzberg
e521ac92f9 make a test slightly dumber for travis 2012-04-03 16:52:34 -07:00
danielgrippi
3bc3f13651 upgrade backbone, fix tests 
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
 2012-04-03 16:31:52 -07:00
Steven Hancock
a8843c1036 Fix JSON caching regression 
Disable jQuery's AJAX caching to prevent the browser's
back button from dumping the stream in JSON format.

Includes a test for the jquery_include_tag helper to
ensure that the necessary line of javascript doesn't
go missing again.

closes #3094
 2012-04-02 21:40:16 -07:00
danielgrippi
e156947d0b fix jasmine specs 2012-04-02 18:17:55 -07:00
Florian Staudacher
1709036764 fix jasmine unhappiness I introduced with #3088 2012-04-02 21:25:01 +02:00
Daniel Grippi
a45eed13d5 Merge pull request #3086 from Raven24/fix-publisher-height 
reset publisher css height when "cleared" [ci skip]
 2012-04-01 18:24:00 -07:00
Florian Staudacher
2a4bc32eb5 make wallpaper-post spec pass 2012-04-01 17:43:33 +02:00
Maxwell Salzberg
adf85e1ec6 adding a bit to tubbo's spork branch 2012-03-31 01:22:46 -04:00
Maxwell Salzberg
98b41d8f1d update seeds.rb to reflect asset pipeline, and a lil bit of refactoring 2012-03-31 00:15:56 -04:00
Florian Staudacher
0629f4fd9c added tests for resetting height on close 2012-03-30 16:40:08 +02:00
Steven Hancock
125be41868 Test for mobile UI single post view 
Verify that the correct layout is rendered (rather than no layout
at all) in the mobile UI single post view.

This is a test I forgot to write at 5am when I was so excited about
having the mobile UI working on my Blackberry again (bad me!), so
here it is before it slips my mind. 😁

This tests the change made to posts_controller in 6abe718227
 2012-03-29 21:07:21 -07:00
Maxwell Salzberg
033bf637cd Merge pull request #3070 from SuperTux88/fix-invite-mail 
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
 2012-03-29 15:41:23 -07:00
Maxwell Salzberg
fe1c0d34d5 Merge pull request #3084 from Raven24/non-ascii-begone 
finally (hopefully) fix non-ascii urls + new & old tests
 2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28 finally (hopefully) fix non-ascii urls + new & old tests 2012-03-30 00:29:34 +02:00
Dennis Collinson
59f7f504e8 Wallpaper Mood 2012-03-29 15:14:09 -07:00
Diaspora Europe
9fdca1adf8 make URL clickable in RSS #2176 2012-03-29 13:43:04 +02:00
Steven Hancock
731446e078 Stylesheet naming issue (new-templates.css) 
Replace all references to new_templates.css with the correct filename,
new-templates.css
 2012-03-29 01:29:07 -07:00
Benjamin Neff
e57d3672cd add rspec controller test 2012-03-29 03:29:41 +02:00
Dennis Collinson
875ce68556 fixes for jasmine 2012-03-28 16:32:24 -07:00
Dennis Collinson
78a2ed28b9 User can select Night and Day Moods 
headline method on post

extract headline and body from post, at first newline

Night Mood
 2012-03-28 16:22:05 -07:00