Commit graph

6684 commits

Author SHA1 Message Date
danielvincent
78a50756c6 publisher collapsed by default on all pages. removed button styling from add photos button. publisher only collapses on ajax success. comment buttons use show() instead of fadeIn(). 2010-12-18 18:28:00 -08:00
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
Raphael
02f745900f Get rid of youtube-title failure 2010-12-18 15:16:05 -08:00
MrZYX
6afba8fb7b updated locales 2010-12-18 16:07:49 +01:00
MrZYX
c3a79f7298 some fixes to translations 2010-12-18 15:25:21 +01:00
Alec Leamas
5e4219b09e Pkg update 2010-12-18 15:18:48 +01:00
maxwell
f1ae312e75 changes for person show page 2010-12-18 02:10:00 -08:00
maxwell
bcca61af6b infinate scroll 2010-12-18 01:33:33 -08:00
Raphael
a64fa0839f Hide notifications link until we take out queries from it 2010-12-17 20:19:02 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
danielvincent
f6701f2262 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-17 19:29:17 -08:00
Raphael
a64d8943b4 Pulled in spec refactor, thanks blackxored 2010-12-17 18:49:34 -08:00
maxwell
b3c63a3cc0 you can now unset the year of your birthday" 2010-12-17 18:05:13 -08:00
maxwell
96b907122b only show profile fields if they are filled out. 2010-12-17 17:40:08 -08:00
maxwell
13407f700e fix test 2010-12-17 17:25:11 -08:00
maxwell
2e85a9fe66 notifications now can be read 2010-12-17 17:06:49 -08:00
maxwell
c749d81fe9 putting a link to notifications, make them unread in the controller when you view the index 2010-12-17 17:06:48 -08:00
maxwell
807187ded9 /notifications is now pretty cool 2010-12-17 17:06:48 -08:00
Raphael
2545de6470 Revert "i can haz right timezone?"
This reverts commit 6d233e5eed.
2010-12-17 16:44:57 -08:00
Raphael
fe85e4cc75 Fix daemontools resque worker run script 2010-12-17 14:33:57 -08:00
danielvincent
6afb7a6bd5 Revert "added configuration for cloudfile cdn"
This reverts commit 0d5ac3bd36.
2010-12-17 14:30:02 -08:00
Raphael
b8648f631a Use ree in the chef scripts, might revert later 2010-12-17 12:49:44 -08:00
danielvincent
0d5ac3bd36 added configuration for cloudfile cdn 2010-12-17 12:26:20 -08:00
danielvincent
9ef9b3f0c3 log backup rake tasks 2010-12-17 12:26:20 -08:00
Raphael
60c5f03645 Merge remote branch 'pupeno/master' 2010-12-17 11:57:17 -08:00
maxwell
6d233e5eed i can haz right timezone? 2010-12-17 11:52:52 -08:00
maxwell
3c3e03993a make the two links on comment notifications clearer 2010-12-17 11:48:08 -08:00
maxwell
5763b441be fixing order of Notification.for 2010-12-17 11:37:33 -08:00
maxwell
39deac62fb in words is not a helper 2010-12-17 11:05:58 -08:00
J. Pablo Fernández
5b9ec61c6e Install bzip2 when bootstrapping, rvm needs it. 2010-12-17 08:22:32 -03:00
lfortin
77c102cce6 more JS formatting 2010-12-16 23:46:28 -05:00
maxwell
0bdb6aaab5 more notification stuff 2010-12-16 19:00:32 -08:00
maxwell
d56093666e fix for local passing optimization 2010-12-16 18:42:13 -08:00
maxwell
92bbe4cd4c added link to changelog, updated notifications 2010-12-16 18:28:22 -08:00
danielvincent
a41f45b846 contact count on home page 2010-12-16 18:21:06 -08:00
danielvincent
bc9352eabd fix id/string error in receive local job 2010-12-16 18:21:06 -08:00
maxwell
b8a0abd122 updating notification views 2010-12-16 18:07:43 -08:00
Raphael
bd64cb723f to_s args before trying to slice them 2010-12-16 17:58:11 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
Raphael
647c48d530 Set auto_flushing to 1 explicitly 2010-12-16 17:26:46 -08:00
danielvincent
2758ea1625 fixed issue with diaspora handles not displaying in streams 2010-12-16 17:24:25 -08:00
danielvincent
28a22d9fc3 increase session timeout from 10 minutes to 1 day 2010-12-16 17:24:25 -08:00
Raphael
4da97be84b Add benchmarks and logging to resque jobs 2010-12-16 16:48:36 -08:00
danielvincent
f3ced6d96c randomize collections of similar contacts on people#show 2010-12-16 16:37:13 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
Raphael
719081473e Fix log statements in Encryptable 2010-12-16 15:22:26 -08:00
Raphael
5e6c14fce8 Simplify connect_users for a huge test speedup 2010-12-16 14:47:37 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
Raphael
d2199fa1eb Profile of requestor should be visible; no outgoing request instance variable needed 2010-12-16 14:09:55 -08:00