danielgrippi
44f28b8220
don't randomly fav things; fix wallpaper text on profile [ci skip]
2012-04-24 14:21:18 -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
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
dbe3b48aee
now you can click on an entire post to favorite / unfav it. yay. [ci skip]
2012-04-23 23:04:53 -07:00
Dennis Collinson
40c04234bd
navigate to experimental profile on successful post
2012-04-23 18:08:02 -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
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
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
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
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
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
Florian Staudacher
fe7de0544d
forgot to rename that ... ( fixes #3169 )
2012-04-19 20:24:11 +02: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
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
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
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
Dennis Collinson
a0ea8c8542
Update aspects dropdown to say number of selected aspects
2012-04-13 17:49:49 -07:00
Maxwell Salzberg
c4b36a179e
Merge pull request #3138 from stevenh512/bootstrap-sass
...
bootstrap-sass (w00t)
2012-04-13 17:44:08 -07:00
Dennis Collinson
9e50d0efb6
Newspaper theme selected by default, template picker object
2012-04-12 15:21:07 -07:00
Dennis Collinson
c1f2bbac88
Wallpaper frame selected when post has one photo
2012-04-12 11:56:27 -07:00
Dennis Collinson
d767410e6d
mentions are clickable in framer
2012-04-11 18:34:12 -07:00
Dennis Collinson
20da08408f
can mention in new composer
2012-04-11 17:07:53 -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
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
Florian Staudacher
9c7103be1d
don't set publisher height on focus (already done in css), fixes #3109
2012-04-06 21:21:35 +02:00
Maxwell Salzberg
9c9562d0fd
fix http urls with 3 slashes
2012-04-04 19:08:36 -07:00
danielgrippi
39d688044d
DG DC; visual fixups
2012-04-04 18:59:19 -07:00
danielgrippi
6098890783
redirect to post show on create
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
danielgrippi
3bc3f13651
upgrade backbone, fix tests
...
some cukes may be failing non deterministically, I think, do we bump the cuke timeout?
2012-04-03 16:31:52 -07:00
danielgrippi
e156947d0b
fix jasmine specs
2012-04-02 18:17:55 -07:00
Daniel Grippi
6f75fb4173
Merge pull request #3088 from Raven24/fix-bmm-2
...
show an error message when creating a comment failed [ci skip]
2012-04-01 18:24:54 -07:00
Daniel Grippi
a45eed13d5
Merge pull request #3086 from Raven24/fix-publisher-height
...
reset publisher css height when "cleared" [ci skip]
2012-04-01 18:24:00 -07:00
Florian Staudacher
ef292c40eb
create a dummy-participation object, that the post appeas followed by self
2012-04-01 22:34:54 +02:00
Florian Staudacher
e6ebf4ad62
show error message when creating a comment failed
...
(e.g. when the post got deleted in the meantime)
bug mash 5.2
2012-03-30 19:42:14 +02:00
Florian Staudacher
859c0b93b5
reset publisher css height when "cleared" ( fixes #2867 )
2012-03-30 16:09:41 +02:00
Raven24
5ad38a5372
damn my brain!
2012-03-30 01:50:21 +03:00
Maxwell Salzberg
fe1c0d34d5
Merge pull request #3084 from Raven24/non-ascii-begone
...
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-29 15:35:48 -07:00
Florian Staudacher
ae3e225e28
finally (hopefully) fix non-ascii urls + new & old tests
2012-03-30 00:29:34 +02:00
Dennis Collinson
59f7f504e8
Wallpaper Mood
2012-03-29 15:14:09 -07:00
Dennis Collinson
6488cd004b
Disable Mentions in trumpeter to fix cukechange assertion of mood
2012-03-29 12:16:59 -07:00
Dennis Collinson
755ff52452
turn asset pipeline debugging off
...
there was a collision with the aspects-dropdown view in the new
publisher, also
it takes too much time with it on
2012-03-28 19:01:44 -07:00
Dennis Collinson
875ce68556
fixes for jasmine
2012-03-28 16:32:24 -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
Maxwell Salzberg
0ce0f3ca74
NOTE: DO NOT PULL THIS ON PRODUCTION TILL FURTHER NOTICE asset pipeline
...
WIP Merge branch 'rebased-asset-pipeline'
2012-03-28 14:52:55 -07:00
Maxwell Salzberg
283e730430
AHHH CRAZY. stupid branchs. WIP
2012-03-27 18:40:02 -07:00
Maxwell Salzberg
e1bf6441fe
update new js files
2012-03-27 18:26:46 -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
