dangold1138
39d509f4ce
Update README.md
2011-12-20 23:19:26 -08:00
danielgrippi
0f42c98a7b
merge Pistos's reshare branch into master
2011-12-20 14:42:18 -08:00
danielgrippi
aac97303ce
removed duplicate line in a feature [ci skip]
2011-12-20 12:59:15 -08:00
danielgrippi
4ae0dcec43
fix notifications cucumber features
2011-12-20 12:30:29 -08:00
danielgrippi
e9b6da605f
fix specs; move presence_of_content validation check into a before_destory to play nicely with federation
2011-12-20 10:42:30 -08:00
Pistos
5110b4c086
Added MySQL-friendly version of SQL code for migration.
2011-12-19 17:12:17 -05:00
Pistos
f83e56e5f3
Added a counter cache for the number of reshares of a post.
2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c
Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary.
2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6
Refactor implementation of #reshare_count.
...
The old implementation which uses Post.where causes
undefined method `abstract_class?' for Object:Class
in spec/controllers/posts_controller_spec.rb. Not sure whether that's a problem
with Rails, or rspec, or what.
2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b
Improve wording of error message in Reshare#root_must_be_public validation.
2011-12-19 17:12:17 -05:00
Pistos
a9c6905e29
Made spec text correspond to actual text tested.
2011-12-19 17:12:17 -05:00
Pistos
99f2d4f018
Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original").
2011-12-19 17:12:17 -05:00
Pistos
90d960bac7
Some reshare_link specs.
2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44
Always show "Reshare original" for link. Show number of reshares in the post_initial_info div.
...
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared. Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares". Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
2011-12-19 17:12:17 -05:00
Daniel Grippi
31fda67dd3
Merge pull request #2533 from vcuculo/2488-fix-oembed
...
Fix #2488 soundcloud embedding
2011-12-19 13:45:56 -08:00
Maxwell Salzberg
e7b9dd8b8a
Merge branch 'new_messagebus_api'
2011-12-19 13:40:31 -08:00
Maxwell Salzberg
ebf9004f91
update messagebus to latest version of their api
2011-12-19 12:24:25 -08:00
Vittorio Cuculo
0e77fcb084
Fix #2488 soundcloud embedding
2011-12-19 09:50:39 +01:00
Jonne Hass
bbfb47b6a3
added fil, ms, te
2011-12-18 15:37:27 +01:00
Jonne Hass
54781aa71c
updated 148 locale files [ci skip]
2011-12-18 14:53:08 +01:00
danielgrippi
97b8045f20
added counter cache for photos on StatusMessage
2011-12-16 20:39:24 -08:00
Maxwell Salzberg
0929f153a1
Merge pull request #2528 from torrancew/with_whenever_tasks
...
Adds maintenance rake tasks for logrotate and temp file deletion
2011-12-16 09:59:32 -08:00
Tray Torrance
dc71396a4d
Adds maintenance rake tasks for logrotate and temp file deletion; Adds whenever gem + sample whenever file
2011-12-15 15:18:07 -08:00
Jonne Hass
139e2af6c8
Merge pull request #2527 from lprelle/close_account_translation
...
added translation for close account button
2011-12-15 07:46:38 -08:00
Jonne Hass
e6f614b21c
improve pod_url docs [ci skip]
2011-12-15 16:39:54 +01:00
Lennart Prelle
20a39714bf
added translation for close account
2011-12-15 15:35:30 +01:00
Jonne Hass
56f0457c03
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-12-15 14:01:53 +01:00
Jonne Hass
af66bfe840
updated 18 locale files [ci skip]
2011-12-15 14:01:32 +01:00
memarko
890195b2d8
Update lib/stream/followed_tag.rb
2011-12-14 21:15:58 +01:00
Jordi Mallach
3bfaf7ef8b
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-12-12 13:48:03 +01:00
Jordi Mallach
38f06ae258
Update Catalan translation to 12d0eee.
2011-12-12 13:47:46 +01:00
Jordi Mallach
450d0de753
Update Catalan translation to e38cb41.
2011-12-12 13:27:31 +01:00
Jonne Hass
95790bf891
only update rubygems if not current already
2011-12-12 12:26:06 +01:00
Sarah Mei
3c8b26b051
refactor infinite scroll features to take less time
2011-12-11 17:14:23 -08:00
Jonne Hass
a8a9399060
Merge branch 'master' of github.com:diaspora/diaspora
2011-12-12 00:21:25 +01:00
Sarah Mei
78f4758d6d
Collapsing some cucumber features to save time. Removing features that should be tested elsewhere in the stack.
2011-12-11 15:08:43 -08:00
Jonne Hass
d18c9c8591
Merge branch 'master' of git://github.com/diaspora/diaspora
2011-12-12 00:02:49 +01:00
Sarah Mei
5494cf1fde
Move websockets out of production group for ruby 1.8.7
2011-12-11 13:54:43 -08:00
Sarah Mei
bb3c6f3120
Add production group back in and move what we can in there so that travis gem installs don't take as long
2011-12-11 13:31:31 -08:00
Sarah Mei
82fd591b07
There is no production group to exclude
2011-12-11 12:34:52 -08:00
Sarah Mei
62833595da
Specify version of rubygems in .rvmrc
2011-12-11 12:25:01 -08:00
David Kettler
03feec5eb3
jasmine out of group into top-level
2011-12-11 12:05:19 -08:00
danielgrippi
80a090c766
update twitter gem
2011-12-11 11:48:47 -08:00
Jonne Hass
94aaa46a12
slight speed improvement by tweaking devise in the test env
2011-12-11 13:12:40 +01:00
Jonne Hass
dbdee43cc6
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
2011-12-11 05:11:21 +01:00
Jonne Hass
4e8d991487
updated 56 locale files [ci skip]
2011-12-11 05:11:12 +01:00
Jonne Hass
3f92fd4c40
reenable cucumber on travis aka break it again (?)
2011-12-11 05:07:35 +01:00
Jonne Hass
d6f98d12e1
even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error
2011-12-11 04:45:11 +01:00
Jonne Hass
4582c11dfd
Merge branch 'master' of ../run
2011-12-11 04:13:08 +01:00
Jonne Hass
fe82cd6609
lets not set NOT NULL fields to null…
2011-12-11 04:12:58 +01:00
