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
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
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
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
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
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
Florian Staudacher
d328cdaa96
"twipsy" is now "tooltip", "position" must be "placement" and "select" is not a valid trigger
...
- should fix a few cukes...
2012-04-15 02:02:12 +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
Steven Hancock
acf823ff1b
bootstrap-sass fixes
...
* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
2012-04-13 17:37:38 -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
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
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
59f092c26a
added bootstrap extensions to new-templates [ci skip]
2012-04-04 13:22:44 -07:00
Maxwell Salzberg
d755f03cd0
add two more images to the assets
2012-04-04 13:12:07 -07:00
Maxwell Salzberg
d616e902c9
add favicon back
2012-04-04 13:00:25 -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
