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

6188 commits

Author SHA1 Message Date
Maxwell Salzberg
64bf4a1f48 adding the ability to customize your open graph namespace 2012-06-01 17:31:34 -07:00
Maxwell Salzberg
018e513130 remove disable_with depreciation warning. 2012-05-31 22:35:07 -07:00
Maxwell Salzberg
cf6974b898 fix photo uploader loading image 2012-05-31 11:58:11 -07:00
danielgrippi
8e2657d26b more instrumentation [ci skip] 2012-05-30 19:26:07 -07:00
danielgrippi
dac781cb4f array woes. boo [ci skip] 2012-05-30 19:03:23 -07:00
Dennis Collinson
f3d1afcc96 memoize selected frame 2012-05-30 18:09:59 -07:00
Dennis Collinson
374ec73fa4 make it clearer which frame is active, and fixes for scrolling flow. 2012-05-30 18:06:12 -07:00
danielgrippi
1c81e4f587 app.track => app.instrument to be less confusing 2012-05-30 17:56:28 -07:00
Maxwell Salzberg
91db7859d8 Merge pull request #3340 from DeadSuperHero/YouTubeFix 
Fix for YouTube Embeds in Show Pages [ci skip]
 2012-05-30 17:52:50 -07:00
danielgrippi
a836b06d3e mixpanel on posting 2012-05-30 17:32:18 -07:00
Sean Tilley
dfa925c375 remove max-height for iframe in show pages, this gets rid of the Chromium bug where YouTube videos appear in strange, elongated dimensions 2012-05-30 19:11:27 -05:00
Dennis Collinson
a7ced3f77b make stream infininte scroll view static method on the page 2012-05-30 16:58:21 -07:00
Dennis Collinson
a9288daf19 refactor stream page scroll spy 2012-05-30 16:58:21 -07:00
Dennis Collinson
1ac01cc156 add our changes back to bootstrap custom 2012-05-30 16:58:21 -07:00
Dennis Collinson
0c8146a069 adding vanilla bootsrap scrollspy 2012-05-30 16:58:21 -07:00
Maxwell Salzberg
d926529ad7 wip dennis 2012-05-30 16:58:21 -07:00
danielgrippi
51d71bf394 DG MS; added scrollspy wip 
Conflicts:

	app/assets/javascripts/app/pages/stream.js
	app/assets/templates/stream-frame.jst.hbs
 2012-05-30 16:58:21 -07:00
danielgrippi
ee27764816 missing quotes. ugh. [ci skip] 2012-05-30 16:50:31 -07:00
danielgrippi
9e42d4386f actually add the guid into the layouts [ci skip] 2012-05-30 16:34:29 -07:00
danielgrippi
ca492b407c add guid to mixpanel 2012-05-30 16:31:26 -07:00
danielgrippi
de680216f0 add mixstuff to post.haml layout [ci skip] 2012-05-30 15:33:40 -07:00
danielgrippi
d8470d303a simple mixtracking 2012-05-30 15:25:19 -07:00
danielgrippi
cf884fb1c9 finally fixed teh analytics helper [ci skip] 2012-05-30 14:56:02 -07:00
danielgrippi
7e544167f3 finally fixed analytics helper [ci skip] 2012-05-30 14:40:08 -07:00
danielgrippi
786a0be8b3 forgot one [ci skip] 2012-05-30 14:19:48 -07:00
danielgrippi
de8d7770fe don't use double quotes in javascript tag helper for mixpanel [ci skip] 2012-05-30 14:11:45 -07:00
danielgrippi
f3e568d3c1 actually include mixpanel. durr [ci skip] 2012-05-30 14:00:25 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Maxwell Salzberg
82c4e0d577 add a podname app config var, and use it throughout the app 2012-05-30 12:11:59 -07:00
Maxwell Salzberg
234bb4cb56 Merge pull request #3302 from movilla/new_login 
Translation new make something /stream [ci skip]
 2012-05-29 11:45:24 -07:00
danielgrippi
55cfc0a367 Revert "load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip]" 
we don't process images with the same aspect ratio at smaller
resolutions.

This reverts commit 6d038d6225.
 2012-05-28 21:49:09 -07:00
danielgrippi
6d038d6225 load small-res images initially in small frames and load full res asynchronously to cut down on inital network time. this should make masonry do its thing faster. [ci skip] 2012-05-28 21:40:45 -07:00
Dennis Schubert
f68f14aa5b Quickfix: replace slideAndRemove() with remove() to prevent the ugly javascript error and make the post go away after click on "hide". Fixes #3249 2012-05-29 01:57:52 +03:00
Sean Tilley
687fd7a6a5 Merge pull request #3328 from caarlos0/master 
set cursor into username field on login page [ci skip]
 2012-05-28 00:04:45 -07:00
Sean Tilley
0fff23f233 Merge pull request #3319 from clavisound/patch-1 
I hope it solves bug 3292 (inverted desktop colors) [ci skip]
 2012-05-27 21:58:45 -07:00
Carlos Alexandro Becker
22103ffe65 set cursor into username field on login page - fixes #3305 2012-05-28 01:40:30 -03:00
movilla
13c16af5ad Fix Translation missing Email_link 2012-05-26 21:49:54 +02:00
clavisound
f8d20751df I hope it solves bug 3292 https://github.com/diaspora/diaspora/issues/3292 2012-05-25 21:01:46 +03:00
Florian Staudacher
54c21f95f0 fix author box in FF (fixes #3278) [ci skip] 2012-05-25 14:26:09 +02:00
Maxwell Salzberg
f2a67bbcc0 more legacy styling for the stream [ci skip] 2012-05-24 20:27:44 -07:00
Maxwell Salzberg
fb1fd665de Merge pull request #3313 from OhaiBBQ/master 
BMM #3, “Show x more comments” deletes text in comment box when clicked
 2012-05-24 20:20:58 -07:00
Maxwell Salzberg
2f4f5e9449 Merge pull request #3315 from OhaiBBQ/bugmash-one 
BMM #1, Adding long text before @mention breaks mentioned name highlighting [ci skip]
 2012-05-24 20:15:57 -07:00
Dan Hansen
e248526bef bugmash #4 
The Publisher doesn’t expand after writing more than 30 lines of text
 2012-05-24 19:50:39 -07:00
Dan Hansen
1327e5a492 bugmash #1 
Adding long text before @mention breaks mentioned name highlighting
 2012-05-24 19:34:39 -07:00
Dan Hansen
d334097ee2 bugmash #3 
persist unsaved comment value after expanding comments
 2012-05-24 19:08:43 -07:00
Dennis Collinson
c4240154b1 back to profile works 2012-05-24 12:43:06 -07:00
Maxwell Salzberg
bc25ef2385 dont navigate to posts that dont exisit 2012-05-24 12:31:53 -07:00
danielgrippi
58ac040f8f clicking a permalink on the new stream does not make an HTTP request to go to the post's page 2012-05-24 12:05:27 -07:00
danielgrippi
3e09d4ed14 Revert "don't seed beta users with default aspects" 
This reverts commit 946f78b025.
 2012-05-24 11:42:52 -07:00
Dennis Collinson
f3174941bd fix the "has no posts" on back bug. 2012-05-24 11:40:27 -07:00
danielgrippi
946f78b025 don't seed beta users with default aspects 2012-05-24 11:37:34 -07:00
Maxwell Salzberg
bed07872f2 composer now prevents you from submitting an empty frame. 2012-05-24 11:36:43 -07:00
Maxwell Salzberg
d270910500 set the submit button to be disabled on the framer, and write a test 2012-05-24 11:36:43 -07:00
danielgrippi
ed9c57e7db made loader transparent [ci skip] 2012-05-24 11:17:05 -07:00
danielgrippi
fd6a858f83 don't do big styling on frames with the has-media class [ci skip] 2012-05-24 11:04:12 -07:00
danielgrippi
a5f023354a fixed the empty state styling on smallframe [ci skip] 2012-05-24 11:00:07 -07:00
danielgrippi
34d98a6d3c fixed some styling during the framing process [ci skip] 2012-05-23 18:47:01 -07:00
Maxwell Salzberg
de499ba276 new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip] 2012-05-23 18:06:50 -07:00
danielgrippi
5b3fcd07f3 added texture directory to assets/images [ci skip] 2012-05-23 17:28:02 -07:00
Maxwell Salzberg
82218fd7cb new stream now remembers how far you have scrolled. 
also, jasmine is really cool.
 2012-05-23 17:25:40 -07:00
danielgrippi
b736741ab8 added better images to framer [ci skip] 2012-05-23 17:07:41 -07:00
danielgrippi
5d2ea71766 added EditbaleSmallFrame class; frame on framer second step is partially editable 2012-05-23 17:07:41 -07:00
Maxwell Salzberg
fbb0961762 make logo on new stream a link back to stream [ci skip] 2012-05-23 16:07:42 -07:00
Maxwell Salzberg
8046a59da9 new stream has a loader [ci skip] 2012-05-23 16:00:27 -07:00
danielgrippi
2a37491be0 changed service icons; icons for template picker [ci skip] 2012-05-23 15:09:57 -07:00
Maxwell Salzberg
c21bc14c78 center big text on frames [ci skip] 2012-05-23 15:03:38 -07:00
Maxwell Salzberg
f3af73efc2 make some text on some legacy posts readable in the new stream [ci skip] 2012-05-23 14:59:11 -07:00
Dan Hansen
cf847d61ba bug mash #5 
fix NoMethodError on InvitationsController
 2012-05-23 13:05:01 -07:00
danielgrippi
0e1c66f5b6 DG MS; only show applicable frames in the framer step 2012-05-23 12:59:27 -07:00
danielgrippi
92cbcae9c3 DG MS; moved framer controls into a subview & off to the side 2012-05-23 12:16:35 -07:00
Dennis Schubert
348c5ac522 Extend usernames pattern to allow '@', '.' and '"' to not lock out old users with dots in their username or users using their email address to sign in... 2012-05-23 20:52:43 +03:00
danielgrippi
120c6b46e0 MS; Fix fake following, as we took it out so I nuked the tests 2012-05-22 19:04:04 -07:00
danielgrippi
c6b8d75313 DG MS; cool header with background in new stream 2012-05-22 19:00:22 -07:00
danielgrippi
0c7492b94d DG MS; add hatched texture to new stream [ci skip] 2012-05-22 15:58:34 -07:00
danielgrippi
20360b5cc5 DG MS; added interactions & permalink in the new stream [ci skip] 2012-05-22 15:48:23 -07:00
danielgrippi
2e52def47a DG MS; background colors for great justice (on the stream) 2012-05-22 15:47:09 -07:00
movilla
a7f967c2c5 Translation new make something /stream 2012-05-23 00:43:45 +02:00
Dennis Collinson
1c342282b0 fixing event passing 2012-05-22 15:11:21 -07:00
danielgrippi
abc4843273 DG MS; got scroll working [ci skip] 2012-05-22 14:35:05 -07:00
danielgrippi
83fec811cc DG MS; author attribution in the stream; cleaned up some *new* stream styling 2012-05-22 13:50:19 -07:00
Dennis Collinson
9f1d0b64b4 killing stream_object_view 2012-05-22 13:43:21 -07:00
Dennis Collinson
36ef010ed9 DG DC MS; stream has one interactions div 2012-05-22 12:38:48 -07:00
Jonne Haß
5c534521cc top level email is a noun, not a verb [ci skip] 2012-05-22 10:26:21 +02:00
danielgrippi
64a73fb665 new post types. remove old ones. yeah. 2012-05-21 18:45:01 -07:00
Dennis Collinson
2059fea656 put stream.haml back as it is still used in mobile 2012-05-21 17:43:49 -07:00
Dennis Collinson
17dc5eab18 can't remove these yet, cause of mobile 
Revert "do you like old views, because I don't.Kill the old stream views"

This reverts commit 370d8b0482.
 2012-05-21 17:40:23 -07:00
Dennis Collinson
370d8b0482 do you like old views, because I don't.Kill the old stream views 2012-05-21 17:20:08 -07:00
Dennis Collinson
10201f2e40 more work on new stream interactions, hella refactorz. 2012-05-21 17:15:10 -07:00
Dennis Collinson
fe0156a18b cuking out new stream, refactors. 2012-05-21 15:14:23 -07:00
danielgrippi
481160bdcb move canvas-frame functionality into js sub-class for great justice 2012-05-21 12:58:25 -07:00
danielgrippi
777c037e16 kill rich-media type with fire 2012-05-21 12:33:28 -07:00
danielgrippi
0960a090fa actually use the computed image height; remove unused presenter 2012-05-21 11:09:42 -07:00
danielgrippi
ff42f250ca make a small-frame template folder; we're not going to want the same dom structure moving forward... 2012-05-21 11:09:42 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Alex Connor
fe984eb426 #3287 using reorder instead of order for newer, older 2012-05-20 18:21:34 -05:00
Maxwell Salzberg
bde23f8ab8 use image_tag for asset_pipeline goodness 2012-05-19 18:19:50 -07:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
Steven Hancock
125b013c10 AppsController no longer exists 
Remove the AppsController check from the next_page_path helper, since
AppsController no longer exists.

fixes #3280

I'd like to write a helper spec for this, but it'll probably require
some stubbing/mocking and I'm a little too tired to deal with that at
the moment.. so for now let's just fix the problem. :)
 2012-05-18 23:42:29 -07:00
danielgrippi
f4c06c8f88 add rounded buttons to the composer flow; slay multi-photo option 2012-05-18 19:46:51 -07:00
Maxwell Salzberg
593fa0ed8e stupid hack for photos 2012-05-17 21:49:04 -07:00
danielgrippi
62ba75ad1b DG DC; Move stuff to second page of framer 2012-05-17 19:02:58 -07:00
Maxwell Salzberg
133c9ee0c3 remove deprecation warnings about the template handler in rails 3.2 2012-05-17 18:23:39 -07:00
Steven Hancock
2ae366ad19 Render invitation email without a layout 
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.

fixes #3270
 2012-05-17 17:51:20 -07:00
danielgrippi
27aff7fb1e DG DC; GREEEEEEEEEN 2012-05-17 17:01:31 -07:00
Florian Staudacher
788f328a77 resolve reshare root posts to the first one 2012-05-18 01:45:41 +02:00
Dennis Collinson
c66bd9d6d8 fix posting with services, fix cuke 2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2 Going back to the composer from the framer is happy via button 2012-05-17 15:32:35 -07:00
Maxwell Salzberg
f24b1f1550 remove a bunch of unused assets [ci skip] 2012-05-17 15:14:51 -07:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5 wip 2012-05-17 14:55:22 -07:00
danielgrippi
c8aa67360b backfill some tests; jasmine green 2012-05-17 13:31:40 -07:00
danielgrippi
e48d57b19b Revert "DC fix back button to profile with this.deferred reference" 
This reverts commit e5206f3429.
 2012-05-17 12:05:45 -07:00
danielgrippi
e5206f3429 DC fix back button to profile with this.deferred reference 2012-05-17 11:47:17 -07:00
danielgrippi
ed6785d7cb don't use an iframe for the composer anymore. yayyyyy 2012-05-16 18:55:25 -07:00
Maxwell Salzberg
a6758c0832 Merge pull request #3264 from movilla/share_amparito 
Translation invitation Share this link /stream [ci skip]
 2012-05-16 17:48:14 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
danielgrippi
08fddf7422 raise on hotlinking [ci skip] 2012-05-16 14:41:09 -07:00
movilla
d394272e5d Translation invitation Share this link /stream 2012-05-16 00:56:34 +02:00
Movilla
4fac6c9619 Rebase Add translation app/views/admins/stats.html.haml => Admin Panel 2012-05-15 22:38:48 +02:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
6282450418 killing rich media styling, WE'LL DO IT LIVE 2012-05-14 19:13:33 -07:00
Dennis Collinson
927b78b79d kill references to ServiceUser 2012-05-14 18:47:14 -07:00
Dennis Collinson
a90968ea2d basic experimental stream 2012-05-14 17:57:02 -07:00
Maxwell Salzberg
fe6dcffa8f remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer 2012-05-14 16:33:56 -07:00
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Maxwell Salzberg
5968583857 Merge pull request #3253 from SuperTux88/fix-paragraph-margin 
fix paragraph margin for comments and posts [ci skip]
 2012-05-14 15:39:25 -07:00
Maxwell Salzberg
7a6633e82a Merge pull request #3256 from SuperTux88/invitation-mail 
Invitation mail cleanup
 2012-05-14 15:38:43 -07:00
Benjamin Neff
e15aff46a6 delete message input field 2012-05-15 00:23:54 +02:00
Maxwell Salzberg
9d20f66d2f Merge pull request #3252 from movilla/regis_tra 
Translation registrations/new [ci skip]
 2012-05-14 15:18:52 -07:00
Maxwell Salzberg
641ead632b Merge pull request #3254 from SuperTux88/fix-oembed-css 
fix oembed when empty [ci skip]
 2012-05-14 15:17:46 -07:00
Dennis Collinson
ca1a61825d make post load faster from profile to show 
using dirty preloads for now.
I like it dirty.
 2012-05-14 12:14:11 -07:00
danielgrippi
7a11e9fd37 full bleed the mobile images [ci skip] 2012-05-14 11:44:41 -07:00
Dan Berman
905e38e226 check for existence of key instead of checking secret twice 2012-05-13 13:34:02 -04:00
danielgrippi
70b28105e7 fix a little padding and background image weirdness on ios [ci skip] 2012-05-12 22:56:18 -07:00
danielgrippi
f14907e64c more responsive stuffs [ci skip] 2012-05-12 22:29:08 -07:00
danielgrippi
31049fe1c4 get a little responsive in our css [ci skip] 2012-05-12 22:04:12 -07:00
Daniel Grippi
4fc44f137f Merge pull request #3255 from SuperTux88/fix-aspect-dropdown 
fix aspect dropdown on contacts page [ci skip]
 2012-05-12 20:21:38 -07:00
Dennis Collinson
3b897f29d8 kill unused (i hope) participations collection 2012-05-12 18:11:21 -07:00
Dennis Collinson
ec8625746e add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang 2012-05-12 18:08:45 -07:00
Benjamin Neff
ea90c6caf0 remove "message" from invite-form (not used in email) 2012-05-13 02:51:54 +02:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
Benjamin Neff
0b5f611f19 fix aspect dropdown on contacts page [ci skip] 2012-05-13 01:44:28 +02:00
Benjamin Neff
dd949fa715 fix oembed when empty [ci skip] 2012-05-13 00:29:51 +02:00
Benjamin Neff
2ff98a1001 fix paragraph margin for comments and posts 2012-05-12 23:38:28 +02:00
movilla
7538f89a95 Translation registrations/new 2012-05-12 22:18:10 +02:00
danielgrippi
81661c883f custom landing page logic for mobile. yay 2012-05-11 17:05:09 -07:00
danielgrippi
132bdd3bc5 change create and edit buttons on new profile; remove old press assets 2012-05-11 15:12:22 -07:00
Jonne Haß
7a6d325f64 looks like there are sometimes objects passed into post presenter that respond to root while root is nil 2012-05-11 14:23:05 +02:00
danielgrippi
7423dd095f landing fixes for moz [ci skip] 2012-05-11 02:19:46 -07:00