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

1818 commits

Author SHA1 Message Date
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
77bae90d0e moar mappings for process_emoticons 2011-05-04 15:28:42 +02:00
Raphael Sofaer
45c5cd4b95 Don't test for nonexistent instance variable 2011-05-03 11:19:27 -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
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
MrZYX
ff58d63191 minor cleanup to routes.rb 2011-04-30 16:28:39 +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
MrZYX
009bbb826b added \b (word ending) to tag regex to exclude :;?! etc.; allow : in tags 2011-04-30 00:08:33 +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
Dan Hansen
78585f5a65 Add license to specs and notifications.js 2011-04-27 16:34:30 -05:00
Dan Hansen
4a101f25d9 Notifications.js refactor, add specs 2011-04-27 16:22:56 -05:00
Dan Hansen
e8a1ca70e3 WidgetCollection#subscribe now accepts a parameter that will be the context of the callback 2011-04-26 21:37:19 -05:00
Raphael Sofaer
24ea518b6f Fix some JS bugs, delegate doesn't work if you remove the element 2011-04-25 16:15:33 -07:00
Dan Hansen
efd9e61f45 Add new infinite scroll location to jasmine config 2011-04-22 20:35:15 -05:00
Dan Hansen
3d11b402e0 Infinite scroll is now a widget, remove InfiniteScroll#postScroll, use DiasporaJS pub/sub instead, remove timeago.js hacks 2011-04-22 20:33:21 -05:00
Raphael Sofaer
9731871ca9 Register services before embedder render spec 2011-04-20 15:11:29 -07:00
Dan Hansen
296824c92b add basic pub/sub functionality to WidgetCollection 2011-04-15 18:29:48 -05:00
Dan Hansen
0b85600e0a diaspora.js cleanup; don't pollute global namespace in spec 2011-04-15 17:31:19 -05:00
Raphael Sofaer
9969dbd109 Start refactoring aspect-filters.js 2011-04-13 15:55:10 -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
92b50c3d90 Add some comments, a test for pagination 2011-04-13 10:45:11 -07:00
Raphael Sofaer
85993a694e Fix people#show sort order 2011-04-13 10:30:32 -07:00
Raphael Sofaer
a0f98d888a Try to fix annoying xml time spec failure 2011-04-12 16:21:42 -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
8b4c8e77cb added direction detector widget to jasmine.yml 2011-04-11 22:23:21 +02:00
MrZYX
93be252b59 Merge branch 'css-rtl' 
Conflicts:
	public/javascripts/application.js
	public/javascripts/inbox.js
 2011-04-11 21:52:01 +02:00
MrZYX
8631b6cc1e I stop coding for today, sorry -.- 2011-04-11 19:47:29 +02:00
MrZYX
e063f619a0 fixed jasmine 2011-04-11 19:44:31 +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
914e35dcad stub hydra for great success. also, make local_luke, local_leia, and remote_raphael fixtures. 2011-04-08 18:24:02 -07:00
Raphael Sofaer
0b9575af5d JS cleanup 2011-04-08 16:11:13 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -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
Raphael Sofaer
c7dc6ce817 Fix jasmine specs 2011-04-07 18:30:29 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -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
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