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

1081 commits

Author SHA1 Message Date
zhitomirskiyi
cd7cced9c0 renamed the js to indicate custom 2011-03-29 17:25:35 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -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
MrZYX
68b2e47b87 go away robots, we don't want you\! 2011-03-29 20:34:20 +02:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07: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
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
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
maxwell
310f529914 dumb api console 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
33c013633f fix cucumber, comments 2011-03-23 18:22:43 -07:00
danielgrippi
2a1914a8f2 fixed comment socket bug on posts where there are no new comment areas 2011-03-23 17:55:18 -07:00
danielgrippi
b6d5165f2d scroll to post on page if you can see it (via notification popup) 2011-03-23 17:16:30 -07:00
danielgrippi
363c5f4dae fix gradient direction on add/remove buttons 2011-03-23 12:42:07 -07:00
danielgrippi
e4e8d7ada4 fixed aspect selector bug in header 2011-03-23 11:59:09 -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
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
danielgrippi
cc01beb3d0 cross-browser opacity mixin 2011-03-22 12:40:44 -07:00
danielgrippi
48598a9942 added linear-gradient mixin. 2011-03-22 12:35:03 -07:00
danielgrippi
557b5393c2 fix sass error 2011-03-22 12:14:50 -07:00
danielgrippi
cb533c8675 added box-shadow and border-radius mixins. changed _mixins.sass to _mixins.scss 2011-03-22 12:02:54 -07:00
maxwell
5570182e69 use autoresize extraSpace to kill the bug where the comment box is not big engough for the comment, still could use some love 2011-03-22 11:59:10 -07:00
maxwell
35bc86f6a6 dont auto embedd images, untill we think of something better to do 2011-03-22 10:55:41 -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
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
maxwell
970e9bee04 Revert "make image width max out at 100%" 
This reverts commit 32efbeb903.
 2011-03-21 11:40:52 -07:00
Maxwell Salzberg
32efbeb903 make image width max out at 100% 2011-03-21 10:10:03 -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
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
MrZYX
25aadebf46 fixed #946 with a solution that doesn't break the links 2011-03-19 21:50:40 +01:00
MrZYX
6fe4b5bc56 fixed 946 2011-03-19 14:21:06 +01:00
William Theaker
1b4827bc7b 16px wrench icon 2011-03-19 02:16:24 -04:00
MrZYX
1885909e30 quickfix for image embedding image size 2011-03-18 13:38:56 +01:00
maxwell
2bd15bf3e6 embed images, and make sure they are activated on a new message is posted 2011-03-17 22:03:47 -07:00
maxwell
275098a309 embed images, and make sure they are activated on a new message is posted 2011-03-17 21:48:11 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
2ed6cc673a fixed css bug 2011-03-17 15:31:06 -07:00
maxwell
b2c0cfb173 remove stray br in stream_element 2011-03-17 15:24:00 -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
maxwell
14ff1e0143 ms dg improved styling, fixed delete 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
zhitomirskiyi
6a33ae7795 fixed the css, added a space 2011-03-16 19:20:24 -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
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
20b5ca7570 added tag helper text on profile, edit on hover 2011-03-15 22:10:20 -07:00
danielgrippi
4943531013 Add stream class to side_stream 2011-03-15 15:20:02 -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
maxwell
a419ddac11 make sure audio player does not delete sm text 2011-03-14 18:20:03 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -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
e8bb4c2d66 added preload='none' to the audio tag (#928) 2011-03-14 13:07:27 +01:00
William Theaker
67affa2f5f wrench 2011-03-12 02:57:15 -05: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
Angjoo
5582c2b5f3 revert max width commit 2011-03-11 15:20:12 -08:00
Angjoo
2ff4af6800 fixed tab to spaces 2011-03-11 14:36:07 -08:00
Angjoo
6e78d6f6c5 ajk ms css fix for header .container width 100% 2011-03-11 14:02:49 -08:00
Raphael Sofaer
fbfd46a506 change peoplecontroller order, fix grammar in public default 2011-03-11 10:12:37 -08:00
MrZYX
c502e4591a do not confuse the terminology again, link #diaspora, not #diaspora-dev channel, link user mailing list 2011-03-11 15:46:12 +01:00
Maxwell Salzberg
14033e7b5f ajk ms or is a single pipe 2011-03-11 00:16:17 -08:00
Maxwell Salzberg
e2903a1251 get rid of the period, it might be screwing stuff up 2011-03-11 00:12:48 -08:00
Maxwell Salzberg
189b7fb5ac ajk ms only grab stream links 2011-03-11 00:01:01 -08:00
Maxwell Salzberg
2b38fe820f ajk ms escape period in ogg... also replace the parent so it is not inside an a tag 2011-03-10 23:52:22 -08:00
Maxwell Salzberg
cdab6a1a84 ajk ms add ogg to the audio tag linker 2011-03-10 23:33:20 -08:00
danielgrippi
29d23d9f43 make audio tags display block in the stream 2011-03-10 21:54:29 -08:00
maxwell
5748639c08 sm ms audio tag 2011-03-10 21:33:42 -08:00
Michael Nutt
c7362707b3 fix js error; stream ajax success handler should expect json 2011-03-11 00:31:43 -05:00
Michael Nutt
ead1f80b08 websocket js handler should know about different notification types 2011-03-11 00:31:43 -05:00
Dan Hansen
d448436376 this refers to the dom element, not Embedder 2011-03-10 23:11:06 -06:00
Dan Hansen
b50217c98c clean up default.html 2011-03-10 23:06:34 -06:00
maxwell
ffa6b9879f added default development page so it doesnt look so terrible 2011-03-10 20:31:39 -08:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
danielgrippi
1f3261b2ef make photos larger in the stream 2011-03-10 15:17:41 -08:00
Raphael Sofaer
0416fa14b2 Just use /users/me to update open aspects 2011-03-10 13:03:45 -08:00
Raphael Sofaer
f2cc51dd0d Take current user id out of avatar 2011-03-09 17:50:46 -08: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
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
danielgrippi
78e30ff459 update unread count in conversation visibility when hitting conversationscontroller#show 2011-03-08 11:43:58 -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
danielgrippi
97aff09140 added autocomplete on message 'to' field, minor css tweaks to inbox 2011-03-07 11:22:59 -08:00
Raphael Sofaer
6e7bdf7cad don't change photos while commenting 2011-03-07 10:32:31 -08:00
Raphael Sofaer
8c1cb0d6e8 Comment button needs to be moved into comment box line 2011-03-07 10:27:54 -08:00
danielgrippi
8fafc48d32 more private message wip. 2011-03-04 18:17:49 -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
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
Michael Nutt
ac2c50b33f denote that fileuploader has been modified 2011-02-28 20:37:41 -05:00
Michael Nutt
1bfbb4b605 make mention helper text and file upload status line up 2011-02-27 12:45:32 -05:00
Michael Nutt
208a47162c add onAllComplete event to fileupload.js; hide mention helper during upload 2011-02-27 12:44:56 -05:00