Raphael
|
4f9547b300
|
Adding logging
|
2010-11-17 16:06:16 -08:00 |
|
Raphael
|
5e269edb5a
|
Adding logging to webfinger in people_controller
|
2010-11-17 15:56:39 -08:00 |
|
Raphael
|
2ecf1e8b71
|
No name fields on invitation accept
|
2010-11-17 15:45:40 -08:00 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
Raphael
|
6c97899d5d
|
Add logging statements, rescue callbacks in em-webfinger
|
2010-11-17 13:55:58 -08:00 |
|
maxwell
|
045c8f1aac
|
updated magent, now using my fork untill bugfix gets pulled
|
2010-11-17 13:49:12 -08:00 |
|
maxwell
|
387a7628a8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 12:38:49 -08:00 |
|
maxwell
|
1ca5e25e53
|
adding default for google a analytics
|
2010-11-17 12:35:42 -08:00 |
|
Raphael
|
e18c3bd726
|
restarting splunk
|
2010-11-17 12:32:10 -08:00 |
|
maxwell
|
e959e529ff
|
ga looks like it only likes if the code is pasted...hrmpf
|
2010-11-17 12:29:58 -08:00 |
|
maxwell
|
ba620e5400
|
spell vendor correctly
|
2010-11-17 12:25:09 -08:00 |
|
maxwell
|
8855897b0f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 12:17:10 -08:00 |
|
maxwell
|
643950cf52
|
added google a
|
2010-11-17 12:16:44 -08:00 |
|
Raphael
|
ff24f46114
|
Stop splunk before overwriting it, don't stop chef if splunk isn't running
|
2010-11-17 12:08:50 -08:00 |
|
maxwell
|
b643046b5b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 12:08:23 -08:00 |
|
maxwell
|
5561ab9cec
|
adding get satisfaction
|
2010-11-17 12:08:06 -08:00 |
|
Raphael
|
8a63b627d1
|
Have splunk monitor the diaspora dir
|
2010-11-17 12:01:54 -08:00 |
|
Raphael
|
f29c84fb48
|
Remove old splunk
|
2010-11-17 11:55:29 -08:00 |
|
Jan
|
b088e0d685
|
Added missing polish locales, using all of the previous translations.
|
2010-11-17 20:50:38 +01:00 |
|
Raphael
|
0012c010af
|
Force move splunk
|
2010-11-17 11:47:38 -08:00 |
|
Raphael
|
1faf1986ae
|
Start splunk
|
2010-11-17 11:42:53 -08:00 |
|
Raphael
|
729ea5be48
|
Accept license in splunk cookbook
|
2010-11-17 11:37:37 -08:00 |
|
maxwell
|
afc3bd63fe
|
added button to end of getting started
|
2010-11-17 11:30:22 -08:00 |
|
Raphael
|
6794c913ef
|
Adding splunk to chef
|
2010-11-17 11:24:09 -08:00 |
|
Alec Leamas
|
8580ea2be6
|
Pkg update
|
2010-11-17 12:59:29 +01:00 |
|
maxwell
|
2c627cdb2b
|
updating jas
|
2010-11-17 00:16:11 -08:00 |
|
maxwell
|
6a695479f7
|
adding updated jquery UI for compatability
|
2010-11-16 23:58:16 -08:00 |
|
maxwell
|
f81bb1d7e7
|
i broke the jasmine tests. this is me fixin them
|
2010-11-16 22:02:18 -08:00 |
|
maxwell
|
f55509085a
|
upgraded jquery, and deleted a second version of both jqueries
|
2010-11-16 21:41:20 -08:00 |
|
maxwell
|
092f0ef7a8
|
invite link when you get a webfinger error
|
2010-11-16 19:07:19 -08:00 |
|
maxwell
|
72f99afe9c
|
commenting out sprinkle from the gemfile because it is misbehaving with CI
|
2010-11-16 18:38:32 -08:00 |
|
Raphael
|
ece1dc2cf9
|
In progress invites in _manage_aspect_contacts
|
2010-11-16 18:10:15 -08:00 |
|
Raphael
|
e2412d2e43
|
Add error messages for friending from aspect-manage
|
2010-11-16 18:00:55 -08:00 |
|
Raphael
|
2d347ec36d
|
Delete an accepted friend request
|
2010-11-16 16:47:06 -08:00 |
|
danielvincent
|
e2e3b2511d
|
removing mini_fb gem
|
2010-11-16 16:46:41 -08:00 |
|
zhitomirskiyi
|
35415eb137
|
daemontools also starts magent
|
2010-11-16 16:37:02 -08:00 |
|
zhitomirskiyi
|
3b2afc1cf4
|
added file permissions to crossdomain.xml
|
2010-11-16 16:22:55 -08:00 |
|
Raphael
|
c0414b8184
|
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
f3a301d314
|
Don't expect raises in request specs, redirect to :back on all requesting
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
538c6ce4b9
|
Take handle validations out of em-webfinger
|
2010-11-16 16:18:16 -08:00 |
|
Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
zhitomirskiyi
|
6f72cd7184
|
NGINX serves crossdomain.xml on port 843, which is required for FF3.6 running em-websocket :secure => true. daemontools run script for websocket uses production environment
|
2010-11-16 15:54:51 -08:00 |
|
Raphael
|
c005be99fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-16 14:36:29 -08:00 |
|
Raphael
|
d1a56e9ef2
|
Fix to websocket js
|
2010-11-16 14:35:46 -08:00 |
|
zhitomirskiyi
|
8edc516edf
|
Revert "added the socket policy file perl script, starts on script server, added a chef task"
This reverts commit ed9a66d9a4.
|
2010-11-16 12:34:00 -08:00 |
|
zhitomirskiyi
|
9b5a6cc27a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-16 12:01:22 -08:00 |
|
zhitomirskiyi
|
ed9a66d9a4
|
added the socket policy file perl script, starts on script server, added a chef task
|
2010-11-16 12:01:10 -08:00 |
|
maxwell
|
8c647aa169
|
adding instafail
|
2010-11-16 10:05:15 -08:00 |
|
Alec Leamas
|
90b86690d9
|
Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4
|
2010-11-16 16:25:32 +01:00 |
|
maxwell
|
f6c6030c6d
|
fixing a translation
|
2010-11-15 23:08:57 -08:00 |
|