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

478 commits

Author SHA1 Message Date
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
Raphael Sofaer
160e01f7bd Fix broken sorting by activity 2011-05-07 00:50:26 -04: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
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
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
MrZYX
f98a4ee42c correct links to atom feed 2011-04-02 17:35:23 +02:00
danielgrippi
bdff036cda remove spacing from stream elements 2011-04-01 11:26:04 -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
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
zhitomirskiyi
bb4c2ee85d added a character count to the publisher 2011-03-30 19:11:24 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -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
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
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
danielgrippi
aa4c20e404 pass post to comments partial. use sql in raw_visible_posts 2011-03-29 17:31:57 -07:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
danielgrippi
535e686b2c fixed tag ordering in stream_element partial 2011-03-23 16:24:12 -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
fe44ee8230 fix tab order in publisher; removed 'to mention...' text 2011-03-22 17:29:03 -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
zhitomirskiyi
4517c7c1b1 move service icons to right on publisher. swap out RSS for world icon 2011-03-21 16:23:27 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
zhitomirskiyi
379f242a1f removed the mention_popup class inless in profile 2011-03-17 16:29:04 -07:00
maxwell
b2c0cfb173 remove stray br in stream_element 2011-03-17 15:24:00 -07:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 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
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
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
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
danielgrippi
c608c70ca7 tagging profiles complete 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
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
MrZYX
2a5d41cc82 fixed translations for comments 2011-03-13 21:16:43 +01:00
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
Michael Nutt
c7362707b3 fix js error; stream ajax success handler should expect json 2011-03-11 00:31:43 -05:00
danielgrippi
54130b49b7 Revert "fix a few invalid html tags" 
This reverts commit 004d9b5028.
 2011-03-10 19:42:37 -08:00
Michael Nutt
004d9b5028 fix a few invalid html tags 2011-03-10 22:18:40 -05:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -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
d38e3a6b29 added translations to all conversation/message views. tweaked css 2011-03-08 15:51:46 -08:00
Raphael Sofaer
b7c3f93d25 Use delegation in PostFake, use render => :collection in stream 2011-03-07 12:20:46 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
zhitomirskiyi
2522ab7ee4 refactoring the conversation views, wip 2011-03-03 10:39:32 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Michael Nutt
208a47162c add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05: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
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
David Morley
6df0a25327 fix link to facebox 2011-02-12 14:57:35 -08:00
zhitomirskiyi
ea3afa6720 added the mention explanation text 2011-02-11 17:31:23 -08:00
zhitomirskiyi
d1771bbe17 notifications for mentions 2011-02-10 12:39:05 -08:00
Raphael Sofaer
a307519e94 Put avatar on cmment form all the time, fix socketed comment form 2011-02-10 11:05:12 -08:00
zhitomirskiyi
1da965616b added an option to remove a contact from the last aspect, after a prompt 2011-02-09 17:47:27 -08:00
Raphael Sofaer
c11ffe93c0 Actually close the publisher on and with Publisher.close() 2011-02-09 16:07:25 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial" 
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
 2011-02-08 16:40:33 -08:00
danielvincent
151999c582 reference the right thing in mobile views 2011-02-06 23:49:22 -08:00
danielvincent
01cfeb65b2 fixed build 2011-02-06 23:42:01 -08:00
danielvincent
8269e4b300 touched up photo show and status message show pages 2011-02-03 13:05:25 -08:00
Raphael
cd8d9989cf Refactor publisher JS, use hidden field for submitting 2011-02-02 14:27:14 -08:00
danielvincent
693ad112ba stream element sockets in non-mobile 2011-02-02 11:29:37 -08:00
zhitomirskiyi
17a2c9e311 moving over some code migration successful 2011-01-29 23:34:11 -08:00
zhitomirskiyi
897786bce4 able to send email invites if the pod is not fb connected 2011-01-27 13:53:53 -08:00
MrZYX
cbfefc8fc3 fixed some untranslatable strings, thanks to Nygu 2011-01-27 21:04:03 +01:00
MrZYX
14f4e1aa57 some fixes to the translations of the mobile site 2011-01-27 18:20:25 +01:00
zhitomirskiyi
bc81154c46 consolidated invite/invite friends sections on aspect/index 2011-01-26 18:05:42 -08:00
maxwell
cef10c1228 added public button to the mobile publisher. make status message mobile redirect to back; also, include minifiyed jququery mobile css 2011-01-24 23:18:24 -08:00
maxwell
d040de541a fix error in stream and puts in fake 2011-01-24 19:09:38 -08:00
maxwell
8b3beba93f adding login page to mobile, and adding timeago WIP 2011-01-24 17:36:47 -08:00
Dan Hansen
b533d31fad make the footer not so useless 2011-01-24 12:23:51 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
383876ddf4 mobile stream sass tweaks 2011-01-24 12:22:18 -08:00
danielvincent
39c5189c1f everything ported from pre-mysql mobile stuff. things missing: search page, aspect switcher, notification badge. 2011-01-24 12:22:17 -08:00
Dan Hansen
0d905a7124 i18n locale fix 2011-01-24 03:14:19 -06:00
Dan Hansen
8293016348 make the footer not so useless 2011-01-23 23:53:17 -06:00
danielvincent
c96098540b ask a question in the publisher. (not removing previous translation & method just yet). 2011-01-23 11:06:08 -08:00
danielvincent
77042f9d47 publisher always shows textarea. outline publisher textarea in blue 2011-01-22 18:49:50 -08:00
Raphael
2c68bb0305 Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
Raphael
a5b4dd2604 fix js bug, add spec 2011-01-19 16:58:01 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
zhitomirskiyi
0cb9f1c0d7 focus publisher on reshare 2011-01-18 10:51:05 -08:00
Raphael
36781481bb Pulling in changes from master 2011-01-17 11:41:15 -08:00
danielvincent
e2fdad02f1 css fixes, incl. timeago style fix on stream_element 2011-01-14 22:12:31 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00