zhitomirskiyi
|
560d9fe37f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 15:11:33 -08:00 |
|
zhitomirskiyi
|
54d4f4350d
|
one event
|
2011-01-13 15:11:00 -08:00 |
|
maxwell
|
602ec3d707
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 14:49:47 -08:00 |
|
maxwell
|
fc09b0fb40
|
add a max char count to commnets (500)
|
2011-01-13 14:49:17 -08:00 |
|
maxwell
|
b4fae58f12
|
just say no to 404 facebox errors
|
2011-01-13 14:48:30 -08:00 |
|
zhitomirskiyi
|
9e332a6188
|
comma
|
2011-01-13 14:40:48 -08:00 |
|
zhitomirskiyi
|
1a995d5f03
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 13:36:18 -08:00 |
|
zhitomirskiyi
|
97e5c3cb2c
|
typo
|
2011-01-13 13:36:03 -08:00 |
|
maxwell
|
8c0a8c6af8
|
increase header zindex so things don't fly over it
|
2011-01-13 13:31:43 -08:00 |
|
maxwell
|
b116362c5d
|
notifications for local comments
|
2011-01-13 13:02:02 -08:00 |
|
zhitomirskiyi
|
99931cdf41
|
splunking some stats
|
2011-01-13 12:54:18 -08:00 |
|
maxwell
|
f1d0a8ae35
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 10:19:56 -08:00 |
|
zhitomirskiyi
|
1748827f0a
|
photos show spec passes
|
2011-01-13 10:19:17 -08:00 |
|
maxwell
|
c002692657
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-13 09:45:56 -08:00 |
|
Dan Hansen
|
f807bc25d1
|
whitelist certain keyCodes, e.g. tab, fixes #795
|
2011-01-13 01:24:05 -06:00 |
|
Dan Hansen
|
43658b4923
|
only show prev/next if there is more than one photo, fixes #813
|
2011-01-13 01:03:37 -06:00 |
|
Sarah Mei
|
9c87fff295
|
Log specs don't check for specific number of renders.
|
2011-01-12 22:43:45 -08:00 |
|
Dan Hansen
|
ce4fe1938c
|
remove references to fancybox, we use facebox
|
2011-01-13 00:24:10 -06:00 |
|
Sarah Mei
|
e456c9d880
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-12 21:57:43 -08:00 |
|
Sarah Mei
|
57141fc305
|
Pull logging out to a shared behavior. Remove 4 pending specs.
|
2011-01-12 21:57:05 -08:00 |
|
Dan Hansen
|
61512ef7b0
|
youtube videos shove above comments and under the status -- i'm back\!
|
2011-01-12 23:05:20 -06:00 |
|
zhitomirskiyi
|
9b6faa5644
|
added a notificaions read button
|
2011-01-12 16:24:14 -08:00 |
|
maxwell
|
c29ebdabba
|
pending photos now stick to the publisher when adding or removing aspects... the home page however is a full reload, and some weird things happen when you switch from home
|
2011-01-12 15:47:14 -08:00 |
|
maxwell
|
f8d524c983
|
fix infield labels not rebinding on stream filter, and changed padding to margin for the user badge so the bottom boder does not go over the new request message
|
2011-01-12 13:50:55 -08:00 |
|
maxwell
|
c832201bd9
|
remove trailing bracket from aspects#edit pane
|
2011-01-12 11:00:22 -08:00 |
|
maxwell
|
f9634c0b0c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-12 10:48:06 -08:00 |
|
maxwell
|
1661158f95
|
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
|
2011-01-12 10:47:39 -08:00 |
|
maxwell
|
67fc4b3157
|
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
|
2011-01-12 10:35:05 -08:00 |
|
MrZYX
|
137cde185f
|
unscope contacts
|
2011-01-12 16:03:19 +01:00 |
|
MrZYX
|
1319099cf3
|
made some strings translatable
|
2011-01-12 15:58:10 +01:00 |
|
MrZYX
|
40fc8efec9
|
updated locales
|
2011-01-12 15:57:07 +01:00 |
|
Sarah Mei
|
756471be43
|
Fix 1.9 build. MAXWELL.
|
2011-01-11 19:58:27 -08:00 |
|
maxwell
|
73821859e6
|
require pubsubhubub in the job'
|
2011-01-11 16:24:59 -08:00 |
|
maxwell
|
49b172f192
|
up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness
|
2011-01-11 15:04:03 -08:00 |
|
maxwell
|
5609422a7b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-11 14:40:11 -08:00 |
|
maxwell
|
32d1d26e22
|
updated some dependancies
|
2011-01-11 14:39:44 -08:00 |
|
Raphael
|
3684546335
|
Require pubsubhubbub
|
2011-01-11 14:34:30 -08:00 |
|
maxwell
|
1f9813ce58
|
add autotest growl, if thats how you roll
|
2011-01-11 14:29:17 -08:00 |
|
maxwell
|
85295015ee
|
DG MS tests now green, plus autotest works again
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
25f388d903
|
MS DG made receive encapsulated in an object
|
2011-01-11 14:23:19 -08:00 |
|
maxwell
|
23de681cb8
|
DG MS moved receive methods to their respective models
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
220c6894fa
|
--amend
|
2011-01-11 14:23:18 -08:00 |
|
maxwell
|
daab8e80ce
|
basic receive cleanup
|
2011-01-11 14:23:18 -08:00 |
|
Raphael
|
6bb132b25e
|
Revert 'Create a separate webfinger service.' We'll come back to it when we figure out the error.
|
2011-01-11 14:18:25 -08:00 |
|
Raphael
|
021bbc12ba
|
No guarantee that there aree join table rows for any given model
|
2011-01-11 12:04:57 -08:00 |
|
Raphael
|
f8be5a284c
|
Don't use the environment rake task, just require the environment
|
2011-01-11 11:05:21 -08:00 |
|
Sarah Mei
|
68eedd578a
|
mysql timezones: PWND.
|
2011-01-10 20:40:27 -08:00 |
|
Raphael
|
6ba587155a
|
explicit require in rake file
|
2011-01-10 18:48:12 -08:00 |
|
Raphael
|
b9afd6012c
|
export should require environment
|
2011-01-10 18:45:02 -08:00 |
|
Raphael
|
0b265012bc
|
Make task for full migration
|
2011-01-10 18:42:34 -08:00 |
|