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

7031 commits

This branch
This branch
All branches
Author SHA1 Message Date
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -07: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
danielgrippi
c67d143719 dropdown in ContactsController#sharing now works 2011-05-11 15:47:13 -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
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07: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
MrZYX
f6e4be35a1 white-space: nowrap; for buttons 2011-05-04 17:53:22 +02:00
MrZYX
1dcb0e4863 fixed #1038 2011-05-04 16:22:24 +02:00
MrZYX
a71c4b3f69 added japanese 2011-05-04 15:47:02 +02:00
MrZYX
c59ef78a99 updated locales 2011-05-04 15:44:29 +02:00
MrZYX
77bae90d0e moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
Raphael Sofaer
abde3244b5 InfiniteScroll#options doesn't need to be a function 2011-05-03 14:54:49 -07:00
Raphael Sofaer
89ec768d06 Rev thin again, 1.2.10 segfaults 2011-05-03 14:44:33 -07:00
MrZYX
1b9f5f8709 updated locales 2011-05-03 23:13:13 +02:00
MrZYX
c13b5a0628 pulled in plural definitions from CLDR; adjusted READMEs in locales subdirs 2011-05-03 23:08:32 +02:00
Raphael Sofaer
87864bf4ff people.diaspora_handle, not profiles.diaspora_handle 2011-05-03 11:39:34 -07:00
Raphael Sofaer
45c5cd4b95 Don't test for nonexistent instance variable 2011-05-03 11:19:27 -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
danielgrippi
77372b2f08 update robots.txt to only exclude /people/ 2011-05-03 10:32:50 -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
Maxwell Salzberg
c41acbabd6 grammer on notifications#index 2011-05-02 17:48:51 -07:00
Raphael Sofaer
94bc18e467 Make websocket closed message less disruptive 2011-05-02 17:12:18 -07:00
Raphael Sofaer
cb483beada Rev Thin for a 'can't find Thin::HttpParser' bug 2011-05-02 15:58:57 -07:00
Raphael Sofaer
83a3655bfe Don't infinitescroll undefined 2011-05-02 15:28:42 -07:00
Raphael Sofaer
2abb592833 Destroy old infinite scrollers to keep event bindings from piling up 2011-05-02 14:08:41 -07:00
Raphael Sofaer
bc8b6097bc Update infinite scroll plugin for $.fn.infinitescroll.destroy 2011-05-02 14:08:41 -07:00
MrZYX
75234a511d in most configuration example I've seen the cert comes before the key ;) 2011-05-02 22:35:37 +02:00
MrZYX
034033f743 updated locales 2011-05-01 23:28:12 +02:00
Raphael Sofaer
567b440f3d Use correct pagination in mobile person show 2011-04-30 10:26:16 -07:00
Raphael Sofaer
899963d487 Move created_at back a second in .post 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
Adrián Chaves Fernández (Gallaecio)
e7e9ef3ad5 Some translations reviewed. 2011-04-30 23:51:36 +08: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
Jonne Hass
84412863dc (minor change) move bookmarklet route to the right place 2011-04-30 06:51:37 -07:00
MrZYX
12557e7e84 updated locales 2011-04-30 13:51:02 +02:00
Dan Hansen
73680a54e5 Fix incorrect jasmine spy usage.. GREEN? 2011-04-29 23:19:37 -05:00
Sarah Mei
09ac4c789e Remove debugging statements 2011-04-29 21:00:39 -07:00
Sarah Mei
84ca9dfed6 Fix splunk logging in 1.9 2011-04-29 20:57:25 -07:00
Sarah Mei
ae3deb1f32 Theory: embedder.feature breaks CI because it assumes the browser can show video. 2011-04-29 19:53:27 -07:00
Sarah Mei
e025b14b60 Logout: still not a word. 2011-04-29 19:44:57 -07:00
MrZYX
f7c7ea33b6 improved database.yml.example 2011-04-30 00:56:35 +02:00
MrZYX
009bbb826b added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags 2011-04-30 00:08:33 +02:00