Commit graph

5389 commits

Author SHA1 Message Date
Raphael
d76121b147 Add charset to example database.yml 2011-01-14 10:54:02 -08:00
Raphael
3f7b89ac86 Commit horrifying db cleanup script 2011-01-14 10:52:26 -08:00
Raphael
8f91689b3f Require config environment rather than the environment rake task 2011-01-14 10:48:01 -08:00
maxwell
a0489112b7 made show page times smaller 2011-01-14 10:21:38 -08:00
maxwell
c8dd16b60c make english translation ffor also commented on less akward 2011-01-14 09:49:29 -08:00
Raphael
ae57c7a232 Stop testing on created_at, because I am so not updating the fixtures and we do have to export the times. 2011-01-13 19:59:01 -08:00
Raphael
d6cae5862d The cool kids store birthdays in unix time 2011-01-13 19:29:44 -08:00
Raphael
300e055933 It turns out comments weren't importing because I didn't write the code to make them import. 2011-01-13 18:48:32 -08:00
Raphael
f2a27ea970 Another try at getting the youtube titles in 2011-01-13 18:15:44 -08:00
maxwell
641b805da2 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 17:31:44 -08:00
maxwell
f509367a40 fix the 404 page to show the dun goofed guy 2011-01-13 17:31:18 -08:00
zhitomirskiyi
2c58630995 rails autoescapes in the link_to 2011-01-13 17:16:53 -08:00
Raphael
597a7a8a03 Revert "Serialize youtube titles to yaml to ActiveRecord can read them"
This reverts commit b42bffa6fa.
2011-01-13 17:16:06 -08:00
Raphael
2f4be3c9c4 Revert "keep nil nil"
This reverts commit fb12f5de52.
2011-01-13 17:15:43 -08:00
Raphael
fb12f5de52 keep nil nil 2011-01-13 17:03:55 -08:00
maxwell
27162e59b8 adding new js file to jasmine 2011-01-13 17:00:08 -08:00
Raphael
b42bffa6fa Serialize youtube titles to yaml to ActiveRecord can read them 2011-01-13 16:51:09 -08:00
maxwell
600e67d5d1 Merge branch 'master' of github.com:diaspora/diaspora 2011-01-13 16:31:35 -08:00
maxwell
f97a9fa017 added timeago jquery plugin. we now need to figure out a js translation scheme 2011-01-13 16:29:13 -08:00
Raphael
f79c08b235 Add indicies 2011-01-13 16:17:11 -08:00
Raphael
7abd1aceca Add a couple indicies 2011-01-13 15:13:42 -08:00
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