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
Dennis Collinson
927b78b79d
kill references to ServiceUser
2012-05-14 18:47:14 -07:00
Dennis Collinson
a90968ea2d
basic experimental stream
2012-05-14 17:57:02 -07:00
Maxwell Salzberg
fe6dcffa8f
remove cubbies from sidebar, also add invite code directly to sidebar to make even clearer
2012-05-14 16:33:56 -07:00
Maxwell Salzberg
06f389231a
kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk
2012-05-14 16:25:19 -07:00
Maxwell Salzberg
5968583857
Merge pull request #3253 from SuperTux88/fix-paragraph-margin
...
fix paragraph margin for comments and posts [ci skip]
2012-05-14 15:39:25 -07:00
Maxwell Salzberg
7a6633e82a
Merge pull request #3256 from SuperTux88/invitation-mail
...
Invitation mail cleanup
2012-05-14 15:38:43 -07:00
Benjamin Neff
e15aff46a6
delete message input field
2012-05-15 00:23:54 +02:00
Maxwell Salzberg
9d20f66d2f
Merge pull request #3252 from movilla/regis_tra
...
Translation registrations/new [ci skip]
2012-05-14 15:18:52 -07:00
Maxwell Salzberg
641ead632b
Merge pull request #3254 from SuperTux88/fix-oembed-css
...
fix oembed when empty [ci skip]
2012-05-14 15:17:46 -07:00
Dennis Collinson
ca1a61825d
make post load faster from profile to show
...
using dirty preloads for now.
I like it dirty.
2012-05-14 12:14:11 -07:00
danielgrippi
7a11e9fd37
full bleed the mobile images [ci skip]
2012-05-14 11:44:41 -07:00
danielgrippi
70b28105e7
fix a little padding and background image weirdness on ios [ci skip]
2012-05-12 22:56:18 -07:00
danielgrippi
f14907e64c
more responsive stuffs [ci skip]
2012-05-12 22:29:08 -07:00
danielgrippi
31049fe1c4
get a little responsive in our css [ci skip]
2012-05-12 22:04:12 -07:00
Daniel Grippi
4fc44f137f
Merge pull request #3255 from SuperTux88/fix-aspect-dropdown
...
fix aspect dropdown on contacts page [ci skip]
2012-05-12 20:21:38 -07:00
Dennis Collinson
3b897f29d8
kill unused (i hope) participations collection
2012-05-12 18:11:21 -07:00
Dennis Collinson
ec8625746e
add counts to small frame presentercomment out entirity of post_view feature in the hopes it will stop making rake hang
2012-05-12 18:08:45 -07:00
Benjamin Neff
ea90c6caf0
remove "message" from invite-form (not used in email)
2012-05-13 02:51:54 +02:00
Dennis Collinson
f6e3c1b88b
seperate interactions from posts
...
Lazily load post interactions on show page
hella refactorz
2012-05-12 17:41:58 -07:00
Benjamin Neff
0b5f611f19
fix aspect dropdown on contacts page [ci skip]
2012-05-13 01:44:28 +02:00
Benjamin Neff
dd949fa715
fix oembed when empty [ci skip]
2012-05-13 00:29:51 +02:00
Benjamin Neff
2ff98a1001
fix paragraph margin for comments and posts
2012-05-12 23:38:28 +02:00
movilla
7538f89a95
Translation registrations/new
2012-05-12 22:18:10 +02:00
