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

5926 commits

Author SHA1 Message Date
Kaushik Thirthappa
a1f25a475d optimizied code for destroy action for tags that a user is following. 2012-04-28 15:36:57 +05:30
danielgrippi
8d08f2604b added a follow button on others' profile pages [ci skip] 2012-04-27 20:59:44 -07:00
danielgrippi
92f72bdcbe remove duplicated home button on post show page [ci skip] 2012-04-27 20:48:36 -07: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
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
Maxwell Salzberg
6b115a7d22 update backgound-size declaration for skinny images 2012-04-27 16:19:13 -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
7fafb0e3b2 DG RY; publisher css tweaks 2012-04-27 14:58:07 -07:00
Maxwell Salzberg
b138c91466 fix cucumber 2012-04-27 14:55:44 -07:00
Maxwell Salzberg
0f15c3e0b0 add z-index to home button, and some small whitespace junk [ci skip] 2012-04-26 21:43:21 -07:00
Maxwell Salzberg
7309114136 adding magic to buttons on framer [ci skip] 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
fb4ad72378 composer is much cooler 2012-04-26 20:30:17 -07:00
Maxwell Salzberg
c3ef944878 push publisher form box up [ci skip] 2012-04-26 20:30:17 -07:00
danielgrippi
c413a494d7 retina-ify icons; fix 404 scrolling issue; serif -> san-serif in some style [ci skip] 2012-04-26 20:25:25 -07:00
danielgrippi
e55b305bca better 404 page. with kittens. 2012-04-26 19:52:41 -07:00
danielgrippi
c9d0879d3d fav by clicking on something yeahhhh 2012-04-26 18:39:43 -07:00
Maxwell Salzberg
387e188905 make the edit message make sense [ci skip] 2012-04-26 18:02:11 -07:00
danielgrippi
193644b5c1 Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit 6f951ac678.
 2012-04-26 17:57:54 -07:00
danielgrippi
f08a539c23 clicking the pin icon on the profile takes you to a map [ci skip] 2012-04-26 17:53:36 -07:00
Maxwell Salzberg
c6da8e74ad background-size for fun and profit [ci skip] 2012-04-26 16:45:46 -07:00
Maxwell Salzberg
851282cbe4 adding home button to single post view 2012-04-26 16:45:46 -07:00
Maxwell Salzberg
6f951ac678 adding custom landing page for heroku 2012-04-26 16:45:46 -07:00
danielgrippi
2873cedd30 put dividers inside conditionals on profile-info [ci skip] 2012-04-26 16:09:26 -07:00
Maxwell Salzberg
2b3bc5a0f0 fix profile json birthday response with some tests. 2012-04-26 16:00:23 -07:00
Florian Staudacher
0dee8aae36 [reshares] display flash message instead of just appending it to the stream (fixes #2094) 2012-04-27 00:57:20 +02:00
danielgrippi
0b3926d810 fixed / removed some assets [ci skip] 2012-04-26 15:23:51 -07:00
danielgrippi
6d866fa49d Revert "adding custom landing page for heroku" 
This reverts commit 2c9d84607a.
 2012-04-26 15:08:07 -07:00
danielgrippi
152101484c updated some assets, THX RO. [ci skip] 2012-04-26 15:02:59 -07:00
Maxwell Salzberg
fe87b38bf2 use birthday as text. 2012-04-26 15:01:43 -07:00
Maxwell Salzberg
6d2cd31e73 disable framer button when you click it the first time. 2012-04-26 15:00:55 -07:00
danielgrippi
d3b874b020 add basic profile info to profile; remove random console.logs [ci skip] 2012-04-26 14:52:48 -07:00
danielgrippi
2c9d84607a adding custom landing page for heroku 2012-04-26 13:57:50 -07:00
Maxwell Salzberg
b387f89164 make composer not clip in both views [ci skip] 2012-04-26 12:46:04 -07:00
danielgrippi
164b1d716a dont hardcode the url, yo 2012-04-26 12:46:04 -07:00
danielgrippi
828cc919d0 DG MS; proof of concept 2012-04-26 12:46:03 -07:00
danielgrippi
43518a9447 added home button nav on profile page [ci skip] 2012-04-26 12:29:22 -07:00
Maxwell Salzberg
adebdcbd2a fix an incorrect size declaration in a mixing [ci skip] 2012-04-25 23:08:32 -07:00
Maxwell Salzberg
e9217931ce only set the title when we have something nice to say 2012-04-25 23:08:11 -07:00
Maxwell Salzberg
87464b84d0 please do not set !important on a global link rule kthxbai 2012-04-25 23:07:56 -07:00
Maxwell Salzberg
3bce0be47c simple hack to make bigtexts posts less sadface [ci skip] 2012-04-25 18:10:43 -07:00
danielgrippi
6933eeb675 show reshared people on hover [ci skip] 2012-04-25 17:23:16 -07:00
Maxwell Salzberg
7c9aaa0a68 fix some stray margin [ci skip] 2012-04-25 17:06:31 -07:00
danielgrippi
04abaf3523 don't show info in edit mode [ci skip] 2012-04-25 17:03:05 -07:00
danielgrippi
4e14dd2d01 info now comes from above; slightly fixed typography on single post view 2012-04-25 16:48:06 -07:00
Dennis Collinson
76ad02f2a5 hella spinners 2012-04-25 14:13:16 -07:00
Maxwell Salzberg
70fb426487 Merge pull request #3184 from movilla/amparito_users 
Add translation app/views/admins/user_search.html.haml - Admin Panel
 2012-04-25 10:28:39 -07:00
Dennis Collinson
2cbf383fbb only redirect on html requests 2012-04-24 21:01:19 -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
b2ab11944e changed play button for videos [ci skip] 2012-04-24 19:54:09 -07:00
danielgrippi
c82e339640 follow button in [ci skip] 2012-04-24 19:40:33 -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
ec096f8131 remove some opacity stuff; fix isotope pagination [ci skip] 2012-04-24 18:55:33 -07:00
Dennis Collinson
340411f17c MS DC; admins are now always redirected to new profile 2012-04-24 18:39:09 -07:00
danielgrippi
87fb922804 remove opacity and stuff from isotope [ci skip] 2012-04-24 18:05:40 -07:00
danielgrippi
a1907428e1 properly parse out gif dimensions. durrrrr. [ci skip] 2012-04-24 17:34:50 -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
44f28b8220 don't randomly fav things; fix wallpaper text on profile [ci skip] 2012-04-24 14:21:18 -07:00
danielgrippi
a659b4daf8 forgot about one other class case for font styling [ci skip] 2012-04-24 14:13:32 -07:00
danielgrippi
311afa7dc9 i guess my captions commit got lost somewhere [ci skip] 2012-04-24 13:56:37 -07:00
Dennis Collinson
6ac1c5bc21 images aren't darkened in wallpaper if they don't have text 2012-04-24 13:27:27 -07:00
Florian Staudacher
0dcb0f6446 attach handlers to a instead of img (rel #2950) 2012-04-24 22:08:10 +02:00
danielgrippi
931dd2621b fixed captions and stuff [ci skip] 2012-04-24 12:45:00 -07:00
danielgrippi
bff9d2d370 small css padding tweaks [ci skip] 2012-04-24 12:45:00 -07:00
danielgrippi
fe72c59ff7 make stars closer to the edges of posts [ci skip] 2012-04-24 01:04:49 -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
Maxwell Salzberg
c667dac248 tweak single post css 
I kinda just fished thru @deadsuperhero's posts and try to make them
look better
 2012-04-23 23:57:02 -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
danielgrippi
4be6f196cd fix roboto; break long urls and stuff in sticky notes [ci skip] 2012-04-23 22:31:41 -07:00
Maxwell Salzberg
bf110f0818 make the default font size 2em [ci skip] 2012-04-23 19:18:39 -07:00
danielgrippi
3704170416 I <3 ROBOTO. [ci skip] 2012-04-23 19:17:31 -07:00
Dennis Collinson
6daafbd5a8 better stylings for markdown 2012-04-23 18:57:58 -07:00
danielgrippi
4bd1caa7fd noteworthy typeface for big text [ci skip] 2012-04-23 18:51:59 -07:00
Dennis Collinson
43ed6dde46 fix width for markdown images [ci skip] 2012-04-23 18:19:34 -07:00
Dennis Collinson
40c04234bd navigate to experimental profile on successful post 2012-04-23 18:08:02 -07:00
Dennis Collinson
044d03c12c MS DC fix you tube videos on screen. 2012-04-23 18:08:02 -07:00
danielgrippi
8390756ddd pop up stats on hover instead of always showing them [ci skip] 2012-04-23 17:57:04 -07:00
danielgrippi
51a6a3c8a3 added stars [ci skip] 2012-04-23 17:43:32 -07:00
Dennis Collinson
d64eb529d2 MS DC; text now overlays for wallpaper; ALSO. really sorry @danielgrippis stuff does not work in firefox. or safari. 
or konqueror. we will talk to him about it later
 2012-04-23 17:30:23 -07:00
movilla
cc329594c5 Add translation app/views/admins/user_search.html.haml - Admin Panel 2012-04-24 02:05:13 +02:00
Dennis Collinson
88a17474f7 MS DC kill dead code in small Frame 2012-04-23 16:52:09 -07:00
Dennis Collinson
cfa518674f MS DC MOAR profile tweaks, show cubbies posts 2012-04-23 16:45:16 -07:00
Dennis Collinson
0e8fd604e9 DC MS reworking newprofile grid WHOA 2012-04-23 16:44:39 -07:00
danielgrippi
affba80524 tweak profile top layout [ci skip] 2012-04-23 16:43:32 -07:00
Dennis Collinson
e8cfe01c8a reLayouts when something is favorited, whoa 2012-04-23 12:35:13 -07:00
Maxwell Salzberg
85f2f13d79 more color [ci skip] 2012-04-23 12:23:10 -07:00
Maxwell Salzberg
bcdd03b4e9 markdownify profile in new profile view 2012-04-23 11:42:49 -07:00
Florian Staudacher
9562adaa10 put date formatting in a mixin 2012-04-23 14:34:20 +02:00
danielgrippi
f6a9fad9ad make line height a bit better on yellow notes 2012-04-22 18:36:46 -07:00
danielgrippi
3eda2ca3a6 fix some pixels [ci skip] 2012-04-22 17:36:41 -07:00
danielgrippi
98e614bbe8 specifiy masonry width [ci skip] 2012-04-22 17:05:30 -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
b6fc97a2a4 added styling & color to text posts [ci skip] 2012-04-22 16:21:22 -07:00
danielgrippi
85ab08035e added stats on posts [ci skip] 2012-04-22 14:21:26 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
danielgrippi
494ba1f9b8 images that are single pane fill up the whole frame [ci skip] 2012-04-21 23:20:19 -07:00
danielgrippi
d38582c5de youtube in canvas [ci skip] 2012-04-21 23:07:44 -07:00
danielgrippi
265e14fb13 remove some old small frame declarations [ci skip] 2012-04-21 22:25:37 -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
0279874e32 markdownify small frames, css for new profile. 2012-04-21 16:05:24 -07:00
Dennis Collinson
ca33070b9e loader is background image of span 
fix tests
 2012-04-21 15:21:52 -07:00
danielgrippi
e2adb8d26f squares; how do they work 2012-04-21 13:12:57 -07:00
danielgrippi
b4ca14ade4 DG MS; clicking a post in the profile goes to the show page. 2012-04-21 13:12:57 -07:00
danielgrippi
aa4c554177 DG MS; added photos and more styling to the canvas view. 2012-04-21 13:12:57 -07:00
Dennis Collinson
3130bbad97 render template currently needs to be overridden WHOA junglist massiv 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
danielgrippi
6d9dd1f4d3 skeleton in place. 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
b4d50510f9 sorry aobut that [ci skip] 2012-04-20 10:40:22 -07:00
Movilla
7b203e3636 Better fix issue #3134 2012-04-20 16:07:31 +02:00
Maxwell Salzberg
5f839aa26f include modernizer in the mobile group so it works 2012-04-20 00:00:23 -07:00
Maxwell Salzberg
56312a3148 fix mobile modernizer with asset pipeline 2012-04-19 22:45:34 -07:00
Maxwell Salzberg
bfbae50e5a update a few things for the asset pipeline, and fix a couple of other mobile bugs 2012-04-19 21:52:44 -07:00
Maxwell Salzberg
a9b5df8dc5 Merge branch '3162-second-attempt' of https://github.com/wubwubwubcr3w/diaspora into wubwubwubcr3w-3162-second-attempt 2012-04-19 21:20:36 -07:00
Maxwell Salzberg
397b89c21a small improvements to open graph stuff [ci skip] 2012-04-19 21:03:06 -07:00
Maxwell Salzberg
cdef049529 include a default image in the og:image [ci skip] 2012-04-19 20:33:11 -07:00
Maxwell Salzberg
a008aaeba8 make the embed tags have a bit more length 2012-04-19 20:20:40 -07:00
Maxwell Salzberg
8b50f80875 be pedantic in posts show as maybe certain crawlers are being greedy as to what formats they can accept 2012-04-19 20:07:14 -07:00
Maxwell Salzberg
307ee15884 hella open graph tags 
added some basic open graph tags to the posts#show page.
 2012-04-19 17:40:13 -07:00
Dennis Collinson
7253f190b5 rename css selector to MAGIC 2012-04-19 14:18:55 -07:00
Dennis Collinson
f7d320b622 MS DG; checkboxes are togglable, with tested css magick 2012-04-19 14:05:55 -07:00
wubwubwubcr3w
ebd367c5a1 also readd mbp-respond.min.js 2012-04-19 22:00:15 +02:00
wubwubwubcr3w
70ba2651c3 second attempt on readding modernizr-custom.js 2012-04-19 20:37:42 +02:00
Florian Staudacher
fe7de0544d forgot to rename that ... (fixes #3169) 2012-04-19 20:24:11 +02:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Florian Staudacher
9f1713b8f9 bind to new eventname [ci skip] 2012-04-19 14:06:09 +02: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
d8c42fde67 remove app.models.Photos 2012-04-18 20:21:16 +02: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
Florian Staudacher
4385027443 small js fixes 
closes #3106 - hardening url handling,
fixes #2725 - backport from upstream
 2012-04-18 19:59:34 +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
b10aedb615 update the iframe route, fix a small styleing thing in newspaper style for iframe view 2012-04-17 22:43:47 -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
Maxwell Salzberg
1a7ec495c9 Merge pull request #3136 from movilla/Auto_fix 
Issue #3134:Problem with translation in authorizations/new.html.haml
 2012-04-17 13:52:29 -07:00
Jonne Haß
b99e77d8ce Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-04-16 23:59:03 +02: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
Maxwell Salzberg
3586413b18 sorry :( Revert "adding custom landing page for heroku" [ci skip] 
This reverts commit f7d1f0d9b9.
 2012-04-15 17:11:13 -07:00