Dennis Collective
f5ef1e8c14
Merge pull request #2814 from stwf/aspects-javascript-fixes
...
update aspect name in aspects listing after editing.
2012-02-27 17:19:05 -08:00
Maxwell Salzberg
42a93f9490
remove weird monkey patch in sessions controller #wtf
2012-02-25 17:41:46 -08:00
Maxwell Salzberg
27a4c1bf2d
introduce the idea of Federated::Base. this is mostly just renaming and collasping of different federation modules, but also starting a direct hiearchy of these federation classes to make everything easier to refactor
2012-02-25 16:57:14 -08:00
danielgrippi
a0e8f161f5
fix notifications controller. yay.
2012-02-18 16:26:18 -08:00
danielgrippi
debdd6cb6b
change routes to properly reflect page names (activity/stream).
2012-02-18 16:26:16 -08:00
Florian Staudacher
8249847e9c
bookmarklet now is a complete html document (+test)
...
it auto-expands to the size of the text that was selected
it self-closes after posting again
2012-02-18 16:26:15 -08:00
danielgrippi
2f7465450e
you can now follow / unfollow a post from the stream; fixed cukes.
2012-02-18 16:26:15 -08:00
Diaspora Europe
55cb328fe2
tags should be case insensitive
2012-02-18 16:26:10 -08:00
Florian Staudacher
0222e4b2ee
added intentionally failing specs, because dirty input breaks bookmarklet
...
see also #2741 #2751 #2800
2012-02-18 16:26:09 -08:00
Florian Staudacher
cab953848f
added tests for photos page
2012-02-09 23:12:39 +01:00
Maxwell Salzberg
062204e963
Merge pull request #2848 from beardedninja/master
...
#2847 Users can now toggle nsfw on and off
2012-02-08 17:21:29 -08:00
Maxwell Salzberg
a9b6426323
Merge pull request #2839 from diasp/2036-fix-private-messages-navigation
...
#2036 Fix private messages are sometimes displayed without navigation
2012-02-08 16:59:50 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
Alex Harrison
0cbdf51e6a
#2847 Users can now toggle nsfw on and off
2012-02-08 23:01:02 +01:00
Diaspora Europe
e4e1362ff5
added spec for redirect to conversations_controller_spec
2012-02-08 16:53:48 +01:00
danielgrippi
fafa74a222
fix spec, mustache scoping issue in partial.
2012-02-05 21:23:45 -08:00
danielgrippi
a3e13e3c0e
User#like! method.
2012-02-03 14:42:03 -08:00
Steven Fuchs
ef7dc1c017
update aspect name in page listing after editing.
2012-02-03 08:37:35 -05:00
Dennis Collective
6dbd644b01
Merge pull request #2719 from stwf/return-contact-popup-to-notify
...
aspects popup menu missing from 'started sharing' notifications
2012-02-03 00:42:10 -08:00
danielgrippi
4f7dda6012
bang! kill redis cache.
2012-02-02 12:45:43 -08:00
Steven Fuchs
532a49a56d
no need to generate notification fixtures at this point.
2012-02-02 10:45:42 -05:00
danielgrippi
310a0679f1
particpate stream, yo!
2012-02-01 16:05:16 -08:00
danielgrippi
02021584a7
EvilQuery for Participation, refactor comment creation
...
you can now create a comment with User#comment!(post, text)
2012-02-01 15:09:31 -08:00
Sarah Mei
7389b895d6
Fix #2799 - bullet points in a post that has 'read more'
2012-02-01 14:31:07 -08:00
Steven Fuchs
77fc4b6cab
moved tests from jasmine to controller specs
2012-01-31 13:58:41 -05:00
Steven Fuchs
5ea4bc0a1b
Merge remote branch 'upstream/master' into return-contact-popup-to-notify
2012-01-29 18:13:30 -05:00
Jonne Haß
f674494d2a
todo better id/guid switching hack needed
2012-01-29 15:15:24 +01:00
Jonne Haß
0e7b084713
fix 500 in PostsController#show for non existing post
2012-01-29 14:47:51 +01:00
Maxwell Salzberg
13d1e68540
refactor people#index
2012-01-28 23:48:37 -08:00
Sarah Mei
1f710232d8
Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766
2012-01-28 22:29:43 -08: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
Sarah Mei
d40746bff7
Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs.
2012-01-28 13:45:39 -08:00
danielgrippi
31bfef9dd2
pass in service_type strings instead of objects to deferred_dispatcher.
2012-01-27 16:05:38 -08:00
Maxwell Salzberg
c69df0fb29
fix photos controller test
2012-01-27 13:06:27 -08:00
danielgrippi
005b165e87
defer dispatching to help app processes not bloat in memory
2012-01-26 13:24:53 -08:00
Jonne Haß
e1658f8d8b
switch PhotosController#index over to guid, fix #2729
2012-01-25 12:45:02 +01:00
Steven Fuchs
5f705775cd
spec to generate some notification fixtures and jasmine specs to test them. Notably making sure that start sharing items have an aspects popup menu.
2012-01-24 23:04:35 -05:00
Jonne Haß
100625d18c
fix people and person specs for the guid stuff on psql
2012-01-24 23:02:07 +01:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Jonne Haß
19785d909b
ensure services is an array in StatusMessagesController#create
...
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
2012-01-24 18:54:36 +01:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -08:00
Steven Fuchs
e882dedd33
remove vanna controller from app, adjust scripts, specs, views and controllers to work.
2012-01-22 17:39:35 -05:00
Sarah Mei
872a96dc71
Refactor services controller spec
2012-01-22 08:28:23 -08:00
Maxwell Salzberg
49f18d435a
upgrade factory girl there are 3 failing cukes.
2012-01-21 21:58:50 -08:00
Steven Fuchs
9836860ca3
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
2012-01-20 12:23:45 -05:00
Maxwell Salzberg
254860bddc
SM MS; Read email sent to diaspora-dev for more information about this
...
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
2012-01-17 19:29:01 -08:00
Steven Fuchs
36fd43db4c
incorporated improvements from @maxwell from last pull request.
2012-01-17 19:27:48 -05:00
danielgrippi
fdc0b681eb
remove unused api serializers (cruft)
2012-01-17 16:03:24 -08:00
