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

4302 commits

Author SHA1 Message Date
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
Raphael Sofaer
970190fb7a OMG SO MANY EMAILS, fixed 2011-05-11 16:07:24 -07:00
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -07:00
Raphael Sofaer
6fa433ced8 added the header back 2011-05-11 15:33:39 -07:00
danielgrippi
9f3044838d Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started 2011-05-11 14:53:43 -07:00
Raphael Sofaer
b8d9610877 added translation to the likes popup, made the notification models a little clearer 2011-05-11 13:50:26 -07:00
danielgrippi
ebb17ff70c few cucumber steps failing. wip. 2011-05-11 11:08:30 -07:00
danielgrippi
dfeb4f3a13 use .js response convention for remote likeke behavior 2011-05-11 11:08:30 -07:00
danielgrippi
eadede966f unliking works right now minus on-page feedback 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
MrZYX
73c96ea8f0 Revert "Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec" 
This reverts commit bd74ab4acc.

This reproducable breaks functionallity (comments). Please do not push WIP/not working stuff to master. To continue work just revert this revert. Thanks
 2011-05-11 11:51:51 +02:00
Dan Hansen
bd74ab4acc Clean up WSR, add comment processing to ContentUpdater, add comment fixture, update post processing spec 2011-05-10 23:19:36 -05:00
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0 Fix facebook finder and tests 2011-05-10 11:22:52 -07:00
=
2a11bb208e Add message inbox link to mobile menu 2011-05-10 12:08:05 -05:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
danielgrippi
d34774f4e5 png favicon 2011-05-09 16:24:24 -07:00
danielgrippi
68601e392e halfway to a better welcome/getting started page. wip. 2011-05-08 22:15:26 -07:00
MrZYX
3b7dd1906f fixed 500 on /people/:person_id/photos 2011-05-08 21:36:27 +02:00
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04:00
Maxwell Salzberg
7a2f6dae10 fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -07:00
Arzumy MD
6ba2b00fb8 cleaned up formatting in application_helper, removed unnecessary return 2011-05-06 00:18:58 +08:00
Arzumy MD
2c4954bac8 spec for application_helper#page_title, with default text 2011-05-06 00:14:18 +08:00
danielgrippi
7e838fc778 only display contacts you are sharing with in aspect edit panes 2011-05-04 18:05:49 -07:00
danielgrippi
0db8541f6e added a pane for people sharing with you on all aspect page 2011-05-04 17:57:42 -07:00
danielgrippi
e854bd0a32 split 'mutual' flag into 'sharing' and 'receiving' on Contact 2011-05-04 17:09:48 -07:00
danielgrippi
648a10e6d3 Merge branch 'master' into follow 
Conflicts:
	app/controllers/requests_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/aspects_helper.rb
	app/views/notifications/index.html.haml
	config/routes.rb
	public/javascripts/aspect-edit.js
	public/javascripts/contact-list.js
	spec/integration/receiving_spec.rb
	spec/models/user/connecting_spec.rb
	spec/models/user/posting_spec.rb
 2011-05-04 11:35:35 -07:00
Arzumy MD
5da6305b10 #1019 YoutubeTitles::YOUTUBE_ID_REGEX supports data-anchor 2011-05-05 00:05:59 +08:00
MrZYX
77bae90d0e moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
Raphael Sofaer
87864bf4ff people.diaspora_handle, not profiles.diaspora_handle 2011-05-03 11:39:34 -07:00
Raphael Sofaer
f89b6ae5be Fix all contacts link 2011-05-03 11:02:08 -07:00
Raphael Sofaer
c7358c8664 Fix rendering into json for names with quotes 2011-05-03 10:50:13 -07:00
MrZYX
a92b28b4bf general search and replace in markdownify (#1042) 2011-05-03 17:46:29 +02:00
Maxwell Salzberg
c20cd5381e create a new notifciation if previous was read, only concatinate when it is the same unread message 2011-05-02 18:18:30 -07:00
Raphael Sofaer
567b440f3d Use correct pagination in mobile person show 2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa Test and fix pagination on profile, tag and aspect streams 2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb fixed adding contact feedback on people search result page 2011-04-30 17:00:52 +02:00
MrZYX
ff58d63191 minor cleanup to routes.rb 2011-04-30 16:28:39 +02:00
MrZYX
6623dbb1f1 fixed #1039 2011-04-29 23:38:10 +02:00
Raphael Sofaer
a5f297d7f7 Don't include every helper everywhere, re-organize helpers 2011-04-28 10:38:33 -07:00
Raphael Sofaer
28a997c2cd Fix pagination on tags, specs are red, need to take all helpers out of applicationController 2011-04-28 09:28:59 -07:00
Raphael Sofaer
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
Dan Hansen
c1366e0e04 Make photos display inline on StatusMessage#show 2011-04-27 17:06:26 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Raphael Sofaer
5dcfff104a Merge remote branch 'ritchewilson/prev_next' 
Conflicts:
	public/stylesheets/sass/mobile.sass
 2011-04-19 17:05:12 -07:00
maxwell
9850a3f124 change text on manage services popup 2011-04-18 18:38:03 -07:00
maxwell
62c164e1a4 fixed displays of the days based on locale 2011-04-18 18:29:55 -07:00
maxwell
d70ef86337 make the days the right size in notification page 2011-04-18 17:55:17 -07:00
MrZYX
c06b885aa7 fixed #1027 2011-04-19 00:27:31 +02:00
maxwell
1fc01c3980 basically fixed 2011-04-18 15:10:47 -07:00
maxwell
2223c562c0 first fix of notification page 2011-04-18 15:10:47 -07:00
maxwell
5050307179 Revert "Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])" 
This reverts commit 981d39d220.
 2011-04-18 15:10:46 -07:00
MrZYX
981d39d220 Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!]) 
This reverts commit a16e83df9e.
 2011-04-16 14:03:24 +02:00
danielgrippi
a16e83df9e touched up notifications page 2011-04-15 10:42:21 -07:00
Raphael Sofaer
4870ffb944 Fix db seed, refactor aspect-filters a bunch, fix stream_element a little 2011-04-13 18:13:26 -07:00
Raphael Sofaer
f13304073b The specs are green on my dev machine, let's see if CI is still red 2011-04-13 15:19:17 -07:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
Raphael Sofaer
85993a694e Fix people#show sort order 2011-04-13 10:30:32 -07:00
Raphael Sofaer
5afe5f667e Move js out of notifications index, fix reference to notifications badge 2011-04-12 17:15:02 -07:00
Raphael Sofaer
8c0dcdde08 Notifications should be sorted by updated_at 2011-04-12 14:06:58 -07:00
Raphael Sofaer
363ef2c276 Fix some translations (thanks MrZYX) 2011-04-12 12:24:29 -07:00
Raphael Sofaer
d5ecce7ca6 Merge branch 'limit_similar_contacts' 
Conflicts:
	app/controllers/people_controller.rb
 2011-04-12 11:48:41 -07:00
danielgrippi
106ae983d5 Merge branch 'master' into follow. all specs green. 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/people_controller.rb
	app/models/person.rb
	config/assets.yml
	db/schema.rb
	public/javascripts/aspect-edit.js
	spec/controllers/aspects_controller_spec.rb
	spec/models/user/querying_spec.rb
	spec/spec_helper.rb
 2011-04-11 17:48:37 -07:00
danielgrippi
352d1c6abf fixed disconnecting logic. specs&cucumber green 2011-04-11 15:10:51 -07:00
Raphael Sofaer
080f08187d Disable typhoeus everywhere but the HTTPMulti specs 2011-04-11 14:52:21 -07:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
danielgrippi
1b8257e960 fixed 'destroy for nil class' warning in cucumber: 2011-04-11 11:11:32 -07:00
MrZYX
440fd26c14 hopefully finally fix #946 2011-04-11 19:15:14 +02:00
MrZYX
ffbe94f75c revert moved add aspect button to the left for rtl languages, this is already done by CSS 2011-04-11 18:04:50 +02:00
MrZYX
2413b3c4bd Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl 2011-04-11 18:01:09 +02:00
MrZYX
cf61bb756d added dir attribute to html element; made tipsy gravity dependant on that 2011-04-11 18:00:28 +02:00
MrZYX
e91c153257 fixed #1013 thanks jbivins 2011-04-11 17:08:36 +02:00
MrZYX
fbe91aba3a refetch profile if it's missing, comment out hydra stub for now because it breaks the specs 2011-04-09 15:20:28 +02:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
Raphael Sofaer
927ba96fcc Take out broken 'start sharing' link from mobile site 2011-04-08 11:09:56 -07:00
Raphael Sofaer
f8359bd77d Fix PeopleController#show mobile 2011-04-08 10:37:08 -07:00
Raphael Sofaer
761411e153 Mostly fix PeopleController#show for mobile 2011-04-08 10:37:08 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
maxwell
d7c4e15835 let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -07:00
Raphael Sofaer
a05b141366 Add tagged posts to db seed, make people#show and tags#show infinite scroll 2011-04-07 16:36:14 -07:00
Raphael Sofaer
157b117469 Just style links directly 2011-04-07 15:13:37 -07:00
Raphael Sofaer
d12ec38736 Fix mobile infinite scroll 2011-04-07 15:00:57 -07:00
maxwell
51b3cd9c77 attempt to fix the problem where people who wanted emails were no longer getting them 2011-04-07 14:05:40 -07:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
bbf1bf00cb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
Raphael Sofaer
fd0fa61d53 Fix query in TagsController#show 2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6 some better http status codes 2011-04-06 17:16:39 +02:00
MrZYX
e925fe622c oh yeah, render nothing on update if we don't want to redirect 2011-04-06 16:02:52 +02:00
MrZYX
95de299e6e fixed #953 2011-04-06 14:18:33 +02:00
MrZYX
21b5f7932f fixed #997 by turning cancel link into a reset button 2011-04-06 13:31:56 +02:00
Raphael Sofaer
9454c3a1b9 Working on fixing infinite scroll, in particular for aspects with the number 2 in their id. 2011-04-05 19:28:40 -07:00
danielgrippi
847f4fd260 edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip. 2011-04-05 18:53:10 -07:00
Raphael Sofaer
59334dfaf5 Remove extra js, fix mobile view 2011-04-05 16:18:04 -07:00
danielgrippi
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
Raphael Sofaer
746a0c38b3 Take another shot at fixing pagination 2011-04-05 13:59:15 -07:00
Raphael Sofaer
4037ce48c5 Delete unused show templates 2011-04-05 13:59:15 -07:00
MrZYX
e7d48a16ee moved + to the left for rtl languages 2011-04-05 19:33:51 +02:00
Raphael Sofaer
fdb6675f28 Make things more postgres compatible 2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab Still working on stream query 2011-04-04 13:06:15 -07:00
danielgrippi
c800b0bfef use fixtures in request spec; collapsed xml specs 2011-04-04 11:57:25 -07:00
maxwell
94d8fb9f3a Revert "fpossible fix for mobile site 500 on user login" 
This reverts commit fe52acb931.
 2011-04-04 11:11:11 -07:00
maxwell
fe52acb931 fpossible fix for mobile site 500 on user login 2011-04-04 10:58:50 -07:00
maxwell
95c1edbab8 disable duplicate sending of a private message 2011-04-04 10:09:53 -07:00
zhitomirskiyi
eb66f18aaa removed the hide comments button if there are less than 3 2011-04-04 00:15:22 -07:00
MrZYX
8639dc3a77 fixed #993 2011-04-03 18:36:34 +02:00
MrZYX
c9fd4e0e5b fixed path in getting started 2011-04-03 15:42:24 +02:00
MrZYX
100d705c2f fixed #992 2011-04-03 14:57:30 +02:00
MrZYX
b776bb52db made string on mobile page translatable 2011-04-03 13:17:09 +02:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
e4db8c7a36 fixed #589, no CSS! 2011-04-03 02:10:41 +02:00
MrZYX
4b7c9315c8 log error when receiving a post instead of letting the job fail with weired error later in the chain 2011-04-02 17:44:48 +02:00
MrZYX
f98a4ee42c correct links to atom feed 2011-04-02 17:35:23 +02:00
MrZYX
65263f1905 damn, typo 2011-04-02 16:02:51 +02:00
MrZYX
e8b006eadb finally eliminate no method error when processing a photo 2011-04-02 16:01:54 +02:00
MrZYX
a1c3a6dc1e lets see if that fixes the build 2011-04-02 15:53:58 +02:00
MrZYX
b086142b16 fixed #991 2011-04-02 15:09:41 +02:00
MrZYX
513e838482 do not stress the server too much 2011-04-02 14:42:50 +02:00
MrZYX
3eeecebb67 201 means created… 2011-04-02 14:18:46 +02:00
danielgrippi
bdff036cda remove spacing from stream elements 2011-04-01 11:26:04 -07:00
maxwell
41bbcc9ac9 comment out comment delete on mobile site for now 2011-04-01 11:22:48 -07:00
danielgrippi
8b8ea03582 high res logo on mobile site 2011-04-01 11:12:41 -07:00
maxwell
4bd0cbfdc8 publisher now can handle services, and is on seperate page 2011-04-01 01:18:01 -07:00
maxwell
f2ca2c2357 fix up translations, and remote on publisher" 2011-03-31 23:52:29 -07:00
maxwell
569fb66e9e bunch of small mobile ui fixes 2011-03-31 23:38:38 -07:00
maxwell
3add704d4a sm mobile site fix 2011-03-31 22:25:28 -07:00
maxwell
bf45026040 another small fix for the mobile site 2011-03-31 18:35:21 -07:00
maxwell
69befc059d ms iz fixed a bit of the mobile site 2011-03-31 18:32:19 -07:00
maxwell
bb59df46f9 updating jquery mobile, fix the menu page a bit 2011-03-31 18:19:51 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
MrZYX
764e0c4aee fixed #985 2011-03-31 18:59:00 +02:00
danielgrippi
b22b13d73f Revert "popstate now in aspect-filters. back button now actually works on aspect/index." 
This reverts commit 326155af54.
 2011-03-31 01:30:02 -07:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
danielgrippi
326155af54 popstate now in aspect-filters. back button now actually works on aspect/index. 2011-03-30 17:39:08 -07:00
Raphael Sofaer
3387c20b5f Fix redirect away from conversation 2011-03-30 17:17:16 -07:00
Raphael Sofaer
1df287b2bb Don't redirect ajax requests to getting_started 2011-03-30 17:02:19 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc wip holding off until the follow model is done 2011-03-30 16:43:28 -07:00
Raphael Sofaer
e3ad078ba5 Scope querying in PhotosController#show 2011-03-30 16:40:01 -07:00
danielgrippi
5fa2a7a6f3 use popState in message inbox 2011-03-30 16:22:25 -07:00
Raphael Sofaer
716a7f64b8 Make contacts_visible accessible 2011-03-30 15:43:44 -07:00
Raphael Sofaer
8c9a7e1c41 Fix PhotosController#show 2011-03-30 15:43:44 -07:00
maxwell
66a52a49d6 add a loader for profile photo upload 2011-03-30 15:14:18 -07:00
Raphael Sofaer
c9d58d9308 Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings" 
This reverts commit 3b7063d44a.
 2011-03-30 14:47:40 -07:00
maxwell
c91baf9f04 pass the param to set the profile photo 2011-03-30 14:44:06 -07:00
Raphael Sofaer
3b7063d44a Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings 2011-03-30 14:28:58 -07:00
maxwell
6364f2a332 clean activity streams, fix test 2011-03-30 14:27:20 -07:00
Raphael Sofaer
2d31d364f2 Don't will_paginate json requests on people search 2011-03-30 13:40:16 -07:00
danielgrippi
e922ef8f22 add includes() to search query for profiles 2011-03-30 13:24:47 -07:00
Raphael Sofaer
75354c1aba fix error on mobite status message show 2011-03-30 12:51:02 -07:00
danielgrippi
d3c0f1b3d2 ruby objects, get outta my face. (conversationscontroller new) 2011-03-30 12:45:47 -07:00
Raphael Sofaer
5c7bd6298a Fix 500 on tags index 2011-03-30 12:43:44 -07:00
MrZYX
d97939a18f escape the ' in the json (don't ask me why the four \ are needed, it was trial and error :P) 2011-03-30 21:14:21 +02:00
maxwell
3ba7ce41f1 make the public page show the public profile if html request 2011-03-30 11:34:54 -07:00
zhitomirskiyi
70d1c31733 fixed the issue of nothing showing up for empty aspects 2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035 WIP 2011-03-30 11:29:12 -07:00
danielgrippi
c4295a7693 fix aspect_memberships_controller specs 2011-03-30 11:15:40 -07:00
Raphael Sofaer
22b9f92c27 FIx post socketing 2011-03-30 10:55:59 -07:00
danielgrippi
95578e79c6 fix removing from aspect -> contact removal bug 2011-03-30 10:44:55 -07:00
maxwell
86fe2db24e update publish job to include .atom 2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29 make one translation absolute to attempt to fix 1.9 build 2011-03-30 10:39:40 -07:00
MrZYX
53bdb2cade clean up stray hidden input tags by passing the data directly into the js where possible and placing them under an existing form tag elsewhere 2011-03-30 17:17:36 +02:00
MrZYX
699264e7a3 made flash messages for conversations translatable 2011-03-30 16:52:43 +02:00
MrZYX
22b73c736b fixed #976 2011-03-30 16:15:31 +02:00
danielgrippi
5b0da52e0a fixed comment socketing bug, post ordering on own profile page. 2011-03-29 19:40:44 -07:00
danielgrippi
b3cb8e0a2b temp fix for pagination. photos index fix 2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404 pass post to comments partial. use sql in raw_visible_posts 2011-03-29 17:31:57 -07:00
danielgrippi
371aa71ca8 add ordering to raw_visible_posts 2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599 Fix all specs, add foreign key constraints on post_visibility 2011-03-29 17:31:56 -07:00
danielgrippi
8816bd7f91 8 failures left. wip. 2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
zhitomirskiyi
d54a8428d3 add some limits for conversation#new 2011-03-29 15:19:14 -07:00
zhitomirskiyi
8775ab9d69 fixed the conversations create 2011-03-29 15:03:10 -07:00
zhitomirskiyi
ba15ea940b autosuggest on tags now works, bumped up the version of the autocomplete plugin 2011-03-29 15:03:09 -07:00
zhitomirskiyi
2e25d1d745 added the bookmarklet into a box 2011-03-29 15:03:09 -07:00
zhitomirskiyi
a5bb26a3c4 almost done 2011-03-29 15:03:09 -07:00
maxwell
bbe5f56292 you can now mention in the bookmarklet 2011-03-29 13:55:14 -07:00
MrZYX
98820c0866 do not display tags on the public profile 2011-03-29 22:25:03 +02:00
maxwell
5392b5c6ef strip more than 5 tags when updating profile so people with broken profiles can update again 2011-03-29 10:56:11 -07:00
MrZYX
aa478ddd5c string concatenation with translations is bad, especially if you leave on part of it untranslated :P 2011-03-29 15:39:57 +02:00
maxwell
ccbba9b52e fix translations 2011-03-28 20:09:09 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
maxwell
9e5890288c more bookmarklet improvements 2011-03-28 18:34:52 -07:00
maxwell
f08b5dfafe basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
Raphael Sofaer
349aa13c05 Revert "reduce db quries on aspects#index" 
This reverts commit 3af5e24ac6.

Conflicts:

	app/controllers/aspects_controller.rb
 2011-03-28 14:59:16 -07:00
Ritchie Wilson
a1b07d84e1 Next and Previous arrows for mobile photos 2011-03-28 16:04:29 -04:00
Raphael Sofaer
c33a952bbd Forgot parens 2011-03-28 11:22:03 -07:00
Raphael Sofaer
a0d3921d72 Fix 500 on tag show with comments 2011-03-28 10:01:19 -07:00
MrZYX
c2a4c2157d oh yeah it's delete_all on has_many, seems like I shouldn't code today… 2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad dependent delete for likes 2011-03-28 17:54:07 +02:00
Sarah Mei
ffe48fe189 Refactor aspects#index to be easier to read; move some expensive operations after the guard clause 2011-03-27 19:19:25 -07:00
Sarah Mei
ae106e71ae Move sort order to a before filter, because this index method is waaaaay too big. 2011-03-27 18:52:43 -07:00
MrZYX
5c4979ccf0 use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why 2011-03-28 00:09:07 +02:00
MrZYX
315fdabd76 let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases 2011-03-27 21:08:30 +02:00
MrZYX
e2f6427724 just realized that the change to AspectsController#index in the previous commit isn't needed 2011-03-27 17:26:17 +02:00
MrZYX
3af5e24ac6 reduce db quries on aspects#index 2011-03-27 17:22:35 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
11b0a2c19d dependent destroy for likes 2011-03-26 21:47:40 +01:00
MrZYX
92d6b618aa ups that shouldn't be in the previous commit 2011-03-26 17:41:58 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
danielgrippi
8a2dd36b7e Fix autocomplete JSON 2011-03-25 17:28:04 -07:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb Initial work on retracting comments 2011-03-25 16:09:37 -07:00
danielgrippi
40953d37bd Put an upper limit on the per_page param 2011-03-25 15:31:23 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8 Make pending specs green, I think there are still some to_jsons where there should be as_json 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00
maxwell
c5b6cdff4e make a public search method 2011-03-25 15:06:22 -07:00
maxwell
310f529914 dumb api console 2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c initial public api' 2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
b6d5165f2d scroll to post on page if you can see it (via notification popup) 2011-03-23 17:16:30 -07:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
zhitomirskiyi
18c7c467c7 made the manage email prefs work 2011-03-23 16:36:16 -07:00
danielgrippi
535e686b2c fixed tag ordering in stream_element partial 2011-03-23 16:24:12 -07:00
zhitomirskiyi
7a31531258 added location to the profile 2011-03-23 15:56:46 -07:00
Raphael Sofaer
ec8aed12bb Limit similar contacts, need a see all page 2011-03-23 15:02:26 -07:00
zhitomirskiyi
804b0b534a moved the tooltips to be under the icons 2011-03-23 14:23:25 -07:00
zhitomirskiyi
24db7a3b87 added tooltips to the service icons 2011-03-23 14:13:54 -07:00
danielgrippi
fb5bc2805d fix cucumber 2011-03-23 12:42:07 -07:00
Raphael Sofaer
73d4bf4327 Remove unneeded callback 2011-03-23 12:00:47 -07:00
zhitomirskiyi
9abe22d5d2 added a dependant destroy to the service_users 2011-03-23 11:56:15 -07:00
zhitomirskiyi
8a9a95d854 added a flash notice 2011-03-23 11:45:06 -07:00
Raphael Sofaer
cc39243c88 Check for nil in facebook finder 2011-03-23 11:42:33 -07:00
zhitomirskiyi
1cfba68416 this should fix the getting started, going to test on staging first 2011-03-23 11:05:04 -07:00
Raphael Sofaer
dd11edf033 Take out extra callback 2011-03-23 10:42:27 -07:00
Raphael Sofaer
55c5b4e525 Just enqueue a job on service create for now, since our queues are empty. Resque status will let us run the job and show the user a spinny without locking up a thin 2011-03-23 10:41:34 -07:00
Raphael Sofaer
3e8f455cbc Add after_create to queue an updateserviceusers job on service create. We'll see how it works 2011-03-23 10:41:34 -07:00
danielgrippi
b9b9d7e07d renamed home to all aspects in header, made clicking aspect names on right trigger filtering 2011-03-23 10:29:34 -07:00
danielgrippi
43315e14f9 sort contacts by name, not by a potentially nil field 2011-03-23 10:16:55 -07:00
zhitomirskiyi
e45a3503d0 on aspect edit the contacts are now sorted by first name 2011-03-22 18:01:17 -07:00
danielgrippi
0cab18d5aa autofocus username on login page 2011-03-22 17:43:11 -07:00
danielgrippi
fe44ee8230 fix tab order in publisher; removed 'to mention...' text 2011-03-22 17:29:03 -07:00
danielgrippi
2b8b824230 fixed private mention popup in firefox 2011-03-22 17:25:32 -07:00
danielgrippi
a44ca157e6 added text to private message notification; user picture in popup 2011-03-22 17:14:37 -07:00
MrZYX
643a066691 moar translatable 2011-03-22 22:45:36 +01:00
Raphael Sofaer
8835559ae5 Additional logging to debug extra pvs 2011-03-22 13:44:55 -07:00
Sarah Mei
631163ec02 "Add contact" buttons on tag page are smaller and don't appear on top of names. 
Moved some logic from view into user model.
 2011-03-22 13:16:58 -07:00
maxwell
a036a8035f add a plaintext layout for emails, and include a link to change your email settings in the emails 2011-03-22 12:26:38 -07:00
zhitomirskiyi
9f9082fbbd Merge branch 'master' of github.com:diaspora/diaspora 2011-03-22 11:28:01 -07:00
zhitomirskiyi
23d6441d77 start people off with invites if the pod is open 2011-03-22 11:27:29 -07:00
maxwell
dc60181033 404 googlebotz left and right on public remote person pages 2011-03-22 11:26:39 -07:00
danielgrippi
728d0537cb comment out likes just in the views for now 2011-03-22 10:53:46 -07:00
MrZYX
deff67f486 fixed a translation 2011-03-22 13:47:44 +01:00
Raphael Sofaer
fdd158d86a Make urls not change on processing 2011-03-21 18:42:36 -07:00
Raphael Sofaer
85e0736e5b Remove stray puts 2011-03-21 17:12:54 -07:00
Raphael Sofaer
2b997e70c2 Refactor image processing to use 2 uploaders. Federation and s3 need testing 2011-03-21 16:40:53 -07:00
Raphael Sofaer
a45103d0ef Make post not found redirect clearer 2011-03-21 16:40:53 -07:00
zhitomirskiyi
4517c7c1b1 move service icons to right on publisher. swap out RSS for world icon 2011-03-21 16:23:27 -07:00
zhitomirskiyi
c929ce21ad fixed validation on tag length in profile 2011-03-21 16:01:34 -07:00
zhitomirskiyi
058b74846a removed the bring your friends message from the stream 2011-03-21 15:23:34 -07:00
zhitomirskiyi
821703f4d4 fixed url. photo 2011-03-21 14:56:50 -07:00
zhitomirskiyi
93d69c4ec7 fixed the views for the friend finder 2011-03-21 14:56:50 -07:00
zhitomirskiyi
aa5bef0c3f calls the job on login does a sync call if the cache friends was not called before, fixed the views 2011-03-21 14:56:50 -07:00
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
zhitomirskiyi
70d71ec491 service users is green 2011-03-21 14:56:50 -07:00
zhitomirskiyi
ede7d4e8e2 made the job, broke outthe save_users, still need to do lifecycle callbacks 2011-03-21 14:56:50 -07:00
zhitomirskiyi
3afa14d341 wip 2011-03-21 14:56:50 -07:00
MrZYX
a2715ca963 fixed migration naming, fixed translation 2011-03-20 23:00:56 +01:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
c3612ee66d Remove empty helper and spec files. 2011-03-19 22:39:21 -07:00
Sarah Mei
c3b9da8d37 Add specs to conversations#new. Unpending spec for create. 2011-03-19 22:30:58 -07:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
Sarah Mei
c1bf68068f Pull relationship action button from search results out into a partial. 
Copyedit messages.
 2011-03-19 15:59:56 -07:00
MrZYX
7cd1789669 allwow https youtube links 2011-03-19 22:19:31 +01:00
MrZYX
dce54f3d40 fixed #947 2011-03-19 15:05:45 +01:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
Raphael Sofaer
42a361dcce Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests 2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
maxwell
8f9f24f383 fix for photo urls before they are processed 2011-03-18 19:00:24 -07:00
maxwell
5aa969559c add processed to post, which is set to default false for photos 2011-03-18 18:51:53 -07:00
maxwell
91a96adb4b fix syntax error 2011-03-18 18:15:57 -07:00
maxwell
358fdb9521 return the right url for gifs 2011-03-18 18:12:20 -07:00
Raphael Sofaer
e2f78a8b8c Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.' 2011-03-18 14:52:27 -07:00
maxwell
300f592a64 do not process gifs, just let them be. 2011-03-17 22:43:18 -07:00
maxwell
93f7f28b07 if you search for a hash (with a '#') it will just take you to that hash page 2011-03-17 19:16:29 -07:00
maxwell
924dc13adc profile tagging now federates #FO #REAL 2011-03-17 18:05:49 -07:00
zhitomirskiyi
379f242a1f removed the mention_popup class inless in profile 2011-03-17 16:29:04 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
Raphael Sofaer
e5f9876256 Don't socket the unsocketable, for real this time 2011-03-17 15:51:19 -07:00
Raphael Sofaer
a993c48060 Revert "Don't socket the unsocketable" 
This reverts commit bf53ad9f58.
 2011-03-17 15:50:43 -07:00
Raphael Sofaer
bf53ad9f58 Don't socket the unsocketable 2011-03-17 15:50:07 -07:00
maxwell
b2c0cfb173 remove stray br in stream_element 2011-03-17 15:24:00 -07:00
Raphael Sofaer
bef06d18d8 Move notifying iteration into resque job 2011-03-17 15:19:26 -07:00
zhitomirskiyi
43fc2c4d63 fixed the style on the share with list element 2011-03-17 15:19:12 -07:00
zhitomirskiyi
6cc085d64e addded slideToggle 2011-03-17 14:32:07 -07:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
433db9fc8b wip, still need to auto hide, and expand on click the contact setting, styling, also would be nice to cache the friend list, and maybe on login queue up a job to refresh it 2011-03-17 14:32:06 -07:00
maxwell
37fefc5bc9 take out gif exception for processing 2011-03-17 14:16:08 -07:00
maxwell
1de52d3ba2 fixed failing cucumber 2011-03-17 13:59:53 -07:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 2011-03-17 13:59:53 -07:00
maxwell
61bffb50d6 remove puts from photoscontroller 2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe wrote a test for the callback, need to make it pass... 2011-03-17 13:59:53 -07:00
maxwell
58282b91cb move processing to photo callback 2011-03-17 13:59:53 -07:00
maxwell
7ba90a5a98 stuff works 2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3 photos are now successfully delayed 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
maxwell
516b620148 gif and delayed processing wip 2011-03-17 13:59:53 -07:00
Raphael Sofaer
52691920f7 Change 406 to 422 2011-03-17 13:13:47 -07:00
Raphael Sofaer
d2cdc20e2b Finish receive local batch job 2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9 SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3 added job and spec for BatchLocalReceive. wip 2011-03-17 12:56:23 -07:00
MrZYX
149b1832fd added newline to stream element partial, otherwise timeago & comment won't display if aspect badge is too big 2011-03-17 20:51:08 +01:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
maxwell
eed32f70be add a missing space for notifications with less than 4 people 2011-03-17 10:50:11 -07:00
MrZYX
78eebc8920 fixed #935 2011-03-17 16:59:02 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -07:00
zhitomirskiyi
b0ec5a0b2e moved the fixture to the right place 2011-03-16 18:10:50 -07:00
danielgrippi
e9c094fc2f add styling on tag header 2011-03-16 17:53:25 -07:00
danielgrippi
55ac4c8054 show tags under names in people partials 2011-03-16 17:46:09 -07:00
danielgrippi
a85b5bb70f add a people count on tag page 2011-03-16 17:27:27 -07:00
zhitomirskiyi
abbf949fe1 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-16 16:35:30 -07:00
MrZYX
e7b4d4e494 the build was failing for a reason 2011-03-16 15:40:56 +01:00
danielgrippi
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
Raphael Sofaer
7636fec270 Fix select in postscontroller 2011-03-15 18:36:27 -07:00
danielgrippi
68479481cf made websockets far less dumb. don't render partials for people not connected. 2011-03-15 18:21:09 -07:00
danielgrippi
9115a8f1f5 Only show searchable people in postscontroller 2011-03-15 16:22:17 -07:00
danielgrippi
8c7ad9a0a3 Remove unused receive local job 2011-03-15 16:13:09 -07:00
danielgrippi
4943531013 Add stream class to side_stream 2011-03-15 15:20:02 -07:00
danielgrippi
67de069469 Inline the person partial on posts index 2011-03-15 15:13:43 -07:00
danielgrippi
be42ccfa16 Be less glib 2011-03-15 15:03:20 -07:00
MrZYX
4e4e4d763a fixed translations 2011-03-15 21:58:15 +01:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb a user can put tags in their profile and they show up on the person/show page. 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00
MrZYX
73f852c6c2 fixed video embedding in comments 2011-03-15 17:48:28 +01:00
MrZYX
21d0fcf47a fixed some 500 on mobile site 2011-03-15 17:02:04 +01:00
MrZYX
cf66e3aebb fixed test in invitation email 2011-03-15 16:25:47 +01:00
Ritchie Wilson
81661d61fc changes the 'You are not sharing with...' button to static text instead of inserting the persons name 2011-03-15 10:00:15 -04:00
maxwell
2e72fc09c6 made 3+ plus collapse in notifications index 2011-03-14 18:09:51 -07:00
Raphael Sofaer
1666843aa9 Fix 500 in publicsController 2011-03-14 16:48:07 -07:00
maxwell
b14ac9606f fix typo, puts in a test, and made the emails types a constant in UserPreferences 2011-03-14 12:21:30 -07:00
Raphael Sofaer
1b0445563e Specs passing with text 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50 more tests for mailing. the bug was i think we have to restart the resque workers 2011-03-14 11:32:59 -07:00
maxwell
28fc093a01 fix bug in user edit mailer view 2011-03-14 11:32:59 -07:00
maxwell
d91fda656c Revert "js hack to see bigger version of photo thumbnails in the stream without being abnoxious" 
This reverts commit ab997e2d21.
 2011-03-14 09:51:06 -07:00
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
Kiran Soumya
7c3a173010 Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post 2011-03-12 11:08:40 +05:30
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
maxwell
e52d14f1e9 attempting to fix bug #913 2011-03-11 17:43:55 -08:00
maxwell
ab997e2d21 js hack to see bigger version of photo thumbnails in the stream without being abnoxious 2011-03-11 17:16:43 -08:00
maxwell
50d9d76562 update translations for email settings, and missing translation for aspect#new 2011-03-11 16:02:24 -08:00
maxwell
d825eeaaa0 updated to listen to disable mail 2011-03-11 15:43:40 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
maxwell
e9a843b095 email prefs are now saved. need more tests and use it in user#mail 2011-03-11 15:42:53 -08:00
Raphael Sofaer
9f368bf82f Change person show page to created_at ordering, since you're looking at that person's content 2011-03-11 10:15:17 -08:00
Raphael Sofaer
fbfd46a506 change peoplecontroller order, fix grammar in public default 2011-03-11 10:12:37 -08:00
MrZYX
879672576f fixed #919 2011-03-11 19:11:03 +01:00
MrZYX
e3c5e7ba05 person -> author in app/views/comments/_comment.mobile.haml 2011-03-11 16:20:05 +01:00
MrZYX
e4be5db881 there can be no reason to not set the locale 2011-03-11 15:37:33 +01:00
Michael Nutt
c7362707b3 fix js error; stream ajax success handler should expect json 2011-03-11 00:31:43 -05:00
maxwell
ffa6b9879f added default development page so it doesnt look so terrible 2011-03-10 20:31:39 -08:00
danielgrippi
54130b49b7 Revert "fix a few invalid html tags" 
This reverts commit 004d9b5028.
 2011-03-10 19:42:37 -08:00
danielgrippi
9ad96726de just use tag search for now 2011-03-10 19:42:24 -08:00
Michael Nutt
004d9b5028 fix a few invalid html tags 2011-03-10 22:18:40 -05:00
Dan Hansen
490a2c6a9e remove extra protocol in the link 2011-03-10 21:16:45 -06:00
Raphael Sofaer
35903514f5 remove wasteful join 2011-03-10 18:53:23 -08:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c35f143b29 always link to hashtag. 2011-03-10 18:37:45 -08:00
Raphael Sofaer
ea98b1ca81 Tags now link to meaningless query in PostsController 2011-03-10 18:37:45 -08:00
Raphael Sofaer
f19857cc40 Simplify regex madness 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
Dan Hansen
c9545920f8 title on landing page 2011-03-10 18:40:54 -06:00
Dan Hansen
214c677169 process videos last so there aren't conflicts with other markdownify methods 2011-03-10 18:29:08 -06:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
Dan Hansen
93bdf1e91e add space before link 2011-03-10 18:01:08 -06:00
danielgrippi
2cf0503310 put text below photo in stream 2011-03-10 15:28:44 -08:00
Raphael Sofaer
05f9d79689 Fix public posts page when signed in 2011-03-10 15:26:55 -08:00
danielgrippi
1f3261b2ef make photos larger in the stream 2011-03-10 15:17:41 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
Michael Nutt
8837632dd9 User should be able to comment on their own photo 2011-03-10 16:42:07 -05:00
Michael Nutt
8c5621158d notification now only created when message is received, not when message is first saved 2011-03-10 16:41:03 -05:00
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
maxwell
7b0a354677 slight tweaks to pubsubhubub publishing 2011-03-10 12:17:34 -08:00
MrZYX
58796dcde2 uhm, --amend 2011-03-10 15:35:40 +01:00
MrZYX
7bf256ecfa we need @all_aspects not only in html views 2011-03-10 15:29:49 +01:00
maxwell
1baafac84b added content to rss feed 2011-03-09 19:11:09 -08:00
maxwell
af43a60b62 only grab statuses for public feed 2011-03-09 18:12:36 -08:00
Raphael Sofaer
584684560e Make conversation delete clearer 2011-03-09 17:58:29 -08:00
Raphael Sofaer
e6836c46a7 Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests 2011-03-09 17:50:46 -08:00
Raphael Sofaer
f2cc51dd0d Take current user id out of avatar 2011-03-09 17:50:46 -08:00
maxwell
1ac688f82c moved an ostatus builder query out to the controller, where it belongs, and corrected the order 2011-03-09 17:33:47 -08:00
maxwell
9d480b0961 remove status_message#public_message: we never use it 2011-03-09 17:14:37 -08:00
maxwell
f9279f9bbc fixed public route not fetching posts, also an error in status_message activity markup 2011-03-09 17:08:41 -08:00
Raphael Sofaer
eafa965504 Try explicitly querying rather than getting postvisibilities 2011-03-09 16:17:48 -08:00
Raphael Sofaer
f8c0906db7 Instrumenting activerecord object instantiation to do some profiling 2011-03-09 13:54:28 -08:00
MrZYX
dc7a672d9f fixed some translations 2011-03-09 22:46:58 +01:00
danielgrippi
ee6932a3f7 added title to padlock on aspect edit pane 2011-03-09 12:15:23 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
Raphael Sofaer
c259fc65f0 You can now pass hashes to the logger 2011-03-09 11:48:29 -08:00
MrZYX
5631e45b6d --amend 2011-03-09 15:49:16 +01:00
MrZYX
0d1133cd51 fixed some translations 
do not escape html in private_message text only email
 2011-03-09 15:33:46 +01:00
zhitomirskiyi
c697df4b5a markdownafy the private message text 2011-03-08 23:12:04 -08:00
danielgrippi
dda477410d use conversations_url() with a param in private message emails 2011-03-08 22:11:34 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5 added missing translation 2011-03-08 19:22:49 -08:00
zhitomirskiyi
c252cfa025 added the email notification, the notification is not persisted, fixed the receive callback spec 2011-03-08 18:24:56 -08:00
danielgrippi
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
zhitomirskiyi
84198e4750 Merge branch 'private_messages' of github.com:diaspora/diaspora into private_messages 2011-03-08 11:57:49 -08:00
MrZYX
5f841b9add do not escape html in text only emails 2011-03-08 20:45:02 +01:00
danielgrippi
78e30ff459 update unread count in conversation visibility when hitting conversationscontroller#show 2011-03-08 11:43:58 -08:00
MrZYX
7b5b980095 link to public feed of the person on the profile person show page instead of to the one of current_user 
fixed #700
fixed #864
fixed #774
 2011-03-08 20:30:48 +01:00
zhitomirskiyi
8bcf1b49c7 notifier for the messages, we're so close 2011-03-08 10:53:49 -08:00
danielgrippi
fb5e5cc341 cleaned up new message facebox 2011-03-07 20:14:22 -08:00
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
Raphael Sofaer
b7c3f93d25 Use delegation in PostFake, use render => :collection in stream 2011-03-07 12:20:46 -08:00
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
Raphael Sofaer
a45f46828a re-enable commenting box on show page without comments, but it looks kind of ugly 2011-03-07 10:18:50 -08:00
Raphael Sofaer
909a198380 Post photos without text 2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a pulling in 2011-03-06 21:37:27 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
danielgrippi
8fafc48d32 more private message wip. 2011-03-04 18:17:49 -08:00
danielgrippi
d50863cc90 added the ability to message someone from their profile page 2011-03-04 11:28:09 -08:00
danielgrippi
48fff29bf6 fixed conversation receive. made visibilities on conversation :dependent => :destroy 2011-03-04 11:19:01 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
Raphael Sofaer
eb9705c82d Adjust batch invite text 2011-03-03 17:23:20 -08:00
Raphael Sofaer
435451bc5b admins can resend invitations 2011-03-03 16:59:33 -08:00
MrZYX
f0ba62be59 replaced ▼ with &#9660;, this fixes #904 and shouldn't harm anything. 2011-03-03 21:32:44 +01:00
Raphael Sofaer
3d0831f2b2 Merge remote branch 'mnutt/photo_upload_status' 2011-03-03 11:43:16 -08:00
Raphael Sofaer
da12954d22 Move statusmessage create view out to partial 2011-03-03 11:10:44 -08:00
zhitomirskiyi
2522ab7ee4 refactoring the conversation views, wip 2011-03-03 10:39:32 -08:00
Raphael Sofaer
685130cbd4 Take out n-query on home page 2011-03-02 13:34:06 -08:00
zhitomirskiyi
9d7611f8d8 addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling 2011-03-02 12:27:57 -08:00
Raphael Sofaer
770091e82b Don't retrieve all the user's contacts again unnecessarily 2011-03-02 12:11:25 -08:00
zhitomirskiyi
f58c477673 added the forgotten files 2011-03-01 23:55:11 -08:00
Sarah Mei
ba6afa50e8 Removing extra csrf tag. Thx feanor12. 2011-03-01 22:25:05 -08:00
zhitomirskiyi
3812612c86 added a validation of participant, as well as messages controller spec wip 2011-03-01 19:24:07 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397 private messages wip 2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b broke out some comment logic to a replayable module 2011-03-01 12:28:33 -08:00
zhitomirskiyi
bd908a9b95 conversations federate 2011-03-01 12:25:55 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
a179bac689 fixed migrations, added unread to PrivateMessageVisibilities 2011-03-01 12:25:54 -08:00
danielvincent
979d9d7fb4 added delete actions for private messages 2011-03-01 12:14:31 -08:00
danielvincent
090c412690 touched up AspectMembership resource 2011-03-01 12:14:31 -08:00
danielvincent
c5801ffb37 basic views / controller actions for private messages 2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881 added PrivateMessage and PrivateMessageVisibility models and migrations 2011-03-01 12:14:31 -08:00
Raphael Sofaer
a7f149e399 Possible performance gain from not hitting posts relation 2011-03-01 11:42:57 -08:00
Raphael Sofaer
00cca370ad Add translation key method, should be replaced with separate partials. 2011-03-01 11:03:58 -08:00
Raphael Sofaer
1c1fba63e7 Refactor notification to have subclasses, just a start 2011-03-01 10:30:29 -08:00
Raphael Sofaer
809ee8a678 Started notifications refactor 2011-03-01 10:30:29 -08:00
MrZYX
00ebf6469b it can happen that the http referer is nil when we expect it to be set (for example if the user has a privacy extension enabled 2011-03-01 18:38:40 +01:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
Michael Nutt
208a47162c add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00
Michael Nutt
b6dc32959c place thumbnails inside status message form and add spacing 2011-02-27 02:04:43 -05:00
MrZYX
afecfe5e93 save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db 2011-02-26 14:22:14 +01:00
maxwell
782dc55d63 remove puts, fix admins controller test 2011-02-26 14:22:13 +01:00
maxwell
b95c9b2e66 actually send email from admin interface inviter 2011-02-25 14:54:07 -08:00
Raphael Sofaer
22d83ec502 update http_multi to adjust urls when you get a redirect 2011-02-25 14:46:21 -08:00
Raphael Sofaer
f3202e15d6 add follow_location to typhoeus default jobs 2011-02-25 13:38:24 -08:00
Raphael Sofaer
7693c162c2 LOG MORE, better logging in http_multi failures 2011-02-25 12:16:17 -08:00
zhitomirskiyi
ec93faa2c4 added the post to services icon on every page added a manage icon and moved the RSS link to the public explain 2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631 can now select individual services to be added 2011-02-24 17:31:54 -08:00
zhitomirskiyi
e61cc2fd34 made the postzord take the services in individually 2011-02-24 17:31:54 -08:00
zhitomirskiyi
126925f28f wip 2011-02-24 17:31:54 -08:00
zhitomirskiyi
78b242b110 removed post to services since we are not using it 2011-02-24 17:31:54 -08:00
Raphael Sofaer
c030e8b21e Move the @ inside the mention links 2011-02-24 15:52:47 -08:00
Raphael Sofaer
40dea1f625 LOG MORE, when http to another pod fails 2011-02-24 15:52:37 -08:00
Raphael Sofaer
736783abd7 You can't call post.person when post is nil. We should probably just reject and delete the invalid notifications in the controller, keeping them in the view is aggravating 2011-02-24 11:13:25 -08:00
Raphael Sofaer
e964490a9a Escape xml before dispatch 2011-02-23 16:06:55 -08:00
Raphael Sofaer
faf026dec6 Update dispatcher to use HttpMulti job 2011-02-23 16:06:55 -08:00
maxwell
bb5d5fc2c0 typhoeus fixes and a few changes to the chef scripts 2011-02-23 16:06:55 -08:00
maxwell
638311125f typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install 2011-02-23 16:06:55 -08:00
maxwell
c9dd2d5b50 add files 2011-02-23 16:06:54 -08:00
MrZYX
98cdee97c0 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into inflections 
Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/publics_controller.rb
 2011-02-24 00:33:34 +01:00
zhitomirskiyi
e106ec6a79 added post author to the subject of the also commented email as well as the notification 2011-02-23 13:03:11 -08:00
zhitomirskiyi
97e00f9ee3 changed the delete to a destroy on retraction, also removed a puts 2011-02-23 12:00:42 -08:00
maxwell
16e8ecc72c fixing debugging statement in smcontroller, also fix the spec 2011-02-22 22:38:23 -08:00
maxwell
e446dcaeb5 make sm_controller show the error in the js 2011-02-22 22:21:48 -08:00
maxwell
5bce2d1615 remove mongomapper error handler in photos_controller#create 2011-02-22 22:02:58 -08:00
maxwell
ec21230756 make status_message_controller#create return the error message 2011-02-22 22:01:08 -08:00
Dan Hansen
e4ba498d70 whoops 2011-02-22 23:21:50 -06:00
Dan Hansen
f41bc0c14d <3z 2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09 make video urls have correct href 2011-02-22 18:51:40 -08:00
maxwell
eb9a943724 parinoid checks for admin page thx dangold 2011-02-22 15:43:10 -08:00
Dan Hansen
9ef6606f80 load jquery from google only if local copy fails 2011-02-22 13:41:05 -06:00
Dan Hansen
e04685e7ab remove unused javascript that's in a view 2011-02-21 23:25:38 -06:00
MrZYX
feb47df97e total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit 2011-02-21 17:13:11 +01:00
Sarah Mei
49adf5034f Revert javascript move 2011-02-20 20:05:40 -08:00
danielvincent
3d6d742def move js to body bottom 2011-02-20 16:31:06 -05:00
MrZYX
da244f8438 reintroduced remember me on the login page 2011-02-20 21:49:08 +01:00
MrZYX
ab706f4127 fixed sort by css for languages different from english 2011-02-20 19:00:13 +01:00
MrZYX
77cac72ed5 fixed #306 2011-02-20 13:34:22 +01:00
MrZYX
2b625c468a Merge branch '874-wrong-time-ago-on-notifications' of https://github.com/grzuy/diaspora 2011-02-20 13:03:33 +01:00
MrZYX
af14fa76a1 fixed #881 2011-02-20 13:00:30 +01:00
Gonzalo Rodriguez
ea3b719253 Fixed notifications time-ago calculation 2011-02-20 05:13:34 -02:00
Sarah Mei
77adc02cbd Fix spec failure related to presence of app config settings. Also, you can't test application controller directly. 2011-02-19 22:17:22 -08:00
MrZYX
aa6ac41d68 remeber sort order 2011-02-19 17:06:26 +01:00
MrZYX
11f95ee596 fixed broken css for other languages at account settings page 2011-02-19 14:27:45 +01:00
Jonne Hass
02f7f10ef1 Minimal fix to admins_controller.rb 2011-02-19 04:49:05 -08:00
MrZYX
124ac738ea 'sort by:'translatable 2011-02-19 11:39:28 +01:00
Gonzalo Rodriguez
778afa2889 Update locale before loading flash notice on user language update 2011-02-19 02:25:03 -02:00
zhitomirskiyi
199d5fbdc1 the alt text now displays the correct number of contacts in an aspect 2011-02-18 17:44:47 -08:00
zhitomirskiyi
61dd5a835a default scope on contact 2011-02-18 17:38:02 -08:00
maxwell
43f17b3ed8 made toggle for post time on aspects#index 2011-02-18 16:47:44 -08:00
maxwell
3c8a87783f stream order can take created at to be sorted by origin post time 2011-02-18 16:07:22 -08:00
maxwell
37a699ace1 stream order can take created at to be sorted by origin post time 2011-02-18 16:01:04 -08:00
maxwell
0bf3cae54a MS IZ added spec from admin page, moved it to its own controller where it belongs 2011-02-18 11:35:24 -08:00
maxwell
e3b298c5d4 this may be temp. i want to see if ci passes; Revert "I18n: Workaround for a weired caching issue when multiple users are logged in" 
This reverts commit dfa5d875c5.
 2011-02-17 19:01:42 -08:00
maxwell
2540c5adb9 adding person and profile to show 2011-02-17 18:15:35 -08:00
zhitomirskiyi
8196ee33dd making instantiating an empty contact 2011-02-17 18:05:22 -08:00
zhitomirskiyi
23754ec3fb added the files 2011-02-17 18:05:21 -08:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
zhitomirskiyi
25671f07c7 refactor of a line 2011-02-17 18:05:21 -08:00
zhitomirskiyi
ba779e18d6 aspect memberships are now dependant delete_all on contact 2011-02-17 18:05:21 -08:00
zhitomirskiyi
1e6bf9c80e MS IZ the cucumber now passes 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb aspect membership refactor complete 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705 wip 2011-02-17 18:05:21 -08:00
maxwell
17a801394e work in progress. need to update the views for the controller changes 2011-02-17 18:05:21 -08:00
maxwell
6858e2e543 crazy ugly admin interface so an admin can invite people, and search for user accounts for basic debugging 2011-02-17 18:00:59 -08:00
Raphael Sofaer
2304827569 Only save the connected person if it has changed 2011-02-17 20:30:38 -05:00
danielvincent
fc9d9a4c55 make the invite friends dialog more obvious 2011-02-17 15:58:37 -05:00
MrZYX
b7ce51d206 Merge branch '680-error-on-login-goes-away-quickly' of https://github.com/grzuy/diaspora into flashmsg 2011-02-17 15:34:42 +01:00
Raphael Sofaer
cd7e4d6e8f Requests create a read, rather than unread, notification 2011-02-16 23:44:25 -05:00
Gonzalo Rodriguez
11e431f640 Add flash message above the login form 2011-02-16 23:37:28 -02:00