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
Maxwell Salzberg
3a6f32e2d7
Merge pull request #3240 from pubis/update-federation-logger
...
Update federation logger
2012-05-08 10:01:00 -07:00
Jonas Lundqvist
324663e4b4
match integration pod ports
2012-05-08 12:42:12 +02:00
Jonas Lundqvist
501c4aa31e
seperate and move redis dump files so they don't mess with installed redis
2012-05-08 12:41:57 +02:00
Jonne Haß
d444a1dc56
updated 47 locale files [ci skip]
2012-05-08 12:21:45 +02:00
Steven Hancock
605b418d42
Reshares delegate nsfw to the root post
...
fixes #3120
2012-05-08 03:20:01 -07:00
Jonas Lundqvist
819bb95dbd
reorder so integration2 connects to correct redis port
2012-05-08 11:20:56 +02:00
Jonas Lundqvist
436ec039c8
remove debug_rjs reference
2012-05-08 11:20:42 +02:00
Maxwell Salzberg
00123c0ab2
update unicorn [ci skip]
2012-05-08 00:05:09 -07:00
Maxwell Salzberg
ddb7c2c9b0
gah attempt tp fix some stupid tests :/
2012-05-07 23:20:56 -07:00
Maxwell Salzberg
f7205bdf18
sad panda. selenium web driver had to update, and clearly some of the behavior around send_key changed :(
2012-05-07 19:55:42 -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
Maxwell Salzberg
3e78dd702b
be really pedantic about the stupid service selector spec
2012-05-07 19:28:14 -07:00
Maxwell Salzberg
4c7e82fec9
derp; find always returns the first element in capybara
2012-05-07 18:56:30 -07:00
Maxwell Salzberg
4b363548a2
update selenium-webdriver for ff12
2012-05-07 18:25:05 -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
Maxwell Salzberg
fcd67ebc77
fix build
2012-05-07 15:55:34 -07:00
Maxwell Salzberg
7d0f79c29b
fix pg rspec
2012-05-07 15:43:53 -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
c31413e73c
green build = happy dan
2012-05-07 14:30:30 -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
Maxwell Salzberg
13b60cc5c2
more readme tweaks [ci skip]
2012-05-07 08:28:55 -07:00
Maxwell Salzberg
ba9b0fdc2f
update readme to be slightly more clear about prereqs
2012-05-07 08:19:41 -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
3f6a862a45
Merge branch 'profile-bg'
2012-05-06 12:35:52 -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
Dennis Collinson
d47785d957
next and previous should be faster
...
unbind events on navigate, implimented for at least the single page view
bind changed to on for backbone navigating
2012-05-05 18:35:58 -07:00
Dennis Collinson
ada91e8568
next and last post don't have obnoxious blink 1/2 the time.
...
why not the rest, I don't know, time to start getting into event cleanup territory.
2012-05-05 17:45:43 -07:00
Dennis Collinson
bd6a9cfe00
next and previous now return post as json
...
clean up controller
2012-05-05 16:41:16 -07:00
Jonne Haß
79b3feec33
Merge pull request #3228 from Gallaecio/l10n-gl
...
Updated the Galician translation.
2012-05-05 14:01:06 -07:00
movilla
bca5d3ffa7
Translation "[X] Close" photo-post
2012-05-05 14:39:58 +02:00
Adrián Chaves Fernández (Gallaecio)
52964ec7c9
Updated the Galician translation.
2012-05-05 13:21:48 +02:00
Sean Tilley
96af3ed944
Merge pull request #3224 from SuperTux88/add-paragraph-margin
...
Add small margin for paragraphs [ci skip]
2012-05-05 02:12:08 -07:00
