danielgrippi
|
ebab307b3d
|
fix require in cucumber
|
2012-02-01 16:47:32 -08:00 |
|
danielgrippi
|
1e508218d2
|
remove some unused images [ci skip]
|
2012-02-01 16:45:55 -08:00 |
|
danielgrippi
|
9377dd30f4
|
reference pin icon in mobile view [ci skip]
|
2012-02-01 16:41:27 -08:00 |
|
danielgrippi
|
310a0679f1
|
particpate stream, yo!
|
2012-02-01 16:05:16 -08:00 |
|
Maxwell Salzberg
|
c7d422c338
|
fix cukes
|
2012-02-01 15:12:18 -08:00 |
|
danielgrippi
|
02021584a7
|
EvilQuery for Participation, refactor comment creation
you can now create a comment with User#comment!(post, text)
|
2012-02-01 15:09:31 -08:00 |
|
Sarah Mei
|
7389b895d6
|
Fix #2799 - bullet points in a post that has 'read more'
|
2012-02-01 14:31:07 -08:00 |
|
Maxwell Salzberg
|
d8bfa52af7
|
swap order in dispatcher to get less errors posting to services
|
2012-02-01 14:10:54 -08:00 |
|
Maxwell Salzberg
|
f826340336
|
push stream listings to the side a bit
|
2012-02-01 13:56:52 -08:00 |
|
Maxwell Salzberg
|
51e5b0e02f
|
reorder side stream to insinuate new groupings
|
2012-02-01 13:39:21 -08:00 |
|
Maxwell Salzberg
|
9abbf151a0
|
changed some keys by accident
|
2012-02-01 13:39:02 -08:00 |
|
Maxwell Salzberg
|
d06ccb9ba9
|
first pass at strickly user level rename from like => pin. still need to update assets
|
2012-02-01 12:57:07 -08:00 |
|
danielgrippi
|
01a8cb8e34
|
evil queries have their own house.
|
2012-02-01 12:48:28 -08:00 |
|
danielgrippi
|
8b62f82d45
|
fix error
|
2012-02-01 12:09:46 -08:00 |
|
danielgrippi
|
6bcf06f578
|
Refactor multistream query
|
2012-02-01 12:00:30 -08:00 |
|
Sarah Mei
|
3ed68fc036
|
Fixes #2788 - show formatted text under show more
|
2012-02-01 11:55:20 -08:00 |
|
Jonne Haß
|
e5fe6a2280
|
fix typo, sorry [ci skip]
|
2012-02-01 20:06:44 +01:00 |
|
danielgrippi
|
6113b62161
|
rvmrc can be overridden by .rvm.local as well as .rvm_custom [ci skip]
|
2012-02-01 09:41:01 -08:00 |
|
Jonne Haß
|
26fab27d34
|
Merge branch 'toggle-missing-translation' of https://github.com/gandaro/diaspora
|
2012-01-31 22:33:39 +01:00 |
|
Jakob Kramer
|
eb445e45ba
|
fix missing translation in mentioning-lightbox
|
2012-01-31 22:16:48 +01:00 |
|
Jonne Haß
|
de4c9a1289
|
add warning about common setup error manifesting in uninitialized constant Oink
|
2012-01-31 21:56:01 +01:00 |
|
Jonne Haß
|
f1de7f9be1
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2012-01-31 18:43:15 +01:00 |
|
Jonne Haß
|
52d4db36a8
|
updated 38 locale files [ci skip]
|
2012-01-31 18:43:09 +01:00 |
|
Jonne Haß
|
7a8bd7595b
|
do not auto follow back if already sharing
|
2012-01-31 14:34:09 +01:00 |
|
Jordi Mallach
|
c47108080e
|
Update Catalan translation to 44ff6ae.
|
2012-01-31 01:32:35 +01:00 |
|
Jordi Mallach
|
67e907eef0
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2012-01-31 01:13:56 +01:00 |
|
Maxwell Salzberg
|
5914ed4ef1
|
defer comments posting in comment controller
|
2012-01-30 11:34:50 -08:00 |
|
danielgrippi
|
1d19dba9b4
|
add missing bootstrap files.
|
2012-01-29 15:19:46 -08:00 |
|
danielgrippi
|
bcbabc5fd2
|
Switch boilerplate for bootstrap 2 on mobile. [ci skip]
|
2012-01-29 11:51:47 -08:00 |
|
Sarah Mei
|
e4fa8d8466
|
Fix tags_helper, add specs
|
2012-01-29 11:46:51 -08:00 |
|
Jonne Haß
|
782885c58d
|
Merge pull request #2775 from lprelle/configurable_paypal_id
use a donate form with a configurable paypal id
|
2012-01-29 11:16:53 -08:00 |
|
Lennart Prelle
|
5deab956c0
|
use a form with a configurable paypal id
|
2012-01-29 20:14:31 +01:00 |
|
Jonne Haß
|
6d4ea0d438
|
Merge pull request #2773 from lprelle/readd_paypal_id
readd paypal button id
|
2012-01-29 09:46:49 -08:00 |
|
Lennart Prelle
|
9cf168cef2
|
readd paypal button id
|
2012-01-29 18:45:17 +01:00 |
|
danielgrippi
|
0797460586
|
whats on your mind -> start a conversation
|
2012-01-29 09:19:36 -08:00 |
|
Jonne Haß
|
714da10517
|
Merge pull request #2772 from gandaro/interchanged-rss-atom
fixed a link titled 'RSS' linking to an atom feed
|
2012-01-29 06:23:11 -08:00 |
|
Jakob Kramer
|
44ff6ae8d8
|
fixed a link titled 'RSS' linking to an atom feed
|
2012-01-29 15:20:34 +01:00 |
|
Jonne Haß
|
f674494d2a
|
todo better id/guid switching hack needed
|
2012-01-29 15:15:24 +01:00 |
|
Jonne Haß
|
0e7b084713
|
fix 500 in PostsController#show for non existing post
|
2012-01-29 14:47:51 +01:00 |
|
Jonne Haß
|
9b07ce07d6
|
--amend [ci skip]
|
2012-01-29 13:13:08 +01:00 |
|
Jonne Haß
|
03f119ede7
|
fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip]
|
2012-01-29 13:09:03 +01:00 |
|
Sarah Mei
|
38908396f5
|
Fix stream view spec to look for different things on FF and on webkit. Sigh.
|
2012-01-29 00:09:56 -08:00 |
|
Maxwell Salzberg
|
13d1e68540
|
refactor people#index
|
2012-01-28 23:48:37 -08:00 |
|
Sarah Mei
|
0e242c3e0a
|
Fix one spec on FF; pendingify the other until I can figure out what's going on. Seems to be different behavior of the expander plugin across chrome and FF.
|
2012-01-28 23:35:26 -08:00 |
|
Sarah Mei
|
1f710232d8
|
Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766
|
2012-01-28 22:29:43 -08:00 |
|
danielgrippi
|
60ff88c1e7
|
Use Resque.inline instead of custom code [ci skip]
|
2012-01-28 19:23:03 -08:00 |
|
Jordi Mallach
|
01712dd00a
|
Update Catalan translation to 5bd929b.
|
2012-01-29 02:26:22 +01:00 |
|
Sarah Mei
|
0e0d40d00e
|
Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL.
|
2012-01-28 15:31:11 -08:00 |
|
Sarah Mei
|
03e3d8e993
|
Refactor contacts#index to have explicit html and mobile formats again, because apparently infinite scroll wants the html version, not the json version.
|
2012-01-28 15:31:11 -08:00 |
|
Sarah Mei
|
a27b17bc68
|
Slight refactor to contacts#index
|
2012-01-28 15:31:11 -08:00 |
|