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
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
danielgrippi
81661c883f
custom landing page logic for mobile. yay
2012-05-11 17:05:09 -07:00
danielgrippi
132bdd3bc5
change create and edit buttons on new profile; remove old press assets
2012-05-11 15:12:22 -07:00
Jonne Haß
7a6d325f64
looks like there are sometimes objects passed into post presenter that respond to root while root is nil
2012-05-11 14:23:05 +02:00
danielgrippi
7423dd095f
landing fixes for moz [ci skip]
2012-05-11 02:19:46 -07:00
danielgrippi
4b8cd8eb23
whoopsies on landing [ci skip]
2012-05-11 01:30:15 -07:00
danielgrippi
608a15faf4
the landing page.
2012-05-11 01:06:51 -07:00
danielgrippi
a3ca176d74
new getting started page [ci skip]
2012-05-10 20:43:00 -07:00
Dennis Collinson
9b9a64ffd0
fix reshares in interaction presenternavigate replace states on next or previous so back and forward work
...
default user image
2012-05-10 15:28:27 -07:00
Dennis Collinson
3326bc5bb4
present reshares
2012-05-10 15:16:05 -07:00
Dennis Collinson
51b1ade3bc
DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages)
2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7
Refactor Post Presenter
...
and comment presenter
2012-05-10 12:24:21 -07:00
Maxwell Salzberg
eaedfc9827
create a new publisher using the new composer. only for beta users
2012-05-09 16:55:33 -07:00
danielgrippi
a46e16cbcf
delegate frame_name in reshares
2012-05-09 16:37:28 -07:00
danielgrippi
1791d6b1b8
defer the optimistic loading of profile wallpaper and title (at least wait until the call stack is emptied) [ci skip]
2012-05-09 00:46:40 -07:00
danielgrippi
b641cddb65
eagerly call isotope before images are loaded; optimistically assume wallpaper is in the cache until we actually fix the issue [ci skip]
2012-05-09 00:36:14 -07:00
danielgrippi
62829aee85
remove obnoxious box-shadow transition on hover; transition on transform [ci skip]
2012-05-09 00:24:28 -07:00
Dennis Collinson
93afe6d63c
rescue update services on login
...
was failing in development
2012-05-08 20:38:45 -07:00
Daniel Grippi
be43806ef9
Merge pull request #3245 from SuperTux88/fix-publisher-for-beta
...
Fix new publisher if user is beta
2012-05-08 18:42:55 -07:00
Benjamin Neff
1bc1dc4334
Fix new publisher if user is beta
2012-05-09 03:33:50 +02:00
danielgrippi
f053b71c87
add title to service icons. yay. [ci skip]
2012-05-08 18:28:31 -07:00
danielgrippi
0ec364e44c
DG MS; popup on services, inlined in the composer
2012-05-08 18:09:33 -07:00
Maxwell Salzberg
c8f3bb3e9b
small typo in notifier.rb
2012-05-08 10:42:24 -07:00
Maxwell Salzberg
1735a17e83
Merge pull request #3241 from stevenh512/nsfw-reshares
...
Reshares delegate nsfw to the root post
2012-05-08 10:06:03 -07:00
Maxwell Salzberg
ab981d4339
Merge pull request #3225 from stevenh512/refactor-emails
...
Use Markerb for emails
2012-05-08 10:02:13 -07:00
Steven Hancock
605b418d42
Reshares delegate nsfw to the root post
...
fixes #3120
2012-05-08 03:20:01 -07:00
Maxwell Salzberg
b375182e0c
let line breaks work but don't push everything down on the stream [ci skip]
2012-05-07 19:53:47 -07:00
Steven Hancock
56db268613
Use markerb for emails
...
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB
This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
2012-05-07 19:41:30 -07:00
Dennis Collinson
d1d99d5dd4
Jamie Cai DC refactor isOwnProfile, fix tests
2012-05-07 17:53:37 -07:00
danielgrippi
cb2c972cee
Merge branch 'master' of github.com:diaspora/diaspora
2012-05-07 16:41:29 -07:00
Dennis Collinson
1c135b61fd
Jamie Cai DC message in profile when user has no posts
2012-05-07 15:56:30 -07:00
danielgrippi
34819b4128
temp button instead of textbox for beta-limbo users
2012-05-07 15:40:13 -07:00
danielgrippi
6e16a748e7
unfix css styling in one place; fix it in another [ci skip]
2012-05-07 15:13:27 -07:00
danielgrippi
f3a51615af
min-height instead of height to fix background issues [ci skip]
2012-05-07 13:29:56 -07:00
danielgrippi
730886c082
MS DG; fix some styling for empty profile state
2012-05-07 12:15:43 -07:00
danielgrippi
01d5c0473a
DG MS; don't redirect to legacy getting started if you're a beta user
2012-05-07 12:05:36 -07:00
danielgrippi
9bbea232c4
don't fetch the composer if not on your own profile page
2012-05-07 01:18:06 -07:00
danielgrippi
7d1f73261f
use modulate instead of -brightness-contrast for now, as the cedar stack has an outdated version of mogrify [ci skip]
2012-05-06 13:57:35 -07:00
danielgrippi
92230383a7
added controller test; put wallpaper into separate wallpaper/ directory
2012-05-06 12:35:11 -07:00
danielgrippi
46d4a957fe
don't use storage :file in wallpaper_uploader [ci skip]
2012-05-06 12:35:11 -07:00
danielgrippi
6010579c39
md5 the user's diaspora id for wallpaper image filename; clean up photo_form.js a little (thx max)
2012-05-06 12:35:11 -07:00
danielgrippi
56913ffb80
upload wallpaper for great success.
2012-05-06 12:35:11 -07:00
danielgrippi
91ffe00de2
apple-style drop shadows (blur the crap out of them); isotope doesn't overflow: hidden; anymore (no shadow cutoff) [ci skip]
2012-05-06 12:35:10 -07:00
danielgrippi
b5fbefad4b
this changes profile background colors to be dark, and sets up the groundwork for uploading user-selected background images for their profiles. all the styling is in place; what remains is creating a new image uploader and (possibly) a new controller action.
...
for information on what command to use to darken the background image that's uploaded, see line 11 in `_profile.scss`. the current image tests in the public folder are results of the convert command noted.
2012-05-06 12:35:10 -07:00
Maxwell Salzberg
2f618f6dde
Merge pull request #3230 from movilla/close-amparito
...
Translation "[X] Close" photo-post [ci skip]
2012-05-06 10:09:04 -07:00
danielgrippi
e5bb4216f9
clean up dom on post viewer; use circles instead of weird semi-rounded boxes to be consistent
2012-05-05 19:55:38 -07:00
