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

4331 commits

Author SHA1 Message Date
danielgrippi
fdaa44ca9c add hovercards to links in likes 2011-07-06 21:09:24 -07:00
danielgrippi
f0fa79bb09 Revert "ordered hash stuff" 
This reverts commit 2d98b939d1.
 2011-07-06 19:13:34 -07:00
danielgrippi
2d98b939d1 ordered hash stuff 2011-07-06 19:11:53 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
Raphael Sofaer
03df3e3e59 Fix manages_aspects feature 2011-07-06 19:00:28 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8d94115bbc added the start conversation button back with a message if you try to add more than 16 people 2011-07-06 16:05:12 -07:00
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
Raphael Sofaer
9765bdc391 Don't get posts for a hovercard request 2011-07-06 14:11:07 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
danielgrippi
d51e9431a6 fixed some styling/positioning. don't display a hovercard for the current user's person links 2011-07-06 12:45:16 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0 made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses 2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys 
1137 bad rsa keys
 2011-07-06 10:00:44 -07:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
danielgrippi
d74942877f touch up message inbox view 2011-07-06 00:38:25 -07:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
Raphael Sofaer
2a9fc776e6 Downcase tag name in tagscontroller 2011-07-05 18:03:46 -07:00
Raphael Sofaer
efd6275e68 Don't instantiate objects in tag_string 2011-07-05 17:56:38 -07:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
danielgrippi
41be7a37b0 hide aspect dropdowns on tag show temporarily 2011-07-05 16:42:32 -07:00
danielgrippi
ecaf7974e3 removed fixed sidebar for tag following 2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
edac7601f5 checkedout the create.js from master 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d15673c3de changed the variable name 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00
danielgrippi
632eacc51f css fix on followed tags nav 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1e4ee472b7 WIP you can now follow a tag, needs a clean up, and ajax love 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
77d28b4117 wip following tags 2011-07-05 15:03:26 -07:00
danielgrippi
47aab723bd fix message focus bug 2011-07-05 12:17:23 -07:00
danielgrippi
f5e3c4c0d7 fixed the specs. 2011-07-05 11:29:45 -07:00
danielgrippi
ecd79766ce remove aspect badges 2011-07-04 22:36:21 -07:00
Raphael Sofaer
162f035c62 Merge branch 'ajaxy-likes' 2011-07-04 22:12:12 -07:00
Raphael Sofaer
4f056dca8e Ajax in likes in stream 2011-07-04 22:10:30 -07:00
danielgrippi
1aed8e7e16 testing fixing left nav on aspect/index 2011-07-04 21:55:04 -07:00
Ryan Hughes
00589c10c6 If one user has a bad rsa key, don't abort all sends. 2011-07-04 18:00:55 -07:00
danielgrippi
d75a682199 compress png 2011-07-04 17:26:34 -07:00
danielgrippi
9debec4410 fix the build. 2011-07-04 16:53:43 -07:00
danielgrippi
00448f615e dont try to preload photos as they are only for StatusMessages. ugh. 2011-07-04 16:38:28 -07:00
danielgrippi
85d6eb70e7 fix cubbies info page (removed reference to token, changed infographic) 2011-07-04 16:14:05 -07:00
danielgrippi
9eac29d15e preload people and their profiles in comments on aspects/index 2011-07-04 16:14:04 -07:00
Maxwell Salzberg
b645a77be9 translate a string in services#index view 2011-07-04 13:59:44 -07:00
Maxwell Salzberg
408690f0fa remove stray puts 2011-07-04 13:57:23 -07:00
Maxwell Salzberg
2f1118f95f refactor AppConfig to guess what services are configured, and clean up the services view for a user. also, add a box so people can realize what they can connect 2011-07-04 13:54:05 -07:00
Raphael Sofaer
04f8abcf13 Check for all aspects in selected_contacts link switch, take out a couple extra steps 2011-07-04 08:39:07 -07:00
Raphael Sofaer
a715630471 make cucumber faster by logging in through a much simpler stubby controller. Save about 1m on my laptop. 2011-07-04 08:11:12 -07:00
Raphael Sofaer
af6547815e Some view helper cleanup 2011-07-04 07:36:01 -07:00
danielgrippi
403d18bac4 fixed content expander in comments; comments have a smaller limit than posts 2011-07-03 22:06:58 -07:00
Michael Sofaer
d2b7168195 Use an explicit per_page param instead of switching on format 2011-07-03 21:16:58 -07:00
danielgrippi
511a651377 don't query for mentioned people if mention syntax isn't present in message text. 2011-07-03 20:36:46 -07:00
danielgrippi
829c86823d remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them 2011-07-03 20:08:11 -07:00
danielgrippi
04e53fa1fc remove unused aspect helper methods 2011-07-03 19:20:50 -07:00
Maxwell Salzberg
73172f9c22 remove completely unused method #yay 2011-07-03 18:04:00 -07:00
danielgrippi
45834f1edf remove 'start a conversation button' until we have a limit, or a warning message if a person is sending a message to more than ~20 people 2011-07-03 14:50:37 -07:00
Maxwell Salzberg
a104f4e309 if a user is logged in, redirect them to the proper authenticated view, not the public route 2011-07-03 09:13:39 -07:00
Maxwell Salzberg
4b0157f5b0 fix notification mark all as read ui bug 2011-07-03 08:20:24 -07:00
Maxwell Salzberg
6f72a0cb38 order facebook friends 2011-07-02 19:01:58 -07:00
danielgrippi
8a8f8db9ad Merge branch 'notifications' 2011-07-02 17:53:55 -07:00
danielgrippi
9ec905560c visual touchups, show loading gif right away 2011-07-02 17:53:07 -07:00
Dan Hansen
eb0fbe519c remove read/unread state, always mark notifications as read, only return 5 notifications for json requests 2011-07-02 16:39:01 -07:00
Raphael Sofaer
f161377480 Stop loading contact objects on the main page, all we need is people 2011-07-02 16:28:52 -07:00
danielgrippi
24d84d7756 fixed stupid 500 caused by publisher 2011-07-02 16:02:14 -07:00
danielgrippi
689bde2e5f take out useless 'reshare' 2011-07-02 15:41:50 -07:00
Raphael Sofaer
86c06c4d15 Try taking out some contact loading again 2011-07-02 14:43:15 -07:00
Raphael Sofaer
6b46d69b65 Revert "Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost." 
This reverts commit 7baeaebe57.
 2011-07-02 14:38:17 -07:00
Raphael Sofaer
7baeaebe57 Take off the including of contacts in aspectscontroller. Cross your fingers for a performance boost. 2011-07-02 12:39:25 -07:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
mb-log
64898c522e Don't need edit button on public profiles 2011-07-02 16:56:09 +02:00
Dan Hansen & Daniel Grippi
b48b182c73 STYLIN' 2011-07-02 00:04:14 -07:00
Raphael Sofaer
49d905c719 Some more translation stuff. @MrZYX the content thing in the Diaspora ID explanation is messed up, what's the best way to get bold text into the translation string? 2011-07-01 23:27:53 -07:00
Dan Hansen
05688c2f43 notifications wip 2011-07-01 22:46:54 -07:00
danielgrippi
922ccd8423 limit contact photos in aspect/index.js 2011-07-01 22:30:21 -07:00
danielgrippi
24483548ec need to grab all contacts on aspect index for autocomplete 2011-07-01 22:26:08 -07:00
danielgrippi
e0816ccc39 author info in stream element should be incased in a div. WHOOPS. 2011-07-01 22:12:43 -07:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -07:00
danielgrippi
1a2ba034ab added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index 2011-07-01 17:23:58 -07:00
danielgrippi
f90dc0996a More visual cleanup; top nav; edit aspects 2011-07-01 16:12:14 -07:00
danielgrippi
41773cb29e Almost done with left-nav, added link to aspect edit facebox, colored share button 2011-07-01 14:22:38 -07:00
danielgrippi
cd9be3904b publisher rework 2011-07-01 10:51:45 -07:00
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
danielgrippi
ca76db4550 DG RS left nav almost there. touched up publisher, among other things 2011-07-01 10:49:19 -07:00
Raphael Sofaer
d68c8a3a03 Merge pull request #657 from ndee/1050-cancel-message 
Issue #1050: Changed cancel-link of a new message to back
 2011-07-01 10:46:27 -07:00
Sarah Mei
948a7c5d55 DH SM MS Fix showing image in the publisher when it gets uploaded 2011-06-30 20:36:15 -07:00
MrZYX
05907246e9 use an array of arrays instead of a hash to ensure order, thanks REE! 2011-06-30 23:40:41 +02:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
Robin Wellner
91dd4f847a Adds support for converting <-> to ↔ in markdownify 2011-06-30 14:27:39 +02:00
danielgrippi
3a5f0c9678 proper uniqueness validation in auth model 2011-06-29 17:32:55 -07:00
danielgrippi
38ddb4b744 correctly scoping the uniqueness validation dg iz 2011-06-29 17:24:05 -07:00
danielgrippi
55efe132c5 corrected authorizations_controller_spec to assert on response codes 2011-06-29 17:10:43 -07:00
danielgrippi
144ac82577 only allow https and www.cubbi.es in authorizations controller for now 2011-06-29 16:40:43 -07:00
Raphael Sofaer
d1a149f9f6 Some stuff to not need an application.yml in CI 2011-06-29 11:52:13 -07:00
Raphael Sofaer
5243a3203f Fix AS::Photo show page 2011-06-29 11:33:32 -07:00
Raphael Sofaer
f2e3102562 Make the aspect_dropdown_list_item easier to read 2011-06-29 11:21:44 -07:00
Raphael Sofaer
1ced4c502d Put as_json back in person 2011-06-29 08:48:34 -07:00
danielgrippi
53c87562f4 switch aspect listings and info stuffs on aspect/index 2011-06-28 23:40:57 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer & Raphael Sofaer
d355e230b1 all aspects helper 2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
839756573d set post correctly 2011-06-27 19:51:35 -07:00
Dennis Collinson & Michael Sofaer
f9e8e7a041 notifications tests pass 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
46c83a7c7d reset the notifications helper to master's version and monkey patch header 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
8f5358e68f Move some DB logic from helper to controller 2011-06-27 19:51:35 -07:00
Dan Hansen & Michael Sofaer
bc874e92cd close link for notifications ajax 2011-06-27 19:51:35 -07:00
Michael Sofaer
2c4a75f6a6 Handle multiple notification objects correctly 2011-06-27 19:51:35 -07:00
Michael Sofaer
d6ba3c970c proof of concept for notifications overlay 2011-06-27 19:51:35 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
a6cb04aadb wider! 2011-06-27 19:38:14 -07:00
danielgrippi
89ca5cf337 DG DH; fix the build 2011-06-27 19:26:03 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
00ffade884 sub menu for people only sharing with you on contacts page 2011-06-27 17:22:36 -07:00
Raphael Sofaer
b14271342a Give more information in error message 2011-06-27 17:09:05 -07:00
Raphael Sofaer
240eb78b08 Change homepage_url to application_base_url 2011-06-27 16:44:18 -07:00
danielgrippi
44b77c58a3 just have a remove from aspect icon when viewing an aspect in contacts index 2011-06-27 16:26:54 -07:00
danielgrippi
f9a23b8120 added inf scroll to contacts index page 2011-06-27 15:54:03 -07:00
danielgrippi
9e92230cf7 make contact listings more compact on contact index (we don't need to know their tags here) 2011-06-27 15:32:39 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
danielgrippi
1fe4c3c3de don't group by 2011-06-27 14:06:03 -07:00
danielgrippi
85da6d340f sort contacts by last name on contacts page 2011-06-27 14:00:15 -07:00
Raphael Sofaer
17917528f6 IZ, RS, Move AS::Photo controller spec into integration so that rack middleware is run. Make auth failure return 401 rather than 302. 2011-06-27 12:31:47 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
c7b4e2b4f4 Merge remote branch 'drummondj/1049-unconfimed-tags' 2011-06-26 23:24:03 -07:00
Raphael Sofaer
b2f7ff5dd4 Fix notifications. 2011-06-26 21:59:04 -07:00
Raphael Sofaer
e468075ffd Doc AS::Photo 2011-06-26 20:59:02 -07:00
Raphael Sofaer
d002c14aab Initial implementation of allowing cross-origin requests in the webfinger flow, so that the unhosted guys can use Diaspora. May not work with caches-page on host-meta. We'll have to use X-Accel-Redirect or something. 2011-06-26 20:29:39 -07:00
Raphael Sofaer
a1a53b34e9 Link to post in text email for comment_on_post. Fix 1144 2011-06-26 20:09:21 -07:00
Raphael Sofaer
b9c2d3758b What is this? 2011-06-26 20:09:21 -07:00
John Drummond
cc6f82fbc1 Added test for new plantext tag without a # symbol and fixed broken code. 2011-06-25 23:37:51 -07:00
John Drummond
f7abaab276 Issue 1049 fixed by pre-processing params[:profile][:tags_string] and adding # when required 2011-06-25 23:19:30 -07:00
Raphael Sofaer
4fef3b7172 Docs because I forgot what StatusMessagesController#new is 2011-06-25 16:17:38 -07:00
Raphael Sofaer
b3556870d3 Merge remote branch 'yithian/1049-allow-plaintext-tags' 2011-06-25 11:23:55 -07:00
danielgrippi
54ef22b83e lol, just needed to remove 'http://' in the specs to get the controllers passing again 2011-06-24 18:38:30 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f9b09d32f8 cucumber is passing rspec is red 2011-06-24 12:02:15 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
Raphael Sofaer
c01641b619 Avoid words in person_image_tag 2011-06-24 11:09:10 -07:00
Raphael Sofaer
2857de5f1b doc a user method 2011-06-24 10:38:06 -07:00
Raphael Sofaer
18138e1507 Doc 2011-06-24 10:38:06 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d186246db0 added temporary special casing on app_url in authorizations controller 2011-06-23 19:13:26 -07:00
danielgrippi
15571ecff0 render ASPhoto show page just like status message show for now 2011-06-23 15:47:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
74a7c3ab00 collapsed oauth2 migrations; made app factory 2011-06-23 14:49:19 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
052adc3213 Fix authorizations controller and app_config specs, require 2048 bit keys. We're now using config/application.yml.example in the test env. 2011-06-23 14:20:53 -07:00
danielgrippi
c91cf6f38c properly display app icon on authorizations index 2011-06-23 13:59:03 -07:00
danielgrippi
a9b7cd1254 nicer auth prompt. wip. 2011-06-23 12:40:47 -07:00
Alex Chvatal
7a56322b60 Adds ability to parse plain-text tags 
Tags that haven't been autocompleted and clicked on will be
added as tags as well. There should only be one tag like this
at a time, since adding a space between tags turns it into
a list item.
 2011-06-23 12:23:16 -04:00
Dis McCarthy
d56cac1639 List diaspora id on profile pics, courtesy diasporg 2011-06-23 09:08:07 -04:00
Raphael Sofaer
40560680fe Title on sessions#new 2011-06-22 18:57:02 -07:00
danielgrippi
13810336d3 load monkeypatched models in authorizations controller 2011-06-22 18:32:24 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
a987b198fd Fix search in PG 2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417 Fix direct query execution issues in PG by using select_values/select_rows instead of execute. 2011-06-22 14:47:59 -07:00
Raphael Sofaer
02739259b6 Don't hide the forgot password link 2011-06-22 13:19:54 -07:00
Andreas Henrich
7b3711a788 Issue #1050: Changed cancel-link of a new message to back 2011-06-21 18:48:34 -04:00
Ilya Zhitomirskiy
c09fb776fb added a couple of validations on the Oauth models, added an index on a user's authorizations 2011-06-20 18:30:18 -07:00
danielgrippi
890dc7efd5 put some dependent destroys on models for better sqlite compatability 2011-06-19 23:39:57 +02:00
Raphael Sofaer
2d3eeb9c46 Get another couple specs green on pg 2011-06-19 16:16:31 +02:00
Raphael Sofaer
f0cb2159c7 Make contacts appear at the beginning of search results in postgreSQL 2011-06-19 16:16:30 +02:00
Maxwell Salzberg
1f11e51a9b add object_aspect_ids to status_message controller 2011-06-16 15:59:03 -07:00
Maxwell Salzberg
41e8a32b28 tests for data methods 2011-06-16 15:47:16 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
Ilya Zhitomirskiy
75a1012c1c moved the monkey patching to a model, need to do a couple of validations 2011-06-15 18:30:05 -07:00
Ilya Zhitomirskiy
b3cee70ead if the request is bad give it as a response 2011-06-15 17:51:29 -07:00
Ilya Zhitomirskiy
78253b6885 resetting the token instead if the app already exists, should move the lookup to be homepage url 2011-06-15 16:36:35 -07:00
Ilya Zhitomirskiy
ec9932e491 green on all the cucumbers WOOT 2011-06-14 18:30:43 -07:00
Raphael Sofaer
cba63030c9 Use rescue_from in CommentsController 2011-06-14 18:06:13 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00
Raphael Sofaer
800e701f89 Document User#accept_invitation 2011-06-14 10:27:29 -07:00
Raphael Sofaer
305c107ba1 Take loop out of remove_mentions 2011-06-14 10:17:22 -07:00
Raphael Sofaer
10f5d658b2 Document liked? and like_for 2011-06-14 10:15:32 -07:00
Ilya Zhitomirskiy
2a4932ea34 WIP verifying sig in the pre-registration endpoint 2011-06-13 22:57:56 -07:00
danielgrippi
b446404348 Revert "Without loaded? I was confused by the liked? and like_for methods." 
This reverts commit 2103d54fe4.
 2011-06-13 22:56:36 -07:00
Raphael Sofaer
2103d54fe4 Without loaded? I was confused by the liked? and like_for methods. 2011-06-13 17:14:00 -07:00
Raphael Sofaer
480d7c47cf Documentation is so rad. 2011-06-13 17:02:18 -07:00
Ilya Zhitomirskiy
ef0e48a7ff A user can now revoke an application's token iz ms 2011-06-13 16:48:52 -07:00
Raphael Sofaer
7171aa05ed Do a little bit more documenting. 2011-06-13 16:31:40 -07:00
Raphael Sofaer
4815482354 Start some real docs 2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
3d77186d35 added authorizations page where a user can see all of their authorized applications 2011-06-13 15:40:55 -07:00
Patrick-Emil Zoerner
319863a7ed fixed regex to non greedy. Therefore no strip needed. 2011-06-10 20:05:40 +02:00
MrZYX
0847d09950 ignore whitespace inside markdown links 2011-06-10 15:13:16 +02:00
Ilya Zhitomirskiy
56525c9f4f made a slightly nicer heads up about nil ca_file 2011-06-09 16:28:45 -07:00
Raphael Sofaer
7fd86924ee Fix pagination in AppsController 2011-06-09 16:23:15 -07:00
Raphael Sofaer
0790c3397e Delete some useless JS 2011-06-09 16:23:15 -07:00
Ilya Zhitomirskiy
71dd8dc7f3 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	app/models/app_config.rb
 2011-06-09 15:51:59 -07:00
Raphael Sofaer
e1fb5846b6 Use the example config file if travis 2011-06-09 15:45:01 -07:00
Raphael Sofaer
ac8587290a Throw in a travis config file to try using travis 2011-06-09 15:31:16 -07:00
Ilya Zhitomirskiy
a03423309d fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
Raphael Sofaer
775dbda2b2 Chubbies now uses diaspora-client 2011-06-09 12:40:30 -07:00
Ilya Zhitomirskiy
b575983c22 WIP certs 2011-06-08 18:46:38 -07:00
Ilya Zhitomirskiy
808754f8bd added the cert bundle for facebook http things 2011-06-08 18:20:47 -07:00
Raphael Sofaer
9453f65b7d Limit posts in the RSS feed, wecan come back to this and not limit it, and instead cache the static feed, when we have a little more time. 2011-06-08 12:00:08 -07:00
Raphael Sofaer
d9d66a5c31 WIP auth form and more oauth stuff 2011-06-08 11:55:11 -07:00
Arzumy MD
c0f5571795 do not unnecessary build the feed in users_controller#public when we want to redirect anyway 2011-06-08 17:50:13 +08:00
danielgrippi
96fc104218 paginate looks for stream elements 2011-06-06 23:12:14 -07:00
danielgrippi
b8a6bf9f51 trying something different on app show page. worth a shot. 2011-06-06 22:59:31 -07:00
Raphael Sofaer
8a2fece0f5 Don't n-query in contacts_sharing_with 2011-06-05 01:03:34 -07:00
Raphael Sofaer
753be12a1f Don't force a query on like count 2011-06-05 00:32:10 -07:00
Raphael Sofaer
6d105e5c09 Don't n query in UsersController#public 2011-06-04 22:34:48 -07:00
Sarah Mei
243699c8e9 Tumblr service swallows exceptions raised by tumblbeasts. 2011-06-04 20:45:09 -07:00
Raphael Sofaer
21463582d4 Fix pagination on notifications page, it was getting all notifications for a user 2011-06-04 15:48:10 -07:00
Maxwell Salzberg
de55a1cbb3 remove remember aspects feature 2011-06-03 17:35:27 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Maxwell Salzberg
e720fc097d chubbies tests mow take diaspora handle 2011-06-03 16:24:12 -07:00
danielgrippi
01edfeee03 Chubbies now sends manifest data to create a client 2011-06-03 16:24:12 -07:00
danielgrippi
e121b0fe6d Chubbies now sees that it has no secret and registers itself. 2011-06-03 16:22:38 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
danielgrippi
40ab168a5a DH DG; fix re-liking a post after unliking it 2011-06-03 12:20:59 -07:00
Raphael Sofaer
686464c36e move account deletion out of a tranaction and into a job 2011-06-03 12:05:57 -07:00
Maxwell Salzberg
149c086d5e make the tumblr posting smarter 2011-06-02 17:02:29 -07:00
Dan Hansen
bc465848c9 MS DH fixed like sizes, everywhere 2011-06-02 17:45:45 -05:00
Dan Hansen
864233eb63 fix status message show page and break out Post to it's own javascript widget 2011-06-02 17:45:45 -05:00
MrZYX
82ca293825 fix services index with incomplete oauth_keys.yml 2011-06-02 13:20:22 +02:00
MrZYX
668c4ddfc5 d'oh 
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
 2011-06-02 12:32:21 +02:00
Maxwell Salzberg
f7181a7123 add tumblr translation 2011-06-01 22:43:23 -07:00
Maxwell Salzberg
72c6efe41c basic specs 2011-06-01 22:38:15 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Maxwell Salzberg
1ef9d43262 added pagination for people on tag pages 2011-06-01 18:59:15 -07:00
Raphael Sofaer
283e376712 Move initialize_signatures method out of user and into relayable 2011-06-01 16:45:30 -07:00
Raphael Sofaer
df04b59857 Change :on to :post in the comment and post methods 2011-06-01 16:45:29 -07:00
Sebastian
ea85daadc4 Added UsersController#confirm_email with route and some specs 2011-06-01 16:26:54 +02:00
Sebastian
f42055ae24 User#confirm_email with specs 2011-06-01 16:26:54 +02:00
Sebastian
37ccbce153 Added confirmation email + specs + User#mail_confirm_email + call User#mail_confirm_email in UsersController#update 2011-06-01 16:26:53 +02:00
Sebastian
602382e24e Extended UsersController#update method for changing password with minimal specs, added form to view and locales (en). 2011-06-01 16:26:53 +02:00
Sebastian
5b408ecca3 Added User#unconfirmed_email and #confirm_email_token with specs 2011-06-01 16:26:53 +02:00
MrZYX
de9e41a331 fixed total contact count 2011-06-01 12:23:37 +02:00
Raphael Sofaer
537de1ce4c build_like and build_comment now take only an options hash, and call build_relayable 2011-05-31 12:27:58 -07:00
Raphael Sofaer
71c3a29aa6 Move YoutubeTitles callback into module 2011-05-31 12:27:57 -07:00
Jonne Hass
1be2845687 Merge pull request #650 from yolk/1104-wrong-profile-picture-size 
fixed #1104 wrong profile picture size
 2011-05-31 10:33:26 -07:00
Sebastian
d4d0eacf49 fixed #1104 wrong profile picture size 2011-05-31 19:06:35 +02:00
Sebastian
d9f23b5e2a fixed #1018 - aspects width on /aspects/manage 2011-05-31 18:29:24 +02:00
MrZYX
05aa73e93c made everything in the sidebar translatable 2011-05-30 18:06:05 +02:00
MrZYX
3db4772652 ignore searchable if one searches by handle in people#index 2011-05-29 22:58:33 +02:00
MrZYX
502f467012 fix youtu.be links 2011-05-29 22:13:42 +02:00
MrZYX
42f5f7fc32 fixed find person by handle 2011-05-29 21:27:20 +02:00
MrZYX
cd887e9373 fixed unlike the right way 2011-05-29 18:15:46 +02:00
MrZYX
7b864dd208 Rails, welcome to 2011. Fyi: string concatenation is bad 2011-05-29 18:14:54 +02:00
MrZYX
d66fc9d99f fix validation message if text is too long 2011-05-29 16:45:41 +02:00
MrZYX
0febee6fbb fix unlike 2011-05-29 13:43:56 +02:00
Sarah Mei
828cbab792 Keep pod_url and pod_uri settings in sync. 2011-05-28 20:13:38 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
MrZYX
54f1effdf8 Merge branch '1092-no-pic-select' of https://github.com/gandaro/diaspora 2011-05-27 19:35:39 +02:00
Jakob Kramer
0efaa77c46 fixes bug #1092 2011-05-27 18:59:02 +02:00
MrZYX
e201340bb2 Photo association on GUID 2/2: replace status_message_id with status_message_guid 2011-05-27 18:56:24 +02:00
MrZYX
ba08c38a74 fixed activity_streams::photo controller spec 2011-05-26 00:01:10 +02:00
Maxwell Salzberg
52487e87de added a very basic page for the stream of all public activity stream photos 2011-05-25 12:57:29 -07:00
danielgrippi
d12944d57e record objectId in post (cant use object_id booo) 2011-05-25 12:16:52 -07:00
Maxwell Salzberg
56644c9d1e use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n 2011-05-24 21:45:12 -07:00
Sarah Mei
5e56b8a0ee HULK SMASH PENDING SPEC 2011-05-24 23:36:00 -04:00
MrZYX
db22be43a8 really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF 2011-05-24 17:03:48 +02:00
danielgrippi
3f66458386 remove text from token page explaining there is no FF cubbies extension 2011-05-24 07:42:37 -07:00
Maxwell Salzberg
20cc3f0c7d change the smiley for a heart.... the smiley looked sad at that size.. 2011-05-23 23:53:18 -07:00
Raphael Sofaer
fc7b2cfe3f Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation. 2011-05-23 23:09:48 -07:00
Raphael Sofaer
609439f948 Destroy notifications on contact destroy 2011-05-23 18:33:18 -07:00
Raphael Sofaer
e28ec16781 Gross, but hopefully temporary solution for namespaced classes and old versions of libxml 2011-05-23 16:24:28 -07:00
Raphael Sofaer
cc84051541 Fall back to author if the diaspora_handle isn't set, that column just needs to be removed 2011-05-23 14:54:27 -07:00
Raphael Sofaer
d22878f3f0 Fix AS::Photo federation, hopefully 2011-05-23 13:56:42 -07:00
MrZYX
c732940b58 match trailing slash for vimeo links 2011-05-23 14:32:16 +02:00
danielgrippi
8e3149ca01 better page explaining cubbi.es and why we're promoting it on diaspora 2011-05-23 01:14:33 -07:00
Maxwell Salzberg
d776105558 grammer nazi cleanup of notification_people_link and refactor + tests 2011-05-22 17:18:44 -07:00
Maxwell Salzberg
90d62f3c8a small ui tweak for mobile login page 2011-05-22 15:43:39 -07:00
Maxwell Salzberg
a4017ba16f small linebreak for cubbies view for mobile 2011-05-22 15:25:37 -07:00
Maxwell Salzberg
59ae829254 there is a dumb bug where likes are targeting themselves 2011-05-22 15:02:01 -07:00
Maxwell Salzberg
77fc40d404 add application helper to notification helper spec, made the link an object_link rather than status_message_link 2011-05-22 14:59:04 -07:00
Maxwell Salzberg
2f6d079635 added failure test for deleted likes 2011-05-22 14:45:16 -07:00
Maxwell Salzberg
66c28c4caf notification page now has links for likes 2011-05-22 14:35:35 -07:00
Maxwell Salzberg
d4d3b1e44c MSSM like notification are concatinated, and backfilled some like tests 2011-05-22 13:59:33 -07:00
MrZYX
a68031179b prevent inviting yourself, #515 2011-05-22 14:48:07 +02:00
MrZYX
07395fb2c9 added maxlength attribute to aspect name input, fixed #675 2011-05-22 13:50:44 +02:00
danielgrippi
3fb81d37d0 missing closing tag in aspect_dropdown helper 2011-05-21 15:08:19 -07:00
danielgrippi
6a108104e8 add spacing 2011-05-21 14:56:11 -07:00
danielgrippi
0391795f80 better right pane sections 2011-05-21 14:52:59 -07:00
danielgrippi
7c949f4377 show diaspora handle on token page 2011-05-20 21:48:45 -07:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
Maxwell Salzberg
1e3971da3d i think we want to not prevent non admins... 2011-05-19 22:22:03 -07:00
Arzumy MD
a060acffeb add spec for admins_controller#add_invites 2011-05-20 10:51:04 +08:00
Arzumy MD
0ee41b3be5 removed user variable from admins_controller#user_search 2011-05-20 09:37:32 +08:00
Raphael Sofaer
93be5497a7 Small controller for generating an auth token, if you are an authable user 2011-05-19 18:29:53 -07:00
Raphael Sofaer
ed61c53e09 Wrap UsersController to not 500 when no params are submitted 2011-05-19 17:01:42 -07:00
danielgrippi
f2259e5e25 put link in via link translation, add via link to mobile site 2011-05-19 16:06:29 -07:00
danielgrippi
83756c5713 actually add the views. fix object_path 2011-05-19 15:34:39 -07:00
danielgrippi
d7899d10e3 Fix various links in to cubbi.es objects 2011-05-19 15:17:42 -07:00
Maxwell Salzberg
69e83bb065 remove whitespace on your own profile 2011-05-19 15:08:17 -07:00
Maxwell Salzberg
8796c5b722 fixed build, added debugging info for notification 500s 2011-05-19 14:48:09 -07:00
Maxwell Salzberg
3c4c62abd5 moved auth token to admins page, and added a link in the dropdown 2011-05-19 14:23:04 -07:00
danielgrippi
925292a7b2 hey, federation works. 2011-05-19 13:20:58 -07:00
danielgrippi
177061d1c5 added via links 2011-05-19 13:13:08 -07:00
danielgrippi
6c31867345 check for AS object in partial hack 2011-05-19 12:40:05 -07:00
danielgrippi
e7095ba788 Tests now pass, stream_element needs de-hacking 2011-05-19 12:19:27 -07:00
danielgrippi
c8e31825c5 Bookmark -> ActivitiyStreams::Photo 2011-05-19 11:57:06 -07:00
danielgrippi
dd31f37fd0 only generate new token if admin 2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86 show photos from cubbies in the streams 2011-05-19 11:57:06 -07:00
danielgrippi
9b941e6520 Bookmark now consumes cubbi.es JSON, cubbi.es things can be saved to Diaspora, but are not displayed. 2011-05-19 11:57:06 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
MrZYX
331aa1ff60 you know the facepalm smiley? Here it is: m( 2011-05-19 20:10:35 +02:00
Ilya Zhitomirskiy
6cda0bf9ea Revert "added a podwide email preference" 
This reverts commit 60c0a9839b.
 2011-05-18 10:38:45 -07:00
MrZYX
66380fd33f fixed some translations 2011-05-18 13:55:50 +02:00
MrZYX
b0e9f5388b fixed a translation; added that missing </li> for you, fixed #1078 2011-05-18 13:22:05 +02:00
Ilya Zhitomirskiy
60c0a9839b added a podwide email preference 2011-05-17 18:19:47 -07:00
Raphael Sofaer
0bb349ff08 Merge branch 'evant_log_post_merge' 2011-05-17 18:17:14 -07:00
Raphael Sofaer
c942f76d29 Turn off user collapse and turn up status messages to over 9000 2011-05-17 18:14:35 -07:00
MrZYX
c47c9ef069 fix untranslated string; fix two translations; don't mess routes.rb again 2011-05-18 00:53:48 +02:00
Maxwell Salzberg
e95288e074 notifications by created at date so they stop jumping when you make them read 2011-05-17 14:44:42 -07:00
danielgrippi
0c62277961 add add to aspect dropdown on notifications page 2011-05-17 14:41:15 -07:00
Raphael Sofaer
d7980978fa Render collection in services finder 2011-05-17 14:04:42 -07:00
danielgrippi
26ac8b8285 fix 500 on people index 2011-05-17 12:24:07 -07:00
danielgrippi
57a2a8fa71 remove button to add yourself to an asepct on your profile page: 2011-05-17 12:14:05 -07:00
danielgrippi
775e7b6b2b Merge branch 'master' into follow 
Conflicts:
	features/step_definitions/user_steps.rb
 2011-05-17 11:33:35 -07:00
Raphael Sofaer
5218bd89c6 Revert FakeServiceUser work, needs more testing to make sure extra models aren't instantiated. 
This reverts commit 0a8ce3b9f2.
This reverts commit f9ef9a4b47.
This reverts commit 164226a3d7.
 2011-05-17 10:33:33 -07:00
MrZYX
1746f610b6 if we disable websocket in single process mode, there's no need for the JS 2011-05-17 19:26:37 +02:00
Raphael Sofaer
0a8ce3b9f2 Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge 2011-05-17 10:24:28 -07:00
Raphael Sofaer
f9ef9a4b47 Make FakeServiceUser assoc methods tolerant of nil 2011-05-17 10:14:39 -07:00
Raphael Sofaer
164226a3d7 Replace ServiceUser with fakes in ServicesController 2011-05-16 18:48:03 -07:00
danielgrippi
d70f10b609 made dropdown selectors sexi 2011-05-16 16:29:13 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
MrZYX
956f0044a9 set @contacts_of_contact_count in photos#index, thanks LPrelle 2011-05-16 16:21:13 +02:00
MrZYX
e338886910 fixes to login page: removed not needed login.sass; removed fixed string length assumption; fixed login button not showing up in Chrome when the form is pre-filled 2011-05-16 15:16:01 +02:00
Ilya Zhitomirskiy
709ac44da3 fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages 2011-05-16 02:16:46 -07:00
Sarah Mei
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
fbf486dae6 Users can log in on their phones again. 
Something in devise broke for the :mobile format. More investigation needed; we're having this same issue on log out and incorrect password on mobile (though those pages are at least still usable).
 2011-05-14 14:58:52 -07:00
danielgrippi
01be909e38 well, that was dumb. (fix cucumber) 2011-05-14 00:58:39 -07:00
danielgrippi
b89dd900cc misc visual cleanup on mobile 2011-05-13 23:33:16 -07:00
danielgrippi
666fb76bfc login as its own js file. accounted for the autofil state 2011-05-13 22:27:08 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05:35 -07:00
danielgrippi
a02b9c01c8 eager loading aspect memberships 2011-05-13 18:22:42 -07:00
danielgrippi
30796de400 switching the order around to utilize eagerloading 2011-05-13 16:58:24 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49:37 -07:00
Raphael Sofaer
a4f81c6410 Finish fixing password changing and keeping emails downcased 2011-05-13 16:32:07 -07:00
Raphael Sofaer
f8b7307441 Downcase emails upon inviting 2011-05-13 16:32:07 -07:00
Raphael Sofaer
5f531f14f1 Don't use rails case_sensitive false, it is very slow. 2011-05-13 16:32:07 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
danielgrippi
402e84708b ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug 2011-05-13 16:05:37 -07:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17 one cuke failing. wip 2011-05-12 20:41:56 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07:00
Raphael Sofaer
71e77d59b3 Revert to including all helpers everywhere, because the rest of the team prefers it that way 2011-05-12 13:54:55 -07:00
Arzumy MD
efd5c4f500 slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992 fix 500 on tags#show 2011-05-12 12:32:31 +02:00
MrZYX
9f070593ff check if we can all cleaned_is_rtl? before doing it in direction_for helper 2011-05-12 11:05:32 +02:00
danielgrippi
4280417e41 broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed 2011-05-11 18:33:17 -07:00
danielgrippi
7893129435 prevent user from hitting aspectmemberships controller before response on dropdowns 2011-05-11 17:07:58 -07:00
Raphael Sofaer
cb49d1f4ea fixed the formatting on emails 2011-05-11 17:02:05 -07:00