Dennis Collinson
09f40c8684
Feature Flag new publisher
2012-03-27 15:28:30 -07:00
Dennis Collinson
426f0278f9
DG DC uploading a photo shows up in the stream
2012-03-27 14:52:51 -07:00
Dennis Collinson
1ec2b73d59
DG DC remotipartjarvascripts
2012-03-27 14:52:51 -07:00
danielgrippi
6dce04d2f5
callbax, yo
2012-03-27 14:52:51 -07:00
Dennis Collinson
37bf5c5aee
REMOTIPART WIP
2012-03-27 14:52:51 -07:00
Dennis Collinson
ab35f2bf3d
MS DC posts/new page init
2012-03-27 14:51:40 -07:00
Stephan Schulz
716315409a
Limit allowed contacts for sending messages to, to the ones that are sharing with you.
2012-03-23 01:21:04 +01:00
Dennis Collective
47dbced6d7
Merge pull request #3028 from diasp/fix-weekly-user-stats
...
Admin: handle users without created at date [ci skip]
2012-03-22 14:38:02 -07:00
Diaspora Europe
88bb3403d8
added 3 invalid status message specs
2012-03-22 17:24:30 +01:00
Diaspora Europe
97233851df
added status message spec, fix render nothing
2012-03-22 16:52:19 +01:00
danielgrippi
0883ce1dbb
fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly
2012-03-21 13:50:24 -07:00
Jonne Haß
3c23364fbc
refactor locale initialization and selection a bit
2012-03-21 19:25:47 +01:00
Diaspora Europe
30af2e7188
handle users without created at date
2012-03-21 09:56:06 +01:00
Maxwell Salzberg
aee17798c1
rearrange some of the invite link stuff. This still needs some serious love but we now place emphisis on the link, rather than the email form
2012-03-17 17:10:08 -07:00
danielgrippi
852687b31c
MS DG fix a few final tests
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
11505a386c
adding a test for decremented invites, as, and check the invite is valid in the controller
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
319b3c4d3b
fixed rspec tests, more fit and finish around how the invite code works,
...
and improving admin functionality
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
6b97b8044b
small updates, and it looks like we are mostly working
2012-03-16 17:56:35 -07:00
Maxwell Salzberg
7bac633987
invite_link functionailty mostly works
2012-03-16 17:56:35 -07:00
Diaspora Europe
e78fc82bea
we need json for the notification dropdown #2998
2012-03-14 16:31:54 +01:00
Maxwell Salzberg
b8b6557379
adding an ajax loader, and pull out the js from the middle of the view
2012-03-13 17:10:23 -07:00
Maxwell Salzberg
2a30e60fe0
Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly
2012-03-13 16:41:16 -07:00
Maxwell Salzberg
fa247c23ae
Merge pull request #2998 from diasp/notification-chore
...
Notifications update spec and cleanup json response [ci skip]
2012-03-13 15:56:24 -07:00
Maxwell Salzberg
dfd0248a78
Merge pull request #2991 from ChFernandez/master
...
Pod Administration[ci skip]
2012-03-13 15:47:57 -07:00
Diaspora Europe
746a144dac
now redirect to stream
2012-03-13 18:07:42 +01:00
Diaspora Europe
97d6b8dab8
notifications update spec and cleanup json response
2012-03-13 11:46:14 +01:00
Steven Hancock
f2922c943c
Cross-Origin Resource Sharing
...
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.
CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.
closes #2216
2012-03-10 23:49:56 -08:00
chfernandez
b8ca31b6b3
improved weekly_user_stats in admin with a dropdown box by week to list all new users of that week also a link_to the user profile so the admin can sent welcome msgs, etc
2012-03-10 19:08:19 -08:00
Steven Fuchs
d84b0c58bd
simplify search results processing since only one person can be returned
2012-03-07 23:19:51 -05:00
Steven Fuchs
7d3a6a061c
add spec to ake sure background query is only set when a full diaspora id is given.
2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50
fixing conflicts in merge
2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e
run second search ajaxily when no results are found from remote pod.
2012-03-07 23:19:50 -05:00
danielgrippi
61b4e77bde
Merge branch 'profiles'
2012-02-28 10:29:17 -08:00
Dennis Collective
7abbe4a642
Merge pull request #2925 from diasp/2833-conversations-should-return-json
...
Conversations should return json #2833
2012-02-27 17:34:10 -08:00
Dennis Collective
f5ef1e8c14
Merge pull request #2814 from stwf/aspects-javascript-fixes
...
update aspect name in aspects listing after editing.
2012-02-27 17:19:05 -08:00
danielgrippi
0112285985
Merge branch 'master' into profiles
...
Conflicts:
lib/diaspora/shareable.rb
2012-02-27 14:27:05 -08:00
Maxwell Salzberg
49b0a44738
removing estates builder, as we are now using a template
2012-02-25 16:55:26 -08:00
Maxwell Salzberg
a1f39398be
Merge pull request #2902 from JMSilla/master
...
Fix atom feed bug (bug mash 7) [ci skip]
2012-02-25 16:47:13 -08:00
JMSilla
8178e0712c
Users controller small fix; removed the to_activity method and the corresponding tests for status_message model
2012-02-25 22:24:43 +00:00
danielgrippi
73f224e690
don't render page-viewer twice; last_post should actually get the last post posted, not the first one
2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac
Merge branch 'profiles' of github.com:diaspora/diaspora into profiles
2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc
MS DC show last post and show page works unauthenticated
...
phasing out app.user() for app.currentUser
2012-02-24 19:09:00 -08:00
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -08:00
Diaspora Europe
89179ecbd3
conversations should return JSON #2833
2012-02-24 09:39:40 +01:00
Dennis Collinson
9769dfb303
cukes passing
2012-02-23 17:24:19 -08:00
danielgrippi
b4923a77f0
add keybinding to the viewer
2012-02-22 19:19:24 -08:00
danielgrippi
8f3cc6769c
update reshare count when resharing; return PostPresenter for reshare root in the success response
2012-02-22 18:02:08 -08:00
danielgrippi
3ec7755c83
update reshare count when resharing; return PostPresenter for reshare root in the success response
2012-02-21 21:51:40 -08:00
danielgrippi
899136d0e5
display proper counts after feedback actions; modified destroy responses to return PostPresenter objects
2012-02-21 21:44:44 -08:00
danielgrippi
6965d6da24
fix feedback views. use gross callbacks for now
2012-02-21 15:23:29 -08:00
