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

2198 commits

Author SHA1 Message Date
Fabián Rodríguez
7472642bd1 Refactor: 
*people_controller#show
  *photos_controller#index
  *views/people/show both html and mobile
 2013-02-23 22:36:03 -02:00
Jonne Haß
35350d1ceb Include reshares in the public user feed, closes #1781 2013-02-21 14:32:28 +01:00
Jonne Haß
0fd3bcb397 move custom splash page login into the controller, fixes #3991 2013-02-21 13:46:04 +01:00
Florian Staudacher
4cbae601e8 [WIP] aspect membership dropdown Backbone.js rework 
* initial backbone port
* changed AspectMembershipsController#destroy to use aspect_membership_id
* included rudimentary jasmine specs
* more specs, updating the list elements after de-/selection
* update selected aspect count on button
* don't even try to render html in AspectMembershipsController
* more specs for button summary text
* adapt aspect management on contacts page and in the popup boxes
* adapt inline creation of aspects + memberships

TODO
* more tests
 2013-02-17 13:40:10 +01:00
Lennart Prelle
2d0abe8309 added a id and a autoscroll to first unread message in conversation (Fix: #3216) 2013-02-11 16:15:01 +01:00
Asphyxia
389e93a3ae Stream form on profile page 2013-01-31 00:15:27 -03:00
Jonne Haß
d398365641 Merge branch 'movilla-settings_mobile' into develop 2013-01-29 15:13:19 +01:00
Fabián Rodríguez
649844ea6a Refactor contacts/index 2013-01-29 10:01:08 -02:00
movilla
0010819343 add settings web mobile 2013-01-27 20:38:19 +01:00
Fabián Rodríguez
a3162d76dd little refactor in streams_controller 2013-01-16 19:33:19 -02:00
Fabián Rodríguez
aabbea6ee2 fix issue #3671 reshare a post multiple times 2013-01-12 04:52:56 -02:00
Florian Staudacher
0092acd492 re-add hovercards 
* added a presenter for hovercard json
* added new backbone view for handling hovercard JS
* refactoring of PeopleController

* finished the backbone js version of hovercards
* don't try to make people_controller more restfull, out of scope
  just add a new route and use that for hovercard json
* added spec for people_controller#hovercard
* add new exception for "AccountClosed" to be able to raise from anywhere

* removed legacy code, since everything got ported to backbone
  (except the "cache" stuff, but that's not strictly necessary)
 2012-12-28 22:37:13 +01:00
movilla
597ab20715 Show error and flash-notice when sending messages to non contacts 2012-12-26 12:23:37 +01:00
movilla
c1b858a877 Mark all unread post-related notifications as read, if one of this gets opened 2012-12-24 00:13:32 +01:00
Jonne Haß
7b548fd571 Merge pull request #3713 from davecocoa/feature/3630-backbone-ify-followed-tags 
port tagFollowings to BackBone
 2012-11-25 09:30:47 -08:00
rschaden
49d4079065 add email validation to invitations 2012-11-25 14:25:20 +01:00
Jonne Haß
5f6e03cfe5 Merge pull request #3714 from marpo60/refactor 
Housekeeping
 2012-11-22 01:06:05 -08:00
David McMullin
97664cb880 port tagFollowings to BackBone 2012-11-12 21:37:00 +00:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
Braulio Martinez
3260bada38 Remove posts#new action from Rails and related tests 2012-11-07 23:14:35 -02:00
Fabián Rodríguez
76c48f3c9c privatize non-action controller method 2012-11-06 21:39:36 -02:00
Jason Robinson
b96fbb0676 Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup. 2012-11-01 21:50:31 +02:00
Gonzalo
7e0c8bdf68 Remove unreachable line of code 2012-10-15 20:25:10 -02:00
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
Fabián Rodríguez
82082005ba redirect users back on registration failure 2012-10-11 19:47:04 -02:00
Florian Staudacher
83ab60ab9e Merge branch 'hotfix/mobile-bookmarklet' into develop 
fix layout determination for mobile bookmarklet
 2012-10-05 12:25:33 +02:00
Jason Robinson
a26dc34a7b Fix broken mobile bookmarklet, isse #3613 2012-10-05 09:53:19 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
Marek Lewandowski
125e45cdba Force user to authenticate instead of raising error 2012-09-29 16:57:34 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Jonne Haß
6c1a1ec6d2 it's enviroNment 2012-09-15 18:52:12 +02:00
Jonne Haß
4bada36bf1 do not redirect admin to his profile upon sign in 2012-09-14 15:01:19 +02:00
Jonne Haß
7ec2f8f419 finish beta striping 
A lot of cleanup is still needed, refactoring the CSS to be consistent, removing all sorts of unused stuff etc
 2012-09-12 07:51:19 +02:00
Jonne Haß
ab0ad630df strip last beta leftovers and fix syntax errors, travis is kinda down, lets hope nothing breaks while I sleep 2012-09-12 05:48:12 +02:00
Jonne Haß
ffde639f4d Merge branch 'betastrip' of git://github.com/DeadSuperHero/diaspora 2012-09-12 04:55:10 +02:00
Sean Tilley
49ea8c8563 Strip Beta Features 2012-09-11 21:52:53 -05:00
Jonne Haß
edc9d75df7 remove deprecation warning about outdated render call 2012-09-07 01:55:53 +02:00
movilla
c0c568365a Fix blank page 404 on mobile 2012-09-04 00:09:45 +02:00
Florian Staudacher
45223fd634 Merge pull request #3520 from movilla/new_mobile_resgistrations_ 
New mobile page registrations, add an error message to registrations page, friendlier design, add placeholders and ().upcase
 2012-08-31 01:17:20 -07:00
movilla
6c6be3e22a New mobile_web registrations 2012-08-29 23:09:52 +02:00
Daniel Grippi
b8f7d025d5 update landing page 2012-08-24 13:45:05 -07:00
Maxwell Salzberg
2b2e5f1739 Merge pull request #3501 from movilla/private_conversation_new_0 
Added private conversation for mobile - #1397
 2012-08-20 10:52:07 -07:00
movilla
9913f40a38 Added private conversation for mobile 2012-08-20 16:33:05 +02:00
Maxwell Salzberg
35937b24b7 dont beta0fiy users. going all in 2012-08-19 23:11:06 -07:00
Jonne Haß
42b8e8f1ea if you have a : in a translatable string and no %{} you already know you're doing it wrong [ci skip] 2012-08-04 19:46:29 +02:00
Florian Staudacher
9d11748486 added minimal layout for bookmarklet popup 2012-08-04 14:48:18 +02:00
movilla
ef1e4fa318 little translation to send invitations 2012-08-03 15:31:34 +02:00
Florian Staudacher
fd6d41ddad require authentication for invite actions 2012-07-22 02:42:39 +02:00
movilla
5eab1226f6 Fix error admins/weekly_user_stats 2012-07-07 22:33:56 +03:00
Florian Staudacher
1809897aa2 should fix the mobile toggle for the case: desktop --to--> mobile #3299 
also, (possibly) fix tablet issue #3421, + tests
 2012-07-04 01:47:55 +02:00
Zach Scott
82a47d0ba3 Fixed Issue #3382 - The comments under postings are missing when using the #tags -view 2012-06-18 22:46:01 -06:00
Florian Staudacher
d3b70a7f3a small typo [ci skip] 2012-06-18 23:40:18 +02:00
Florian Staudacher
0596f5345d use default format in case a tablet device is detected 2012-06-18 22:50:15 +02:00
Steven Hancock
a8de3a5a3f Rails.root and File.join cleanup 
- `Rails.root` is a `Pathname`, so let's use `Rails.root.join`
- Clean up most of the remaining `File.join`s
 2012-06-11 03:13:20 -07:00
Florian Staudacher
8ca39f5936 show a "post is not public" message when visitor is not logged in 
and tries to access a show page of a non-public post
 2012-06-07 22:16:37 +02:00
David Morley
d3b5e330b3 allow interactions to be viewed on public posts when not logged in 2012-06-03 21:49:08 -03:00
danielgrippi
3e09d4ed14 Revert "don't seed beta users with default aspects" 
This reverts commit 946f78b025.
 2012-05-24 11:42:52 -07:00
danielgrippi
946f78b025 don't seed beta users with default aspects 2012-05-24 11:37:34 -07:00
Dan Hansen
cf847d61ba bug mash #5 
fix NoMethodError on InvitationsController
 2012-05-23 13:05:01 -07:00
danielgrippi
72f718c8c3 new login page. kept the old one for safe keeping. 2012-05-19 11:10:17 -07:00
Maxwell Salzberg
593fa0ed8e stupid hack for photos 2012-05-17 21:49:04 -07:00
Maxwell Salzberg
133c9ee0c3 remove deprecation warnings about the template handler in rails 3.2 2012-05-17 18:23:39 -07:00
Maxwell Salzberg
69d81951a5 wip 2012-05-17 14:55:22 -07:00
Maxwell Salzberg
455dc34eae remove hotlink controller, just rewrite those landing assets 2012-05-16 15:02:59 -07:00
danielgrippi
08fddf7422 raise on hotlinking [ci skip] 2012-05-16 14:41:09 -07:00
Movilla
a3daa00a41 Rebase Add translation app/views/admins/stats.html.haml for Admin Panel 2012-05-15 22:27:08 +02:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Dennis Collinson
a90968ea2d basic experimental stream 2012-05-14 17:57:02 -07:00
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
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
danielgrippi
f31418feb3 pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now 2012-02-21 15:23:29 -08:00
danielgrippi
30de08b340 fix post presenter / arrow ordering 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4 haxy auto comment functionality; try me and then revert me" 2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7 DG MS; added a new layout for post pages. 2012-02-21 15:23:27 -08:00
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
David Morley
a63bcd0080 make popular tags human readable 2012-02-19 21:28:12 -06:00
Maxwell Salzberg
28504f09bb federation logger now in place. 2012-02-18 16:28:04 -08:00
Maxwell Salzberg
d7f56e556b use the user presenter, luke 2012-02-18 16:28:03 -08:00
danielgrippi
debdd6cb6b change routes to properly reflect page names (activity/stream). 2012-02-18 16:26:16 -08:00
Maxwell Salzberg
a81d1133cb basic federation profile testing stuff 2012-02-18 16:26:16 -08:00
danielgrippi
2f7465450e you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-18 16:26:15 -08:00
danielgrippi
b139cc5479 DC DG; a participation is created in StatusMessageController 2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4 fix a bunch of small css related media box issues [ci skip] 2012-02-18 16:26:13 -08:00
Diaspora Europe
92b29d31db added user_is_following method, added 2 model specs 2012-02-18 16:26:10 -08:00
Diaspora Europe
55cb328fe2 tags should be case insensitive 2012-02-18 16:26:10 -08:00
JMSilla
123e7ba3cb Fix problem with atom feed entry titles being too long (2) 2012-02-18 16:20:02 +00:00
Maxwell Salzberg
ab727fc846 federation logger now in place. 2012-02-16 17:58:15 -08:00
Maxwell Salzberg
063912287c use the user presenter, luke 2012-02-16 13:19:14 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Maxwell Salzberg
54e8040bfd basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
44e072c330 DC DG; a participation is created in StatusMessageController 2012-02-10 16:42:21 -08:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +01:00
Diaspora Europe
8eda9aaf52 added user_is_following method, added 2 model specs 2012-02-09 14:17:43 +01:00
Diaspora Europe
47f7e10860 tags should be case insensitive 2012-02-09 14:17:43 +01:00
Dennis Collinson
74409d64b5 cleanup, yoq 2012-02-08 17:25:25 -08:00
Maxwell Salzberg
062204e963 Merge pull request #2848 from beardedninja/master 
#2847 Users can now toggle nsfw on and off
 2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323 Merge pull request #2839 from diasp/2036-fix-private-messages-navigation 
#2036 Fix private messages are sometimes displayed without navigation
 2012-02-08 16:59:50 -08:00
Dennis Collinson
94a7f5bb91 unsfw - sorry Kinky Joe! 2012-02-08 16:35:55 -08:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Alex Harrison
0cbdf51e6a #2847 Users can now toggle nsfw on and off 2012-02-08 23:01:02 +01:00
Diaspora Europe
3c4b37dad7 PMs should always be displayed with the navigation. 2012-02-08 16:53:48 +01:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Dennis Collinson
a399572995 MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things 2012-02-06 16:51:32 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
danielgrippi
a3e13e3c0e User#like! method. 2012-02-03 14:42:03 -08:00
Steven Fuchs
ef7dc1c017 update aspect name in page listing after editing. 2012-02-03 08:37:35 -05:00
Dennis Collective
6dbd644b01 Merge pull request #2719 from stwf/return-contact-popup-to-notify 
aspects popup menu missing from 'started sharing' notifications
 2012-02-03 00:42:10 -08:00
danielgrippi
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -08:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -08:00
Maxwell Salzberg
5914ed4ef1 defer comments posting in comment controller 2012-01-30 11:34:50 -08:00
Steven Fuchs
5ea4bc0a1b Merge remote branch 'upstream/master' into return-contact-popup-to-notify 2012-01-29 18:13:30 -05:00
Jonne Haß
0e7b084713 fix 500 in PostsController#show for non existing post 2012-01-29 14:47:51 +01:00
Maxwell Salzberg
13d1e68540 refactor people#index 2012-01-28 23:48:37 -08:00
Sarah Mei
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -08:00
Sarah Mei
03e3d8e993 Refactor contacts#index to have explicit html and mobile formats again, because apparently infinite scroll wants the html version, not the json version. 2012-01-28 15:31:11 -08:00
Sarah Mei
a27b17bc68 Slight refactor to contacts#index 2012-01-28 15:31:11 -08:00
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -08:00
Sarah Mei
7d4a81560d Move contact pagination to controller - fixes #2760 2012-01-27 21:56:27 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
c69df0fb29 fix photos controller test 2012-01-27 13:06:27 -08:00
Maxwell Salzberg
e2cb572c15 random cleanup; delete some unused methods, clean up some logic in some 
controllers; update the default referee to /stream [ci skip]
 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
c100f8bfdd clean up Person scopes, and re-use one in contact controller to deprecate a controller method 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
7cef6a8d22 remove unneeded line from apps_controller [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
46da8310f5 small styling changes 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
8002091d67 kinda refactor another sucky controller method 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
c43bb90794 we never use this data [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
718c4fd38c refactor status_message_controller#create to suck less. it still sucks 2012-01-27 02:23:37 -08:00
Steven Fuchs
9e337fc8b0 read_all button on notifications page redirects to stream. 2012-01-25 19:03:31 -05:00
Jonne Haß
e1658f8d8b switch PhotosController#index over to guid, fix #2729 2012-01-25 12:45:02 +01:00
Jonne Haß
9c67cd7eb9 collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order 2012-01-25 12:44:50 +01:00
Daniel Grippi
89472992cc Merge pull request #2720 from MrZYX/people_slash_guid 
use guid instead of id for /people/ urls
 2012-01-24 13:14:08 -08:00
Jonne Haß
19785d909b ensure services is an array in StatusMessagesController#create 
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
 2012-01-24 18:54:36 +01:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
Jonne Haß
12575bd7f0 update http_accept_language and try to find the preferred locale first, should fix #2715 2012-01-23 14:59:09 +01:00
danielgrippi
778683f3e3 don't extend helpers in the notifications index view; make notification_count and unread_message_count controller helper methods (now that we're not using vanna) 2012-01-22 22:26:27 -08:00
Daniel Grippi
2c50de0726 Merge pull request #2714 from stwf/im-sorry-bye-vanna 
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
 2012-01-22 22:15:14 -08:00
Steven Fuchs
7cbcaafbeb oops, application_helper gone from application_controller. 2012-01-22 23:28:55 -05:00
Steven Fuchs
052690941b move set_header_data back into application_controller 2012-01-22 23:23:21 -05:00
Steven Fuchs
e882dedd33 remove vanna controller from app, adjust scripts, specs, views and controllers to work. 2012-01-22 17:39:35 -05:00
danielgrippi
740cedde44 temporarly remove newrelic_ignore in PublicsController for heroku analysis 2012-01-22 14:12:24 -08:00
Sarah Mei
872a96dc71 Refactor services controller spec 2012-01-22 08:28:23 -08:00