nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12629 commits 4 branches 0 tags 121 MiB
Commit graph

12629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Schubert
f68f14aa5b Quickfix: replace slideAndRemove() with remove() to prevent the ugly javascript error and make the post go away after click on "hide". Fixes #3249 2012-05-29 01:57:52 +03:00
Sean Tilley
687fd7a6a5 Merge pull request #3328 from caarlos0/master 
set cursor into username field on login page [ci skip]
 2012-05-28 00:04:45 -07:00
Sean Tilley
0fff23f233 Merge pull request #3319 from clavisound/patch-1 
I hope it solves bug 3292 (inverted desktop colors) [ci skip]
 2012-05-27 21:58:45 -07:00
Carlos Alexandro Becker
22103ffe65 set cursor into username field on login page - fixes #3305 2012-05-28 01:40:30 -03:00
Sean Tilley
4cfff4833c Merge pull request #3326 from fechterjm/patch-1 
no_follow_diasporahq explanation [ci skip]
 2012-05-27 13:29:07 -07:00
fechterjm
4011ac4ba4 ## their stream and get news about Diaspora, but if you don't want 
## your server to contact joindiaspora.com, set this to false:

should be

## their stream and get news about Diaspora, but if you want
## your server to contact joindiaspora.com, set this to false:
 2012-05-27 13:01:15 -03:00
Maxwell Salzberg
4fd88c702c Merge pull request #3322 from movilla/email_link 
Fix Translation missing Email_link [ci skip]
 2012-05-26 13:17:49 -07:00
movilla
13c16af5ad Fix Translation missing Email_link 2012-05-26 21:49:54 +02:00
Jonne Haß
2d39788ba3 updated 34 locale files [ci skip] 2012-05-25 23:34:31 +02:00
Maxwell Salzberg
9af133486c Merge pull request #3318 from Raven24/single-author 
fix author box in FF [ci skip]
 2012-05-25 14:09:16 -07:00
clavisound
f8d20751df I hope it solves bug 3292 https://github.com/diaspora/diaspora/issues/3292 2012-05-25 21:01:46 +03:00
Florian Staudacher
54c21f95f0 fix author box in FF (fixes #3278) [ci skip] 2012-05-25 14:26:09 +02:00
Maxwell Salzberg
f2a67bbcc0 more legacy styling for the stream [ci skip] 2012-05-24 20:27:44 -07:00
Maxwell Salzberg
fb1fd665de Merge pull request #3313 from OhaiBBQ/master 
BMM #3, “Show x more comments” deletes text in comment box when clicked
 2012-05-24 20:20:58 -07:00
Maxwell Salzberg
2f4f5e9449 Merge pull request #3315 from OhaiBBQ/bugmash-one 
BMM #1, Adding long text before @mention breaks mentioned name highlighting [ci skip]
 2012-05-24 20:15:57 -07:00
Maxwell Salzberg
078a04d3c1 Merge pull request #3316 from OhaiBBQ/bugmash-four 
BMM #4, The Publisher doesn’t expand after writing more than 30 lines of text [ci skip]
 2012-05-24 20:14:43 -07:00
Maxwell Salzberg
b689da8c9e Merge pull request #3317 from hfase01/master 
Reverted "NewHere" camel-case, Seems fixed now. [ci skip]
 2012-05-24 20:14:09 -07:00
Hans Fase
5f38486ab8 Reverted "NewHere" camel-case. Looks like someone awesome fixed the problem. ;) 2012-05-24 23:54:04 -03:00
Dan Hansen
e248526bef bugmash #4 
The Publisher doesn’t expand after writing more than 30 lines of text
 2012-05-24 19:50:39 -07:00
Dan Hansen
1327e5a492 bugmash #1 
Adding long text before @mention breaks mentioned name highlighting
 2012-05-24 19:34:39 -07:00
Dan Hansen
d334097ee2 bugmash #3 
persist unsaved comment value after expanding comments
 2012-05-24 19:08:43 -07:00
Florian Staudacher
f19f6110b1 match tag arrays by what they actually contain, not by order 2012-05-24 22:18:10 +02:00
Maxwell Salzberg
75277b4d0e gzip outgoing stuffs for great success 2012-05-24 13:02:20 -07:00
Maxwell Salzberg
33efa45ec0 Merge pull request #3298 from diaspora/tags-fix-fix 
fix another hashtag 'inconvenience'
 2012-05-24 12:43:59 -07:00
Dennis Collinson
c4240154b1 back to profile works 2012-05-24 12:43:06 -07:00
Maxwell Salzberg
bc25ef2385 dont navigate to posts that dont exisit 2012-05-24 12:31:53 -07:00
Florian Staudacher
472340e540 add rake tasks for cleaning up mixed-case hashtags, 
fix querying tagged models, in case multiple tags are found
----
the first rake task will attach all posts tagged with mixed-
case hashtags to their lower-case variant

    $ bundle exec rake migrations:rewire_uppercase_hashtags

the other rake task will remove the - now unused - mixed-case
hashtags from the db

    $ bundle exec rake migrations:remove_uppercase_hashtags

as always, perform a backup first! ;)
 2012-05-24 21:28:35 +02:00
danielgrippi
58ac040f8f clicking a permalink on the new stream does not make an HTTP request to go to the post's page 2012-05-24 12:05:27 -07:00
danielgrippi
3e09d4ed14 Revert "don't seed beta users with default aspects" 
This reverts commit 946f78b025.
 2012-05-24 11:42:52 -07:00
Dennis Collinson
f3174941bd fix the "has no posts" on back bug. 2012-05-24 11:40:27 -07:00
danielgrippi
946f78b025 don't seed beta users with default aspects 2012-05-24 11:37:34 -07:00
Maxwell Salzberg
bed07872f2 composer now prevents you from submitting an empty frame. 2012-05-24 11:36:43 -07:00
Maxwell Salzberg
d270910500 set the submit button to be disabled on the framer, and write a test 2012-05-24 11:36:43 -07:00
danielgrippi
ed9c57e7db made loader transparent [ci skip] 2012-05-24 11:17:05 -07:00
danielgrippi
fd6a858f83 don't do big styling on frames with the has-media class [ci skip] 2012-05-24 11:04:12 -07:00
danielgrippi
a5f023354a fixed the empty state styling on smallframe [ci skip] 2012-05-24 11:00:07 -07:00
danielgrippi
34d98a6d3c fixed some styling during the framing process [ci skip] 2012-05-23 18:47:01 -07:00
Maxwell Salzberg
de499ba276 new bookmarklet needs to be ridic wide to deal with bootstrap responsive :( [ci skip] 2012-05-23 18:06:50 -07:00
danielgrippi
5b3fcd07f3 added texture directory to assets/images [ci skip] 2012-05-23 17:28:02 -07:00
Maxwell Salzberg
82218fd7cb new stream now remembers how far you have scrolled. 
also, jasmine is really cool.
 2012-05-23 17:25:40 -07:00
Maxwell Salzberg
92c0fa0163 backfill some stream.js specs 2012-05-23 17:25:40 -07:00
danielgrippi
b736741ab8 added better images to framer [ci skip] 2012-05-23 17:07:41 -07:00
danielgrippi
5d2ea71766 added EditbaleSmallFrame class; frame on framer second step is partially editable 2012-05-23 17:07:41 -07:00
Maxwell Salzberg
fbb0961762 make logo on new stream a link back to stream [ci skip] 2012-05-23 16:07:42 -07:00
Maxwell Salzberg
8046a59da9 new stream has a loader [ci skip] 2012-05-23 16:00:27 -07:00
danielgrippi
2a37491be0 changed service icons; icons for template picker [ci skip] 2012-05-23 15:09:57 -07:00
Maxwell Salzberg
c21bc14c78 center big text on frames [ci skip] 2012-05-23 15:03:38 -07:00
Maxwell Salzberg
f3af73efc2 make some text on some legacy posts readable in the new stream [ci skip] 2012-05-23 14:59:11 -07:00
Sean Tilley
afdb5350ea Merge pull request #3309 from OhaiBBQ/master 
Bug Mash Monday #5, NoMethodError in InvitationsCotnroller [ci skip]
 2012-05-23 13:14:31 -07:00
Dan Hansen
cf847d61ba bug mash #5 
fix NoMethodError on InvitationsController
 2012-05-23 13:05:01 -07:00