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
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
danielgrippi
6933eeb675
show reshared people on hover [ci skip]
2012-04-25 17:23:16 -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
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
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
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
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
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
Dennis Collinson
cfa518674f
MS DC MOAR profile tweaks, show cubbies posts
2012-04-23 16:45:16 -07:00
danielgrippi
affba80524
tweak profile top layout [ci skip]
2012-04-23 16:43:32 -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
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
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
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
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
Dennis Collinson
a0ea8c8542
Update aspects dropdown to say number of selected aspects
2012-04-13 17:49:49 -07:00
Steven Hancock
021cc99492
bootstrap-sass
...
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.
I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.
I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
2012-04-11 06:16:01 -07:00
Dennis Collinson
f610cdce17
tweak composer [ci skip]
2012-04-10 12:22:36 -07:00
Dennis Collinson
b543f8a3ca
fix display of service icons [ci-skip]
2012-04-10 12:12:40 -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
danielgrippi
39d688044d
DG DC; visual fixups
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
a08711c74e
Merge pull request #3083 from DeadSuperHero/branding-pack
...
Branding Pack [ci skip]
2012-03-29 15:39:58 -07:00
Sean Tilley
19bf699b9f
Move branding assets to /images/branding for asset pipeline, update template files to point to new branding directory
2012-03-29 17:18:27 -05:00
Dennis Collinson
59f7f504e8
Wallpaper Mood
2012-03-29 15:14:09 -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
Dennis Collinson
f25effcafe
move handlebars templates for asset pipeline
2012-03-28 16:21:30 -07:00
Maxwell Salzberg
5dbfd89d93
some more fixes for the show pages
2012-03-28 13:56:52 -07:00
Maxwell Salzberg
283e730430
AHHH CRAZY. stupid branchs. WIP
2012-03-27 18:40:02 -07:00
Steven Hancock
95d5c9ca68
Fix Jasmine tests - first pass
...
193 specs | 5 failing
The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.
This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
2012-03-27 18:08:27 -07:00
Steven Hancock
1aa0b15c8c
Move Javascript to the asset pipeline
...
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
from .handlebars to .jst.hbs (this is to keep them in the same
global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
that were compiled by Jammit in the Rails 3.0 code
2012-03-27 18:07:44 -07:00
