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
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
Raphael
eb56521a66
Don't query inside of loops...
2010-12-16 12:25:31 -08:00
Raphael
fdcbe36ae9
Fix chromeframe call
2010-12-16 11:54:17 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
Raphael
72c377fa73
No chrome frame in 8 or 9, will take some time to make it less abrupt/confusing/unavoidable later, and give a notification to people using 8 that the site is broken in 8
2010-12-16 11:46:57 -08:00
Raphael
b467d12d83
Fix spec in peoplecontroller
2010-12-16 11:37:16 -08:00
maxwell
f00e0ada78
do a bad thing in the helper to get comment links
2010-12-16 11:23:57 -08:00
maxwell
20ca2e2e93
make Notification.for return a query, not evaluate.. also limit notifications pulled back to 25
2010-12-16 11:16:09 -08:00
maxwell
6101f57d62
fix a couple of broken links in our readme, thx dmorley
2010-12-16 11:04:17 -08:00
maxwell
58ce05cf0e
fix a config option in chef script
2010-12-16 10:49:24 -08:00
maxwell
1274dbbf5d
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-16 10:16:39 -08:00
maxwell
1451db6cd8
fixed rspec build
2010-12-16 10:15:16 -08:00
danielvincent
43810907f5
show all contacts in edit aspect pane
2010-12-16 10:00:18 -08:00
Alec Leamas
e7f1190705
Pkg update (lost in git space)
2010-12-16 17:45:05 +01:00
Alec Leamas
472d1c8c84
Pkg update (bugfix)
2010-12-16 17:12:20 +01:00
Alec Leamas
a525669a4e
Pkg update (installation is also needed)
2010-12-16 15:43:48 +01:00
Alec Leamas
02477ed27a
Trying to cope with #722 for the moment.
...
Issue warning if there already is a running redis server, typically
the system server installed with the redis[-server] package.
See http://bugs.joindiaspora.com/issues/722
2010-12-16 12:19:10 +01:00
