danielgrippi
120c6b46e0
MS; Fix fake following, as we took it out so I nuked the tests
2012-05-22 19:04:04 -07:00
danielgrippi
c6b8d75313
DG MS; cool header with background in new stream
2012-05-22 19:00:22 -07:00
danielgrippi
0c7492b94d
DG MS; add hatched texture to new stream [ci skip]
2012-05-22 15:58:34 -07:00
danielgrippi
20360b5cc5
DG MS; added interactions & permalink in the new stream [ci skip]
2012-05-22 15:48:23 -07:00
danielgrippi
2e52def47a
DG MS; background colors for great justice (on the stream)
2012-05-22 15:47:09 -07:00
Dennis Collinson
1c342282b0
fixing event passing
2012-05-22 15:11:21 -07:00
danielgrippi
abc4843273
DG MS; got scroll working [ci skip]
2012-05-22 14:35:05 -07:00
danielgrippi
83fec811cc
DG MS; author attribution in the stream; cleaned up some *new* stream styling
2012-05-22 13:50:19 -07:00
Dennis Collinson
9f1d0b64b4
killing stream_object_view
2012-05-22 13:43:21 -07:00
Dennis Collinson
36ef010ed9
DG DC MS; stream has one interactions div
2012-05-22 12:38:48 -07:00
Jonne Haß
5c534521cc
top level email is a noun, not a verb [ci skip]
2012-05-22 10:26:21 +02:00
danielgrippi
64a73fb665
new post types. remove old ones. yeah.
2012-05-21 18:45:01 -07:00
Dennis Collinson
2059fea656
put stream.haml back as it is still used in mobile
2012-05-21 17:43:49 -07:00
Dennis Collinson
17dc5eab18
can't remove these yet, cause of mobile
...
Revert "do you like old views, because I don't.Kill the old stream views"
This reverts commit 370d8b0482
2012-05-21 17:40:23 -07:00
Dennis Collinson
370d8b0482
do you like old views, because I don't.Kill the old stream views
2012-05-21 17:20:08 -07:00
Dennis Collinson
10201f2e40
more work on new stream interactions, hella refactorz.
2012-05-21 17:15:10 -07:00
Dennis Collinson
fe0156a18b
cuking out new stream, refactors.
2012-05-21 15:14:23 -07:00
danielgrippi
481160bdcb
move canvas-frame functionality into js sub-class for great justice
2012-05-21 12:58:25 -07:00
danielgrippi
777c037e16
kill rich-media type with fire
2012-05-21 12:33:28 -07:00
danielgrippi
0960a090fa
actually use the computed image height; remove unused presenter
2012-05-21 11:09:42 -07:00
danielgrippi
ff42f250ca
make a small-frame template folder; we're not going to want the same dom structure moving forward...
2012-05-21 11:09:42 -07:00
Florian Staudacher
d815cf5d82
take acts-as-taggable-on gem from git, solve tag case-sensitivity
2012-05-21 17:20:04 +02:00
Alex Connor
fe984eb426
#3287 using reorder instead of order for newer, older
2012-05-20 18:21:34 -05:00
Maxwell Salzberg
bde23f8ab8
use image_tag for asset_pipeline goodness
2012-05-19 18:19:50 -07:00
danielgrippi
72f718c8c3
new login page. kept the old one for safe keeping.
2012-05-19 11:10:17 -07:00
Steven Hancock
125b013c10
AppsController no longer exists
...
Remove the AppsController check from the next_page_path helper, since
AppsController no longer exists.
fixes #3280
I'd like to write a helper spec for this, but it'll probably require
some stubbing/mocking and I'm a little too tired to deal with that at
the moment.. so for now let's just fix the problem. :)
2012-05-18 23:42:29 -07:00
danielgrippi
f4c06c8f88
add rounded buttons to the composer flow; slay multi-photo option
2012-05-18 19:46:51 -07:00
Maxwell Salzberg
593fa0ed8e
stupid hack for photos
2012-05-17 21:49:04 -07:00
danielgrippi
62ba75ad1b
DG DC; Move stuff to second page of framer
2012-05-17 19:02:58 -07:00
Maxwell Salzberg
133c9ee0c3
remove deprecation warnings about the template handler in rails 3.2
2012-05-17 18:23:39 -07:00
Steven Hancock
2ae366ad19
Render invitation email without a layout
...
Ideally, we'll probably want to add a layout for this email at some point,
but this simplifies it to the bare minimum and gets rid of the "click here
to change your notification settings" link.
fixes #3270
2012-05-17 17:51:20 -07:00
danielgrippi
27aff7fb1e
DG DC; GREEEEEEEEEN
2012-05-17 17:01:31 -07:00
Florian Staudacher
788f328a77
resolve reshare root posts to the first one
2012-05-18 01:45:41 +02:00
Dennis Collinson
c66bd9d6d8
fix posting with services, fix cuke
2012-05-17 15:32:35 -07:00
Dennis Collinson
00f1adc8b2
Going back to the composer from the framer is happy via button
2012-05-17 15:32:35 -07:00
Maxwell Salzberg
f24b1f1550
remove a bunch of unused assets [ci skip]
2012-05-17 15:14:51 -07:00
Maxwell Salzberg
471ce309ea
kill your darlings; remove diaspora_client with fire
2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5
wip
2012-05-17 14:55:22 -07:00
danielgrippi
c8aa67360b
backfill some tests; jasmine green
2012-05-17 13:31:40 -07:00
danielgrippi
e48d57b19b
Revert "DC fix back button to profile with this.deferred reference"
...
This reverts commit e5206f3429
2012-05-17 12:05:45 -07:00
danielgrippi
e5206f3429
DC fix back button to profile with this.deferred reference
2012-05-17 11:47:17 -07:00
danielgrippi
ed6785d7cb
don't use an iframe for the composer anymore. yayyyyy
2012-05-16 18:55:25 -07:00
Maxwell Salzberg
a6758c0832
Merge pull request #3264 from movilla/share_amparito
...
Translation invitation Share this link /stream [ci skip]
2012-05-16 17:48:14 -07:00
Maxwell Salzberg
455dc34eae
remove hotlink controller, just rewrite those landing assets
2012-05-16 15:02:59 -07:00
danielgrippi
08fddf7422
raise on hotlinking [ci skip]
2012-05-16 14:41:09 -07:00
movilla
d394272e5d
Translation invitation Share this link /stream
2012-05-16 00:56:34 +02:00
Movilla
4fac6c9619
Rebase Add translation app/views/admins/stats.html.haml => Admin Panel
2012-05-15 22:38:48 +02:00
Movilla
a3daa00a41
Rebase Add translation app/views/admins/stats.html.haml for Admin Panel
2012-05-15 22:27:08 +02:00
Maxwell Salzberg
ab2e740ca2
upgrade to Rails 3.2.3
2012-05-14 21:53:16 -07:00
Dennis Collinson
6282450418
killing rich media styling, WE'LL DO IT LIVE
2012-05-14 19:13:33 -07:00
