Maxwell Salzberg
|
a1f39398be
|
Merge pull request #2902 from JMSilla/master
Fix atom feed bug (bug mash 7) [ci skip]
|
2012-02-25 16:47:13 -08:00 |
|
Jonne Haß
|
0604a36a15
|
updated 161 locale files [ci skip]
|
2012-02-26 01:07:13 +01:00 |
|
JMSilla
|
8178e0712c
|
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
|
2012-02-25 22:24:43 +00:00 |
|
Dennis Collective
|
81141958a3
|
Merge pull request #2931 from diasporg/33fada3
fix facebook finder [ci-skip]
|
2012-02-24 19:20:03 -08:00 |
|
David Morley
|
33fada305c
|
put all the elements back on the page and make facebook inviter usable again
|
2012-02-24 20:46:27 -06:00 |
|
Maxwell Salzberg
|
ead0b14a48
|
Merge pull request #2916 from Raven24/photos-lightbox
make lightbox work for photos page (+tests)
|
2012-02-24 10:46:01 -08:00 |
|
Maxwell Salzberg
|
0db2bd9e40
|
Merge pull request #2908 from diasporg/adminclean
clean up admin page [ci skip]
|
2012-02-24 10:44:52 -08:00 |
|
Maxwell Salzberg
|
b287cfa714
|
Merge pull request #2927 from Raven24/fix-2922
bookmarklet - escape all passed params in js [ci skip]
|
2012-02-24 10:43:47 -08:00 |
|
Florian Staudacher
|
663a5a0e7c
|
escape all passed params in js - fixes #2922
|
2012-02-24 14:15:08 +01:00 |
|
Dennis Collective
|
2e3d70f5ae
|
Merge pull request #2921 from diasp/2557-deal-with-long-usernames
Deal with long usernames
|
2012-02-23 15:52:05 -08:00 |
|
Diaspora Europe
|
019b68281e
|
handle text-overflow for long usernames #2557
|
2012-02-23 12:21:01 +01:00 |
|
Florian Staudacher
|
412853bfcc
|
make lightbox work for photos page (+tests)
|
2012-02-22 14:45:43 +01:00 |
|
Jonne Haß
|
0430d940f1
|
git urls are still better than http ones :P, close #2915
|
2012-02-22 12:29:15 +01:00 |
|
danielgrippi
|
d54ff5f341
|
MS; DG added test for unauthenticated post viewing
|
2012-02-21 15:23:08 -08:00 |
|
Maxwell Salzberg
|
aa3ffbea7f
|
log to the logger, not to the rails module
|
2012-02-21 13:27:17 -08:00 |
|
Maxwell Salzberg
|
d0162e05f2
|
add super slow worker [ci skip]
|
2012-02-21 12:40:26 -08:00 |
|
Jonne Haß
|
14d7348a0d
|
updates locales and fixed needed empty timeago translations
|
2012-02-20 14:24:30 +01:00 |
|
David Morley
|
a63bcd0080
|
make popular tags human readable
|
2012-02-19 21:28:12 -06:00 |
|
Jonne Haß
|
fd085c6653
|
updated 129 locale files [ci skip]
|
2012-02-20 01:26:16 +01:00 |
|
David Morley
|
c41923081a
|
resque with header
|
2012-02-19 15:50:12 -06:00 |
|
David Morley
|
6e4844629a
|
admin cleanup
|
2012-02-19 15:29:07 -06:00 |
|
Maxwell Salzberg
|
0a49cfd866
|
Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3
Go to root page if deleting post from the show page
|
2012-02-18 17:14:42 -08:00 |
|
Maxwell Salzberg
|
7aba1ce1f7
|
Merge branch 'Raven24-user-photos'
Conflicts:
public/javascripts/app/router.js
public/stylesheets/sass/application.sass
|
2012-02-18 17:12:14 -08:00 |
|
Joe Bivins
|
76c11b8d37
|
Add test case for when a user removes their own post from the show page.
Adjust redirection logic.
|
2012-02-18 19:47:25 -05:00 |
|
Maxwell Salzberg
|
4d634cae24
|
added a failing feature for dmorleys fix
|
2012-02-18 16:28:05 -08:00 |
|
David Morley
|
b5bb66c66d
|
fix 2898 - public profile unauthed user
|
2012-02-18 16:28:05 -08:00 |
|
Jonne Haß
|
c1463c63a4
|
updated 20 locale files [ci skip]
|
2012-02-18 16:28:05 -08:00 |
|
Maxwell Salzberg
|
90452744fc
|
fix logging to work great with non-persisted objects
|
2012-02-18 16:28:05 -08:00 |
|
Maxwell Salzberg
|
28504f09bb
|
federation logger now in place.
|
2012-02-18 16:28:04 -08:00 |
|
Maxwell Salzberg
|
1e170291e5
|
add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing
|
2012-02-18 16:28:04 -08:00 |
|
Maxwell Salzberg
|
adcd47ab27
|
remove pending spec, which was pending because we dont use that feature anymore
|
2012-02-18 16:28:04 -08:00 |
|
Jonne Haß
|
22d5222db0
|
updated 108 locale files [ci skip]
|
2012-02-18 16:28:04 -08:00 |
|
Jordi Mallach
|
0e747b96a8
|
Update Catalan translation to e16a20e.
|
2012-02-18 16:28:03 -08:00 |
|
Jonne Haß
|
738c856b10
|
updated 19 locale files [ci skip]
|
2012-02-18 16:28:03 -08:00 |
|
Maxwell Salzberg
|
d7f56e556b
|
use the user presenter, luke
|
2012-02-18 16:28:03 -08:00 |
|
Maxwell Salzberg
|
d1301dc267
|
make the step pending so travis doesnt say we are failing :/
|
2012-02-18 16:28:03 -08:00 |
|
danielgrippi
|
5d2084869a
|
correctly reference intergration servers in application.yml.example [ci skip]
|
2012-02-18 16:28:03 -08:00 |
|
danielgrippi
|
be363b98e5
|
DG MS; move logic out of layout into LayoutsHelper.
|
2012-02-18 16:28:03 -08:00 |
|
danielgrippi
|
7ca423b3f2
|
DG MS; don't initialize a stream on post pages.
|
2012-02-18 16:28:02 -08:00 |
|
Jonne Haß
|
fa0e92f396
|
updated 100 locale files [ci skip]
|
2012-02-18 16:26:18 -08:00 |
|
Maxwell Salzberg
|
1e2b912bd6
|
remove multi server spec files
|
2012-02-18 16:26:18 -08:00 |
|
danielgrippi
|
a0e8f161f5
|
fix notifications controller. yay.
|
2012-02-18 16:26:18 -08:00 |
|
danielgrippi
|
ceb8497e49
|
Revert "attempt to make travis happy" [ci skip]
This reverts commit 8507dc864f.
|
2012-02-18 16:26:17 -08:00 |
|
danielgrippi
|
5fd0ab7951
|
attempt to make travis happy
|
2012-02-18 16:26:17 -08:00 |
|
Adrián Chaves Fernández (Gallaecio)
|
4e014d8ab6
|
Galician translation is now completely up-to-date.
|
2012-02-18 16:26:17 -08:00 |
|
Dennis Collinson
|
32d58e8a9b
|
toggle all nsfw posts
|
2012-02-18 16:26:17 -08:00 |
|
Adrián Chaves Fernández (Gallaecio)
|
e7c1903765
|
Minor changes to Galician translation for ‘diaspora’ file, and review of the ‘JavaScript’.
|
2012-02-18 16:26:17 -08:00 |
|
Adrián Chaves Fernández (Gallaecio)
|
b41b7f3bd3
|
Updated Galician translation of the ‘diaspora’ file.
|
2012-02-18 16:26:17 -08:00 |
|
danielgrippi
|
34cc358345
|
aliasing in routes.js [ci skip]
|
2012-02-18 16:26:17 -08:00 |
|
Florian Staudacher
|
c4deea3ab9
|
publisher needs a little more js...
|
2012-02-18 16:26:17 -08:00 |
|