Commit graph

969 commits

Author SHA1 Message Date
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
Michael Nutt
b6dc32959c place thumbnails inside status message form and add spacing 2011-02-27 02:04:43 -05:00
Michael Nutt
43e10307a6 fix broken jquery autoresize plugin 2011-02-27 02:03:55 -05:00
Dan Hansen
c9af2e87aa service icons and public icon use pointer cursor 2011-02-25 16:48:13 -06: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
maxwell
e446dcaeb5 make sm_controller show the error in the js 2011-02-22 22:21:48 -08:00
Raphael Sofaer
17f41f1291 Make login-error shadow more readable 2011-02-22 18:08:46 -08:00
Dan Hansen
801382714a remove jquery 1.4.2, we never use it 2011-02-22 13:59:10 -06:00
MrZYX
166f75d883 I think I fixed #882 2011-02-20 22:10:27 +01: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
5ac91d771a fixed #507 2011-02-20 13:55:54 +01:00