zhitomirskiyi
23d2a92bf1
pushing the profile to to all the contacts
2010-12-09 11:51:35 -08:00
danielvincent
fa9caf00ca
added tooltip text to public icon
2010-12-08 19:07:08 -08:00
danielvincent
aa628c090d
highlight public posts in the stream
2010-12-08 18:59:02 -08:00
danielvincent
cdd225c076
don't show new comment form on a non-contact's post
2010-12-08 18:23:30 -08:00
danielvincent
faf27fe05a
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 17:06:39 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
maxwell
10df61a504
order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page
2010-12-08 16:35:48 -08:00
maxwell
e4e3a7493c
fixed a bug where reshare text was truncated
2010-12-08 15:09:41 -08:00
maxwell
69f42667b3
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 14:34:53 -08:00
maxwell
d6c5a88836
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 14:34:31 -08:00
Alec Leamas
7510d06211
Pkg update
...
Handling new services reasonably on ubuntu/fedora. Open issues
includes pod_url setup.
2010-12-08 23:27:29 +01:00
Alec Leamas
6b00ca238f
Fixing also logfile in redis.conf
...
Not tested on BSD/Darwin, might need polish for these.
2010-12-08 23:26:07 +01:00
maxwell
6d6e4f92bb
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-08 14:21:40 -08:00
maxwell
1f8f07f48d
added slightly better error message on aspect update failure
2010-12-08 14:21:14 -08:00
maxwell
3dbb80bf9f
added slightly better error message on aspect update failure
2010-12-08 14:14:49 -08:00
maxwell
f659ba58ef
limit the new aspect form name to be less than 20 char in the form
2010-12-08 13:58:16 -08:00
maxwell
5f1f28923f
fixed a comment counting bug, and the show_all_comments message when the comment count was three
2010-12-08 13:44:57 -08:00
maxwell
efee7682e2
aspect rename now works
2010-12-08 13:11:13 -08:00
MrZYX
9925aba066
Merge branch '676-bsd-sed' of https://github.com/flah00/diaspora into flah00-676-bsd-sed
2010-12-08 19:36:14 +01:00
MrZYX
806d193f64
updated locales
2010-12-08 19:21:13 +01:00
Alec Leamas
843405116f
Redis.conf: handling read-only install...
2010-12-08 16:05:20 +01:00
danielvincent
497dcccb8f
merge email and mail queues in resque
2010-12-07 23:40:07 -08:00
Philip Champon
ccbf51fdbe
Issue 676: allow for correct calling of bsd sed
2010-12-08 01:03:55 -05:00
danielvincent
b94e6ae4a0
shift+enter submits new messages/comments
2010-12-07 21:30:29 -08:00
Hexagon
5c1c31b2b2
Final fix, really
2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00
Putting document.ready back
2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
MrZYX
b1663a710c
updated locales. huge thank you to all contributors at 99translations
2010-12-07 21:32:15 +01:00
Alec Leamas
93d7e08fd8
Pkg update (mongodb setup)
2010-12-07 19:10:50 +01:00
Alec Leamas
23a5db1013
Creates and maintains a local redis.conf.
...
Creates config/redis.conf using mater copy in etc. FTM, disables
daemonizing, which doesn't fit script/server (or upstart/systemd).
2010-12-07 19:06:25 +01:00
Raphael
18319f8e42
Hopefully cut down the stream rendering time by memoizing the new comment form
2010-12-07 09:28:11 -08:00
Alec Leamas
2ab4d1664d
Pkg update
...
Once again builds on all platforms. Open issues includes configuration
of mongodb and redis.
2010-12-07 15:30:39 +01:00
Raphael
f421f1327c
Take nested queried out of aspects manage
2010-12-07 00:21:05 -08:00
danielvincent
d3483c1cd5
forgot to remove something...
2010-12-07 00:00:34 -08:00
danielvincent
de0ecff5b7
aspects first on home contact list.
2010-12-06 23:59:16 -08:00
Raphael
9442553504
Refactor aspectscontroller and aspect_contacts.haml
2010-12-06 17:20:21 -08:00
Raphael
14a9bc02f9
Move aspect_contacts in to aspects
2010-12-06 17:20:21 -08:00
Raphael
c034113a7c
Refactor to aspect partial
2010-12-06 17:20:21 -08:00
danielvincent
9891577fa5
500 page now shows a getsatisfaction pane defaulted to problem tab
2010-12-06 16:03:02 -08:00
Raphael
8a19e9f961
Fix spec
2010-12-06 13:56:40 -08:00
Raphael
6aa7648787
Put send_contact_request_to back into the app
2010-12-06 13:45:12 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
Raphael
1f71474f0f
Small copy change
2010-12-06 13:36:20 -08:00
maxwell
97c1ce54c1
fixed the batch emailer tests... sorry it took me so long
2010-12-06 10:56:04 -08:00
Alec Leamas
818ccf92b0
Bugfix (only visible on Ubuntu)
2010-12-06 18:18:49 +01:00
Alec Leamas
4926e185ef
Making jammit tests in server consistent
2010-12-06 15:32:01 +01:00
Alec Leamas
521aa83b0c
Create publiuc/source.tar.gz from current branch.
...
Also, give slow starters some more time.
2010-12-06 15:22:43 +01:00
Alec Leamas
36e6c9f68e
Revert "Fixing server when no git files, not on master"
...
Wrong usecase. The real problem is always using the master branch.
There is no point using a files list, distributions will just
create the tar archive in advance.
This reverts commit 0541082804
2010-12-06 14:49:32 +01:00
Alec Leamas
7aa7c29b46
Route redis output to log file,
...
On Fedora, logfile/loglevel in configuration file seems to be ignored
as of now.
2010-12-06 13:38:08 +01:00
Alec Leamas
0541082804
Fixing server when no git files, not on master
...
Allows server to run even if on another branch than master and/or
in a production scenario without git files available.
2010-12-06 13:36:24 +01:00
