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

35 commits

Author SHA1 Message Date
Jonne Haß
ccd7c670b3 Merge pull request #5170 from khall/issue_5149a 
Issue 5149a

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
 2014-08-27 18:20:56 +02:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Maxwell Salzberg
592a3f99b5 Role system to replace the yml admins and community spotlight. we can 
also now add a beta role
 2012-04-27 16:14:43 -07:00
Sarah Mei
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -08:00
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -08:00
danielgrippi
21eba82e76 moved all jasmine fixture building into spec/controllers/jasmine_fixtures/ 2012-01-07 14:23:25 -08:00
danielgrippi
44b58d707f featured users => community spotlight 2011-10-20 11:50:58 -07:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
danielgrippi
a99e69edd6 down to 2 failures in postgres 2011-08-17 16:51:54 -07:00
Raphael Sofaer
7021cd79c8 Select distinct people in contacts index 2011-08-11 11:56:23 -07:00
danielgrippi
987d334764 fixed tests, translations, initalizer 2011-08-03 18:02:58 -07:00
Andrej Kacian
a5e8db04a0 Fix typo for contacts_controller #featured test 2011-08-01 23:20:23 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
3a6f0583c7 added featured users dg iz 2011-07-29 19:00:15 -07:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Raphael Sofaer
3baf433b3a More travis stuff 2011-07-02 00:50:11 -07:00
danielgrippi
f839714646 added aspect filtering to contact index. fixed rspec 2011-06-27 15:03:39 -07:00
danielgrippi
a2609f7dac simple filter on contacts index page (my/all contacts) 2011-06-27 12:12:50 -07:00
Raphael Sofaer
5884a900a2 Get rid of manage 2011-06-24 16:55:40 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
danielgrippi
7eaca0346c Merge branch 'master' into follow 
Conflicts:
	config/assets.yml
	public/stylesheets/sass/_mixins.scss
	spec/models/user/posting_spec.rb
 2011-05-16 14:56:28 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49:37 -07:00
danielgrippi
60a60733df Merge branch 'master' into follow 
Conflicts:
	app/controllers/aspects_controller.rb
	app/controllers/contacts_controller.rb
	app/controllers/people_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/tags_controller.rb
	app/helpers/notifications_helper.rb
	app/models/notifications/new_request.rb
	app/models/user_preference.rb
	public/javascripts/view.js
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/contacts_controller_spec.rb
	spec/controllers/home_controller_spec.rb
	spec/controllers/post_visibilities_controller_spec.rb
	spec/controllers/requests_controller_spec.rb
	spec/mailers/notifier_spec.rb
	spec/models/user_spec.rb
 2011-05-12 15:49:51 -07:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
Arzumy MD
3767cce149 moved render_views out of controller specs to spec_helper. 
cleaned up indentation and spacing in controller specs.
 2011-05-07 18:38:40 +08:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b iz ms wip fixing contactController destroy 2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340 IZ MS; refactored aspect_membership_controller, moved and updated views accordingly 2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705 wip 2011-02-17 18:05:21 -08:00
maxwell
17a801394e work in progress. need to update the views for the controller changes 2011-02-17 18:05:21 -08:00