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

3746 commits

Author SHA1 Message Date
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