nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12642 commits 4 branches 0 tags 121 MiB
Commit graph

1978 commits

Author SHA1 Message Date
Maxwell Salzberg
06f389231a kill services users with fire. we need this feature, but we need to just start from scratch because this is redonkalonk 2012-05-14 16:25:19 -07:00
Dennis Collinson
f6e3c1b88b seperate interactions from posts 
Lazily load post interactions on show page
hella refactorz
 2012-05-12 17:41:58 -07:00
danielgrippi
81661c883f custom landing page logic for mobile. yay 2012-05-11 17:05:09 -07:00
danielgrippi
a3ca176d74 new getting started page [ci skip] 2012-05-10 20:43:00 -07:00
Dennis Collinson
51b1ade3bc DC DG; added LastThreeComments decorator so we don't have to load those comments when not needed (i.e. new profile pages) 2012-05-10 13:53:00 -07:00
Dennis Collinson
efa79a4ad7 Refactor Post Presenter 
and comment presenter
 2012-05-10 12:24:21 -07:00
Maxwell Salzberg
eaedfc9827 create a new publisher using the new composer. only for beta users 2012-05-09 16:55:33 -07:00
Dennis Collinson
93afe6d63c rescue update services on login 
was failing in development
 2012-05-08 20:38:45 -07:00
Daniel Grippi
be43806ef9 Merge pull request #3245 from SuperTux88/fix-publisher-for-beta 
Fix new publisher if user is beta
 2012-05-08 18:42:55 -07:00
Benjamin Neff
1bc1dc4334 Fix new publisher if user is beta 2012-05-09 03:33:50 +02:00
danielgrippi
0ec364e44c DG MS; popup on services, inlined in the composer 2012-05-08 18:09:33 -07:00
Dennis Collinson
1c135b61fd Jamie Cai DC message in profile when user has no posts 2012-05-07 15:56:30 -07:00
danielgrippi
01d5c0473a DG MS; don't redirect to legacy getting started if you're a beta user 2012-05-07 12:05:36 -07:00
danielgrippi
92230383a7 added controller test; put wallpaper into separate wallpaper/ directory 2012-05-06 12:35:11 -07:00
danielgrippi
56913ffb80 upload wallpaper for great success. 2012-05-06 12:35:11 -07:00
Dennis Collinson
bd6a9cfe00 next and previous now return post as json 
clean up controller
 2012-05-05 16:41:16 -07:00
Dennis Collinson
0fc399243b fix next post and previous post, more efficient 
make controller actions
make the presenter reflect that it is instance data ;-p

needs tests lol.
 2012-05-04 18:25:09 -07:00
Maxwell Salzberg
e79d78302e when a user is invited from a beta user, they are also beta 2012-05-04 17:38:08 -07:00
danielgrippi
bae47a10eb use layout in our actual controller. derp. [ci skip] 2012-05-04 17:38:07 -07:00
Dennis Collinson
4253796f55 preload post on post show 2012-05-04 16:55:09 -07:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
ab99154a1a add FeatureFlagger to HomeController instead of making calls to Role directly 2012-05-02 20:41:01 -07:00
Sean Tilley
cf129b52ab Merge pull request #3197 from ktkaushik/my-modifications 
optimizied code for destroy action under tag_followings_controller.rb [ci skip]
 2012-04-28 21:27:47 -07:00
danielgrippi
1b6c33aff5 show a user's full profile info if she's on her own page. duh. 2012-04-28 17:41:22 -07:00
danielgrippi
d5f511c325 hitting profiles.json publically displays only public stuff; if you're connected to a user, it shows that user's complete profile response 2012-04-28 17:05:25 -07:00
danielgrippi
c3b0bbd425 show new profile pages for those who have it activated 2012-04-28 16:06:36 -07:00
danielgrippi
bbd4ee5738 correctly redirect for beta and admin users (profile vs stream homepages) 2012-04-28 15:09:02 -07:00
Kaushik Thirthappa
a1f25a475d optimizied code for destroy action for tags that a user is following. 2012-04-28 15:36:57 +05:30
danielgrippi
05683de16b removed some old assets; added a link to profile edit next to quick stats on a profile page 2012-04-27 17:41:59 -07:00
Maxwell Salzberg
2b3bc5a0f0 fix profile json birthday response with some tests. 2012-04-26 16:00:23 -07:00
Maxwell Salzberg
fe87b38bf2 use birthday as text. 2012-04-26 15:01:43 -07:00
danielgrippi
d3b874b020 add basic profile info to profile; remove random console.logs [ci skip] 2012-04-26 14:52:48 -07:00
Dennis Collinson
2cbf383fbb only redirect on html requests 2012-04-24 21:01:19 -07:00
Dennis Collinson
340411f17c MS DC; admins are now always redirected to new profile 2012-04-24 18:39:09 -07:00
danielgrippi
84bd1fb1fc return the person json response for profiles to get a correctly formatted name and expected avatar response; fix a jasmine spec around redirection 2012-04-23 23:31:39 -07:00
Dennis Collinson
afc26c684b DC MS infinite scroll with isotope on new profile page. boom! 2012-04-22 16:46:39 -07:00
danielgrippi
75d25e9475 users can now favorite posts 2012-04-22 12:06:15 -07:00
Dennis Collinson
062de4c269 MDC DC New Profile shows users info 
Profile show json
Profile backbone model
 2012-04-21 13:12:56 -07:00
danielgrippi
6d9dd1f4d3 skeleton in place. 2012-04-21 13:12:56 -07:00
Movilla
7b203e3636 Better fix issue #3134 2012-04-20 16:07:31 +02:00
Maxwell Salzberg
8b50f80875 be pedantic in posts show as maybe certain crawlers are being greedy as to what formats they can accept 2012-04-19 20:07:14 -07:00
Maxwell Salzberg
ab48ca260b kinda ugly hack for ports in url with iframes 2012-04-18 16:12:57 -07:00
Maxwell Salzberg
c9e3852de8 oembed mostly works 2012-04-18 16:12:56 -07:00
Maxwell Salzberg
90a2f05515 include an iframe route, for posts, and a magic body padding removal for screens with small widths (for some reason, smaller than 770 2012-04-17 22:28:01 -07:00
Maxwell Salzberg
1a7ec495c9 Merge pull request #3136 from movilla/Auto_fix 
Issue #3134:Problem with translation in authorizations/new.html.haml
 2012-04-17 13:52:29 -07:00
Maxwell Salzberg
17b451e4ad tags for logging [ci skip] 2012-04-15 17:04:53 -07:00
Maxwell Salzberg
b0e4c477bf log more in authorizations controller :( 2012-04-15 17:03:09 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Movilla
7193bf7777 Issue #3134:Problem with translation in authorizations/new.html.haml 2012-04-11 00:00:41 +02:00
danielgrippi
59917e95ab update feature_flagger to have access to current user 2012-04-04 19:35:53 -07:00
Steven Hancock
fc4b8d2af0 Skip CSRF token for OmniAuth callbacks (prevents session reset) 
OmniAuth callbacks need to accept a raw POST from the auth provider without
verifying the CSRF token, otherwise the session will be reset.

See intridea/omniauth#203
See also http://www.communityguides.eu/articles/16

(This technique will also be needed for API endpoints when the time comes)
 2012-03-29 18:51:54 -07:00
Maxwell Salzberg
033bf637cd Merge pull request #3070 from SuperTux88/fix-invite-mail 
Fix invite mail NOTICE: MIGRATION ON USERS INCLUDED!
 2012-03-29 15:41:23 -07:00
Steven Hancock
6abe718227 Mobile UI fixes 
This fixes issues with mobile UI rendering

Issues fixed:
* vendor/bootstrap.css and vendor/bootstrap-responsive.css need to
  be precompiled for the mobile UI to render properly
* Rails 3.1 is more strict about layout fallbacks, the single-post
  view in the mobile UI needs to have the "application" layout
  specified to render properly
 2012-03-29 05:52:45 -07:00
Maxwell Salzberg
402694e516 fixing cukes 2012-03-28 14:47:28 -07:00
Benjamin Neff
92c799f699 add email action 2012-03-28 03:16:49 +02:00
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