Maxwell Salzberg
|
5f4ebc94bb
|
small typo [ci skip]
|
2012-02-13 17:06:55 -08:00 |
|
Maxwell Salzberg
|
ef40350bae
|
fix authorizations page css to use media box
|
2012-02-13 17:06:18 -08:00 |
|
Maxwell Salzberg
|
7a565b051d
|
added some methods to make it easier to figure out how many active users a pod has
|
2012-02-13 16:56:25 -08:00 |
|
danielgrippi
|
f1c119452a
|
made nsfw shield nicer and more condensed [ci skip]
|
2012-02-13 14:12:14 -08:00 |
|
Jonne Haß
|
ab29a58f93
|
updated 97 locale files [ci skip]
|
2012-02-13 13:04:23 +01:00 |
|
Alex Harrison
|
763f8465eb
|
Added test for adding target=_blank to autolinks
|
2012-02-12 22:43:52 +01:00 |
|
Alex Harrison
|
1225517c51
|
Merge remote branch 'upstream/master'
|
2012-02-12 21:45:14 +01:00 |
|
Jakob Kramer
|
dfe30e1fe0
|
fix server-side markdownify to sanitize links
|
2012-02-11 22:23:06 +01:00 |
|
Daniel Grippi
|
3b87345365
|
Merge pull request #2863 from Pistos/diasporainc-discard-unrecognized-relays
Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up.
|
2012-02-11 08:50:00 -08:00 |
|
Pistos
|
44e6084a29
|
Gracefully handle unrecognized federated objects so failed Resque jobs don't pile up.
Conflicts:
lib/postzord/receiver/public.rb
|
2012-02-10 23:30:59 -05:00 |
|
Maxwell Salzberg
|
f3d790a4c2
|
fix css of new comment box [ci skip]
|
2012-02-10 16:48:55 -08:00 |
|
danielgrippi
|
44e072c330
|
DC DG; a participation is created in StatusMessageController
|
2012-02-10 16:42:21 -08:00 |
|
Maxwell Salzberg
|
427a1694db
|
typo in my js SRY [ci skip]
|
2012-02-10 15:53:25 -08:00 |
|
danielgrippi
|
ecdbd1bb26
|
remove joindiaspora specific home page from repo [ci skip]
|
2012-02-10 15:45:48 -08:00 |
|
danielgrippi
|
5ecb3e8a50
|
remove a task that doesnt seem to work
|
2012-02-10 15:31:46 -08:00 |
|
danielgrippi
|
3c7ebe3200
|
forgot to save a template [ci skip]
|
2012-02-10 15:24:47 -08:00 |
|
danielgrippi
|
33fb1222f1
|
change rake assets:compile_s3 to rake assets:deploy [ci skip]
|
2012-02-10 15:21:59 -08:00 |
|
danielgrippi
|
3e4d2fe7e8
|
adding custom landing page for heroku
|
2012-02-10 15:20:15 -08:00 |
|
danielgrippi
|
b866d9356a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2012-02-10 15:18:49 -08:00 |
|
danielgrippi
|
ed3d5c429a
|
fix a bunch of small css related media box issues [ci skip]
|
2012-02-10 15:18:27 -08:00 |
|
Maxwell Salzberg
|
232e620637
|
make posts have empty photos so reshared stop messing up
|
2012-02-10 13:45:41 -08:00 |
|
Maxwell Salzberg
|
6bc44f6f5a
|
add more images to use handlebars imageUrl helper
|
2012-02-10 13:44:45 -08:00 |
|
Dennis Collinson
|
f8ec80b62d
|
Merge branch 'participation_refactor'
|
2012-02-09 19:01:17 -08:00 |
|
Dennis Collinson
|
04bd507025
|
federated generators take a user
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
5e26a7e6bb
|
Participate stream query uses participations
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
14b9f5dc5b
|
move user modules into user namespace.
|
2012-02-09 19:01:01 -08:00 |
|
Dennis Collinson
|
f3c1eff3e9
|
Refactor Relayable Creation
|
2012-02-09 19:01:00 -08:00 |
|
Dennis Collinson
|
9e1816dc12
|
Participations are a federated, relayable model :)
|
2012-02-09 19:01:00 -08:00 |
|
Maxwell Salzberg
|
1c314c9540
|
return to diaspora after oauth cukes to prevent failures [ci skip]
|
2012-02-09 18:52:57 -08:00 |
|
danielgrippi
|
0056bc354e
|
fix weird search bar shadow issue in chrome [ci skip]
|
2012-02-09 18:35:19 -08:00 |
|
danielgrippi
|
2b15bc7938
|
fix syntax in comment.rb
|
2012-02-09 18:29:52 -08:00 |
|
danielgrippi
|
7a5838a363
|
allow comments to be 65535 chars long (as opposed to 2500)
|
2012-02-09 18:26:20 -08:00 |
|
danielgrippi
|
535c39ae7b
|
fix jasmine
|
2012-02-09 18:21:51 -08:00 |
|
danielgrippi
|
5a4f9d5b99
|
fix cuke
|
2012-02-09 18:03:41 -08:00 |
|
Maxwell Salzberg
|
62b222020d
|
allow localhost in cukes
|
2012-02-09 17:54:56 -08:00 |
|
Maxwell Salzberg
|
7109cf6c67
|
mock out slow things that our tests dont need for speed
|
2012-02-09 17:44:32 -08:00 |
|
Maxwell Salzberg
|
3d569cc4bc
|
fix for some crazy lack-of-stubbing on some http requests...
|
2012-02-09 16:20:22 -08:00 |
|
danielgrippi
|
f7e09df49b
|
fix reshare tempalte; reorder header
|
2012-02-09 15:50:32 -08:00 |
|
Alex Harrison
|
54571268e5
|
Added a post conversion hook to PageDown to add target="_blank" (fixes #2792)
|
2012-02-09 23:30:28 +01:00 |
|
danielgrippi
|
e6e49bbf1f
|
stubbornella media and img dom structure FTW! major css deletion <3
|
2012-02-09 14:29:01 -08:00 |
|
danielgrippi
|
398ca3d97b
|
Participate / Explore have been upgraded to top-level status.
|
2012-02-09 14:29:01 -08:00 |
|
Florian Staudacher
|
cab953848f
|
added tests for photos page
|
2012-02-09 23:12:39 +01:00 |
|
Florian Staudacher
|
082d5c9fd4
|
initial photo page functionality is back, featuring backbone and handlebars
|
2012-02-09 20:55:34 +01:00 |
|
Maxwell Salzberg
|
ceb0a15a84
|
update participate path in cuke
|
2012-02-09 10:52:53 -08:00 |
|
Maxwell Salzberg
|
16b20905a5
|
Merge pull request #2846 from diasp/2398-fixed-following-tag-button
Tags should be case insensitive
|
2012-02-09 10:12:48 -08:00 |
|
Florian Staudacher
|
0208aa12f0
|
fix shifted image button in firefox
|
2012-02-09 15:24:05 +01:00 |
|
Diaspora Europe
|
8eda9aaf52
|
added user_is_following method, added 2 model specs
|
2012-02-09 14:17:43 +01:00 |
|
Diaspora Europe
|
47f7e10860
|
tags should be case insensitive
|
2012-02-09 14:17:43 +01:00 |
|
Dennis Collinson
|
74409d64b5
|
cleanup, yoq
|
2012-02-08 17:25:25 -08:00 |
|
Maxwell Salzberg
|
062204e963
|
Merge pull request #2848 from beardedninja/master
#2847 Users can now toggle nsfw on and off
|
2012-02-08 17:21:29 -08:00 |
|