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

6015 commits

Author SHA1 Message Date
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
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
danielgrippi
4b8cd8eb23 whoopsies on landing [ci skip] 2012-05-11 01:30:15 -07:00
danielgrippi
608a15faf4 the landing page. 2012-05-11 01:06:51 -07:00
danielgrippi
a3ca176d74 new getting started page [ci skip] 2012-05-10 20:43:00 -07:00
Dennis Collinson
9b9a64ffd0 fix reshares in interaction presenternavigate replace states on next or previous so back and forward work 
default user image
 2012-05-10 15:28:27 -07:00
Dennis Collinson
3326bc5bb4 present reshares 2012-05-10 15:16:05 -07:00
Dennis Collinson
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
danielgrippi
a46e16cbcf delegate frame_name in reshares 2012-05-09 16:37:28 -07:00
danielgrippi
1791d6b1b8 defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip] 2012-05-09 00:46:40 -07:00
danielgrippi
b641cddb65 eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip] 2012-05-09 00:36:14 -07:00
danielgrippi
62829aee85 remove obnoxious box-shadow transition on hover; transition on transform [ci skip] 2012-05-09 00:24:28 -07:00
Dennis Collinson
93afe6d63c rescue update services on login 
was failing in development
 2012-05-08 20:38:45 -07:00
Daniel Grippi
be43806ef9 Merge pull request #3245 from SuperTux88/fix-publisher-for-beta 
Fix new publisher if user is beta
 2012-05-08 18:42:55 -07:00
Benjamin Neff
1bc1dc4334 Fix new publisher if user is beta 2012-05-09 03:33:50 +02:00
danielgrippi
f053b71c87 add title to service icons. yay. [ci skip] 2012-05-08 18:28:31 -07:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Maxwell Salzberg
c8f3bb3e9b small typo in notifier.rb 2012-05-08 10:42:24 -07:00
Maxwell Salzberg
1735a17e83 Merge pull request #3241 from stevenh512/nsfw-reshares 
Reshares delegate nsfw to the root post
 2012-05-08 10:06:03 -07:00
Maxwell Salzberg
ab981d4339 Merge pull request #3225 from stevenh512/refactor-emails 
Use Markerb for emails
 2012-05-08 10:02:13 -07:00
Steven Hancock
605b418d42 Reshares delegate nsfw to the root post 
fixes #3120
 2012-05-08 03:20:01 -07:00
Maxwell Salzberg
b375182e0c let line breaks work but don't push everything down on the stream [ci skip] 2012-05-07 19:53:47 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
Dennis Collinson
d1d99d5dd4 Jamie Cai DC refactor isOwnProfile, fix tests 2012-05-07 17:53:37 -07:00
danielgrippi
cb2c972cee Merge branch 'master' of github.com:diaspora/diaspora 2012-05-07 16:41:29 -07:00
Dennis Collinson
1c135b61fd Jamie Cai DC message in profile when user has no posts 2012-05-07 15:56:30 -07:00
danielgrippi
34819b4128 temp button instead of textbox for beta-limbo users 2012-05-07 15:40:13 -07:00
danielgrippi
6e16a748e7 unfix css styling in one place; fix it in another [ci skip] 2012-05-07 15:13:27 -07:00
danielgrippi
f3a51615af min-height instead of height to fix background issues [ci skip] 2012-05-07 13:29:56 -07:00
danielgrippi
730886c082 MS DG; fix some styling for empty profile state 2012-05-07 12:15:43 -07:00
danielgrippi
01d5c0473a DG MS; don't redirect to legacy getting started if you're a beta user 2012-05-07 12:05:36 -07:00
danielgrippi
9bbea232c4 don't fetch the composer if not on your own profile page 2012-05-07 01:18:06 -07:00
danielgrippi
7d1f73261f use modulate instead of -brightness-contrast for now, as the cedar stack has an outdated version of mogrify [ci skip] 2012-05-06 13:57:35 -07:00
danielgrippi
92230383a7 added controller test; put wallpaper into separate wallpaper/ directory 2012-05-06 12:35:11 -07:00
danielgrippi
46d4a957fe don't use storage :file in wallpaper_uploader [ci skip] 2012-05-06 12:35:11 -07:00
danielgrippi
6010579c39 md5 the user's diaspora id for wallpaper image filename; clean up photo_form.js a little (thx max) 2012-05-06 12:35:11 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
danielgrippi
91ffe00de2 apple-style drop shadows (blur the crap out of them); isotope doesn't overflow: hidden; anymore (no shadow cutoff) [ci skip] 2012-05-06 12:35:10 -07:00
danielgrippi
b5fbefad4b this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action. 
for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`.  the current image tests in the public folder are results of the convert command noted.
 2012-05-06 12:35:10 -07:00
Maxwell Salzberg
2f618f6dde Merge pull request #3230 from movilla/close-amparito 
Translation "[X] Close" photo-post [ci skip]
 2012-05-06 10:09:04 -07:00
danielgrippi
e5bb4216f9 clean up dom on post viewer; use circles instead of weird semi-rounded boxes to be consistent 2012-05-05 19:55:38 -07:00
Dennis Collinson
d47785d957 next and previous should be faster 
unbind events on navigate, implimented for at least the single page view
bind changed to on for backbone navigating
 2012-05-05 18:35:58 -07:00
Dennis Collinson
ada91e8568 next and last post don't have obnoxious blink 1/2 the time. 
why not the rest, I don't know, time to start getting into event cleanup territory.
 2012-05-05 17:45:43 -07:00
Dennis Collinson
bd6a9cfe00 next and previous now return post as json 
clean up controller
 2012-05-05 16:41:16 -07:00
movilla
bca5d3ffa7 Translation "[X] Close" photo-post 2012-05-05 14:39:58 +02:00
Sean Tilley
96af3ed944 Merge pull request #3224 from SuperTux88/add-paragraph-margin 
Add small margin for paragraphs [ci skip]
 2012-05-05 02:12:08 -07:00
danielgrippi
456da7844a set profile name… no tests make me a sad boy, but i must run & will backfill this one tomorrow. 2012-05-04 22:09:40 -07:00
danielgrippi
8111dfba31 star it! [ci skip] 2012-05-04 22:08:58 -07:00
danielgrippi
a5f34e67c7 made favicon sexier; extracted form-block into its own custom class; made the title of pages less caps-lock. 2012-05-04 21:25:50 -07:00
Benjamin Neff
a47e239d8e Add small margin for paragraphs [ci skip] 2012-05-05 03:47:54 +02:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient 
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
 2012-05-04 18:25:09 -07:00
danielgrippi
69b9b5768f yield outside container like in master 2012-05-04 17:40:47 -07:00
danielgrippi
511a87e830 remove unused file [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
5821a84024 validations and all that jazz [ci skip] 2012-05-04 17:38:08 -07:00
danielgrippi
31af414a04 actually use labels, html5 validations, etc [ci skip] 2012-05-04 17:38:08 -07:00
Maxwell Salzberg
e79d78302e when a user is invited from a beta user, they are also beta 2012-05-04 17:38:08 -07:00
danielgrippi
bae47a10eb use layout in our actual controller. derp. [ci skip] 2012-05-04 17:38:07 -07:00
danielgrippi
40347038f8 DG RY; mostly done, validations pending [ci skip] 2012-05-04 17:38:07 -07:00
Dennis Collinson
4253796f55 preload post on post show 2012-05-04 16:55:09 -07:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
Dennis Collinson
9f930a9ba8 change margin on sticky notes [ci skip] 2012-05-04 13:31:17 -07:00
Maxwell Salzberg
273470e6ed include url in all twitter posts 
also fix a homecontroller spec
 2012-05-03 20:07:56 -07:00
Sean Tilley
8efdc83e68 Merge pull request #3221 from DeadSuperHero/fixpostlinks 
Adding a z-index to post interactions may have been totally premature. [ci skip]
 2012-05-03 17:38:13 -07:00
danielgrippi
5118985aeb include default image for FB for timeline 2012-05-03 17:37:48 -07:00
Sean Tilley
5529b640dc Adding a z-index to post interactions may have been totally premature 2012-05-03 19:36:29 -05:00
danielgrippi
35b0f7637b fix og tags for just text 2012-05-03 16:56:11 -07:00
Sean Tilley
2d6a7b1da1 Fix show page CSS so that hashtags and links are clickable on wallpaper posts 2012-05-03 18:19:01 -05:00
danielgrippi
feb19e304e add chartbeat to mobile [ci skip] 2012-05-03 16:05:57 -07:00
danielgrippi
248ad9ad31 use the host, luke. (chartbeat wants a domain only. no protocol monkey-business) [ci skip] 2012-05-03 15:32:44 -07:00
danielgrippi
ba9bbd8777 don't use double quotes in your JS examples, chartbeat, thx. [ci skip] 2012-05-03 15:16:33 -07:00
danielgrippi
80f2638228 spelling is superb [ci skip] 2012-05-03 14:59:49 -07:00
danielgrippi
004874eb89 Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit 3b994f45e1.
 2012-05-03 14:13:24 -07:00
danielgrippi
7be7acdfd6 add chartbeat option for great success (and metrics) 2012-05-03 14:04:19 -07:00