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

6240 commits

Author SHA1 Message Date
Maxwell Salzberg
e87d9af52c fix roboto in firefox" 2012-08-02 23:01:05 -07:00
Dennis Schubert
15b7ee0cf8 Fix the bookmarklet when using paramters 
... because setting values without waiting for the browser to finish the DOM rendering is evil ...
 2012-07-26 23:57:28 +03:00
Florian Staudacher
b9c4e8a02f let the 'toggle mobile' link show in the footer, refactored layout a bit 2012-07-22 15:25:51 +02:00
Florian Staudacher
9bd7c6965f Merge pull request #3464 from Raven24/invite-auth 
require authentication for invite actions
 2012-07-22 04:06:44 -07:00
movilla
d45e53bb91 Link to post in the mobile 2012-07-22 13:32:02 +03:00
Florian Staudacher
fd6d41ddad require authentication for invite actions 2012-07-22 02:42:39 +02:00
Florian Staudacher
629277502f Merge pull request #3450 from despora/mobile_messages 
add messages/conversations to mobile
 2012-07-16 15:10:00 -07:00
Florian Staudacher
6efcac48b5 fix flash messages 2012-07-15 19:33:32 +02:00
Lennart Prelle
00032a1649 add messages to mobile 2012-07-14 14:23:03 +02:00
Jason Robinson
e644a70406 Mobile bookmarklet was not loading jQuery causing javascript to not execute, fixes #3204 2012-07-10 23:06:42 +03:00
Florian Staudacher
038599bf8f update jquery.mentionsInput to latest version 
+ make some tests a little nicer
 2012-07-10 20:37:57 +02:00
Florian Staudacher
ea8f358a9a use unminified jQuery textchange plugin 2012-07-10 17:58:34 +02:00
movilla
5eab1226f6 Fix error admins/weekly_user_stats 2012-07-07 22:33:56 +03:00
movilla
2ff89ed33d Change root_url to root_path 2012-07-06 20:08:41 +03:00
Florian Staudacher
1809897aa2 should fix the mobile toggle for the case: desktop --to--> mobile #3299 
also, (possibly) fix tablet issue #3421, + tests
 2012-07-04 01:47:55 +02:00
Maxwell Salzberg
c2bbe4e466 somehow some dirty state made it into my merge :( 2012-07-02 11:34:31 -07:00
Maxwell Salzberg
190fceaf5c [SECURITY FIX] please update your pod ASAP 
This is a fix for public messages, where a malicious pod could spoof a message from someone a user was connected to, as the verified signatures were not checked that the object was also from said sender.  This hole only affected public messages, and the private part of code had the correct checks
THX to s-f-s(Stephan Schulz) for reporting and tracking down this issue, and props to Raven24(florian.staudacher@gmx.at) for helping me test the patch
 2012-07-02 10:00:12 -07:00
Florian Staudacher
20948d5e93 Merge pull request #3418 from Raven24/nicer-oembed 
oembed video info box
 2012-06-26 11:16:40 -07:00
Maxwell Salzberg
718f7e1dbb Merge pull request #3260 from panckreous/twitter-conf 
check for existence of key instead of checking secret twice
 2012-06-26 10:34:08 -07:00
Florian Staudacher
e19d73792d oembed video info 2012-06-25 15:25:09 +02:00
Florian Staudacher
9588169019 fix oembed iframe/thumb width for reshares [ci skip] 2012-06-25 13:09:56 +02:00
Jonne Haß
c9e54700ff string concatenation is still bad 2012-06-24 12:21:52 +02:00
movilla
1417cd5b0f Last translation admin-panel (weekly user) 2012-06-24 02:34:49 +02:00
Steven Hancock
d36209ae4b Merge pull request #3390 from stevenh512/fix_user_attributes 
User model -  mass-assignable attributes fix
 2012-06-20 11:41:28 -07:00
Zach Scott
82a47d0ba3 Fixed Issue #3382 - The comments under postings are missing when using the #tags -view 2012-06-18 22:46:01 -06:00
Maxwell Salzberg
fd748b8afb Merge pull request #3396 from fermionic/auto-rotate-images 
#2322 -- rotate uploaded images based on the meta-data
 2012-06-18 18:20:05 -07:00
Steven Hancock
a2f208b013 User model - mass-assignable attributes fix 
`:username`, `:email` and `:remember_me` should be mass-assignable.

fixes #3377
 2012-06-18 16:58:36 -07:00
Florian Staudacher
1fb016597d remove leftover edges from spinner, remove red bg color (fixes #3338) [ci skip] 2012-06-18 23:40:55 +02:00
Florian Staudacher
d3b70a7f3a small typo [ci skip] 2012-06-18 23:40:18 +02:00
Florian Staudacher
0596f5345d use default format in case a tablet device is detected 2012-06-18 22:50:15 +02:00
Florian Staudacher
64a20793ec don't open comment pane on show page, if a modifier key is pressed 2012-06-18 20:04:20 +02:00
Florian Staudacher
994bfd4a24 fix client-side validations in registration form + test 2012-06-18 18:57:44 +02:00
Florian Staudacher
f4d7196fb5 tell jQuery not to expect html when deleting photos in the publisher 2012-06-18 15:25:50 +02:00
Zach Prezkuta
ab9bd2f9e3 #2322 -- rotate uploaded images based on the meta-data 2012-06-17 19:47:34 -06:00
Maxwell Salzberg
d331a14dd2 limit the amount of people in a converasation to prevent hella spam 2012-06-17 15:51:18 -07:00
Maxwell Salzberg
d3487c8b7d fix sa mall possible xss in personImage handlebar helpers if the attacker had access to your root domain. fixes #3392 2012-06-16 14:59:51 -07:00
movilla
d5aefaa64c Login with pod_name 2012-06-16 22:51:38 +02:00
Steven Hancock
9280753950 Fix deprecation warning, :confirm option on links is deprecated 
Use `:data => { :confirm => 'text' }` instead.
 2012-06-14 01:56:51 -07:00
Steven Hancock
033e8e5cb6 Fix ActiveRecord queries - take two 2012-06-13 14:52:25 -07:00
Steven Hancock
79b7d38158 Fix ActiveRecord queries with nested hashes 
Rails 3.2.6 doesn't like them
 2012-06-13 14:18:09 -07:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
e021fd821d Merge pull request #3362 from diaspora/non-public-error-page 
show a "post is not public" message when visitor is not logged in
 2012-06-11 02:35:48 -07:00
Zach Prezkuta
44e43158cc add rspec test and make fix more rails-y 2012-06-08 22:51:16 -06:00
Zach Prezkuta
ed51f34ebb strip comment text upon comment creation 2012-06-08 22:51:16 -06:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
Daniel Grippi
5b424e7d94 don't use quotes for chartbeat (it's picky) [ci skip] 2012-06-05 00:14:00 -07:00
Daniel Grippi
44f2b7ae44 Update master 2012-06-04 23:47:20 -07:00
Maxwell Salzberg
9cf946b20e use a smaller thumb on the home stream 2012-06-04 15:19:05 -07:00
Maxwell Salzberg
9071540400 use pod name helper in emails 2012-06-04 14:04:39 -07:00
Maxwell Salzberg
4eb95a1b6b Merge pull request #3353 from SuperTux88/fix-reshare-link-border 
remove border from reshare link [ci skip]
 2012-06-03 23:09:22 -07:00
David Morley
d3b5e330b3 allow interactions to be viewed on public posts when not logged in 2012-06-03 21:49:08 -03:00
Benjamin Neff
769836c221 remove border from reshare link 2012-06-03 18:42:55 +02:00
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