Raphael Sofaer
|
2fb0fce1a8
|
Nest likes and comments routes in the post route
|
2011-07-10 21:44:34 -07:00 |
|
danielgrippi
|
875eaffd42
|
added missing class to cubbies photos in the stream for the lightbox
|
2011-07-10 21:42:37 -07:00 |
|
danielgrippi
|
d69f89f689
|
forgot an attr on cubbies photos
|
2011-07-10 21:29:32 -07:00 |
|
danielgrippi
|
1339b8e845
|
Merge branch 'lightboxin'
|
2011-07-10 21:23:15 -07:00 |
|
danielgrippi
|
776368d45e
|
added left/right arrow events to the lightbox; lightbox only on stream element images for now
|
2011-07-10 21:09:00 -07:00 |
|
danielgrippi
|
e09ddef361
|
DH DG; lightboxin wip
|
2011-07-10 21:08:34 -07:00 |
|
Raphael Sofaer
|
d1f2bc5fcb
|
Remove object_path spec
|
2011-07-10 21:05:55 -07:00 |
|
Raphael Sofaer
|
934ae80a5f
|
Take index route off until I actually make it
|
2011-07-10 20:26:38 -07:00 |
|
Raphael Sofaer
|
97ca10ddda
|
Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController
|
2011-07-10 20:06:31 -07:00 |
|
danielgrippi
|
6a165c0e3d
|
made show pages wider for status messages. made names blue in comments for easier reading
|
2011-07-10 18:54:38 -07:00 |
|
danielgrippi
|
7b7f3fc086
|
fix up aspects/edit popup a little
|
2011-07-10 18:34:47 -07:00 |
|
danielgrippi
|
aa8ae9cca6
|
remove red background on photos index
|
2011-07-10 17:12:59 -07:00 |
|
danielgrippi
|
e84635dae2
|
constrain in the image uploader, don't crop
|
2011-07-10 17:03:38 -07:00 |
|
Raphael Sofaer
|
e1a7ff798a
|
Seed in rebuild
|
2011-07-09 16:55:05 -07:00 |
|
Daniel Grippi
|
f73b38bd80
|
Merge pull request #1569 from manuels/patch-1
Corrected german translation (from noun to verb for 'mention')
|
2011-07-09 13:23:45 -07:00 |
|
manuels
|
30b2a6fe88
|
Corrected german translation (from noun to verb for 'mention')
|
2011-07-09 07:12:04 -07:00 |
|
Raphael Sofaer
|
c83276a9d9
|
OK, now I get what was going on.
|
2011-07-07 22:17:42 -07:00 |
|
Raphael Sofaer
|
d8e891b492
|
Revert "escape js in format_tags until I can think about whether we have an XSS problem in the morning"
This reverts commit 8af95909c2.
|
2011-07-07 22:13:02 -07:00 |
|
Raphael Sofaer
|
8af95909c2
|
escape js in format_tags until I can think about whether we have an XSS problem in the morning
|
2011-07-07 21:54:56 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
27a08b895a
|
changed the bugs to the new place, testing jenkins receive hooks at the same time
|
2011-07-07 19:29:51 -07:00 |
|
MrZYX
|
ed23406f57
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-07-08 01:36:18 +02:00 |
|
MrZYX
|
7a7cfbf33f
|
updated locales
|
2011-07-08 01:32:57 +02:00 |
|
danielgrippi
|
029e9c55c2
|
don't display public posting option if not posting to all aspects
|
2011-07-07 15:50:33 -07:00 |
|
Raphael Sofaer
|
968100860a
|
Don't show commented tags in the tag stream for now, until we optimize that
|
2011-07-07 15:39:28 -07:00 |
|
Raphael Sofaer
|
e98cc4b960
|
Sort on and index taggings, ftw
|
2011-07-07 15:14:29 -07:00 |
|
Raphael Sofaer
|
d0ce257107
|
Revert "Revert "Merge branch 'hashtags-in-comments'""
This reverts commit d2e26f6937.
|
2011-07-07 15:10:04 -07:00 |
|
danielgrippi
|
d2e26f6937
|
Revert "Merge branch 'hashtags-in-comments'"
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
|
2011-07-07 13:39:15 -07:00 |
|
danielgrippi
|
f85d5ad6d4
|
Merge branch 'hashtags-in-comments'
|
2011-07-07 12:41:01 -07:00 |
|
danielgrippi
|
9d506231b1
|
querying correctly in tagscontroller to include posts with comments containing hashtag
|
2011-07-07 12:27:48 -07:00 |
|
danielgrippi
|
310b9969f3
|
hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here...
|
2011-07-07 12:21:57 -07:00 |
|
danielgrippi
|
b8d70393f4
|
include authors and profiles on tags show page
|
2011-07-07 11:14:10 -07:00 |
|
Raphael Sofaer
|
1f448e8555
|
as_json wants a string
|
2011-07-07 10:56:55 -07:00 |
|
Raphael Sofaer
|
8cf0fa8446
|
Don't get tags in the publisher
|
2011-07-07 10:48:07 -07:00 |
|
Raphael Sofaer
|
254d83b278
|
Simplify SocketsHelper in light of adding current_user helper to SocketsController
|
2011-07-07 09:06:24 -07:00 |
|
Raphael Sofaer
|
a1ee8eb83b
|
stub tests for not n-querying in the publisher
|
2011-07-07 09:06:24 -07:00 |
|
Jordi Mallach
|
2e67549dc7
|
Updated Catalan translation to 738487b.
|
2011-07-07 14:43:52 +02:00 |
|
Jordi Mallach
|
84072305c5
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-07-07 14:34:41 +02:00 |
|
danielgrippi
|
e994c90559
|
don't show hovercard for current_user in likes field + fixed hovercard styling in likes field
|
2011-07-06 21:33:59 -07:00 |
|
danielgrippi
|
fdaa44ca9c
|
add hovercards to links in likes
|
2011-07-06 21:09:24 -07:00 |
|
danielgrippi
|
f0fa79bb09
|
Revert "ordered hash stuff"
This reverts commit 2d98b939d1.
|
2011-07-06 19:13:34 -07:00 |
|
danielgrippi
|
2d98b939d1
|
ordered hash stuff
|
2011-07-06 19:11:53 -07:00 |
|
danielgrippi
|
b1fc87ea30
|
add basic overview page to admin controller
|
2011-07-06 19:08:09 -07:00 |
|
Raphael Sofaer
|
46ef376bc1
|
Fix notifications feature
|
2011-07-06 19:00:29 -07:00 |
|
Raphael Sofaer
|
03df3e3e59
|
Fix manages_aspects feature
|
2011-07-06 19:00:28 -07:00 |
|
danielgrippi
|
f3d185fe41
|
hovercard on comments
|
2011-07-06 17:13:11 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
738487b381
|
moved the are you sure dialog into a translation
|
2011-07-06 16:34:51 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
8d94115bbc
|
added the start conversation button back with a message if you try to add more than 16 people
|
2011-07-06 16:05:12 -07:00 |
|
Jordi Mallach
|
355e29c237
|
Better messages for following.
|
2011-07-07 00:34:19 +02:00 |
|
Jordi Mallach
|
fcb3d843e5
|
Fix names and indentation of some keys. Oops.
|
2011-07-06 23:47:24 +02:00 |
|
Jordi Mallach
|
5cac35ed27
|
Updated Catalan translation to c3e477f2.
|
2011-07-06 23:47:24 +02:00 |
|