maxwell
|
5e375a30d8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 22:06:08 -08:00 |
|
maxwell
|
c6778b942f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/layouts/application.html.haml
|
2010-11-17 21:57:48 -08:00 |
|
danielvincent
|
558c175c2b
|
resolved translation issue in diaspora.en in user dropdown. second login link on landing page works.
|
2010-11-17 21:57:27 -08:00 |
|
maxwell
|
31d33054ef
|
added jammit, now js and css compress for production
|
2010-11-17 21:51:59 -08:00 |
|
zhitomirskiyi
|
af6185294e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 21:38:28 -08:00 |
|
zhitomirskiyi
|
c3f65d45a1
|
added nginx logging
|
2010-11-17 21:35:13 -08:00 |
|
Sarah Mei
|
2949dd8796
|
cucumber feature for accepting a contact request.
|
2010-11-17 21:34:47 -08:00 |
|
danielvincent
|
9041a81fea
|
cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
|
2010-11-17 21:21:00 -08:00 |
|
Raphael
|
ea25b28c5c
|
refactor splunk recipe
|
2010-11-17 21:18:43 -08:00 |
|
maxwell
|
3db8da992a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:12 -08:00 |
|
maxwell
|
c08a991130
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 20:14:00 -08:00 |
|
danielvincent
|
1a9041a3c0
|
DG MS; fixed cucumber tests to work with new landing page flow
|
2010-11-17 19:49:01 -08:00 |
|
danielvincent
|
056dc7d3ba
|
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
a7c1733093
|
firefox fixes and added links to press articles on landing page
|
2010-11-17 19:37:08 -08:00 |
|
danielvincent
|
f59f6be4b0
|
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
|
2010-11-17 19:37:08 -08:00 |
|
Raphael
|
37a694ed1f
|
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
|
2010-11-17 18:49:03 -08:00 |
|
Raphael
|
cb23ed1136
|
typo
|
2010-11-17 18:49:03 -08:00 |
|
maxwell
|
1a279de573
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-17 16:18:07 -08:00 |
|
maxwell
|
f442c6fe3e
|
taking out the if true
|
2010-11-17 16:17:52 -08:00 |
|
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 |
|