Jordi Mallach
|
b086d3a2ca
|
Merge branch 'master' of git://github.com/diaspora/diaspora
|
2011-05-27 01:11:55 +02:00 |
|
Jordi Mallach
|
2c6be3c28e
|
Update Catalan translation to db22be43. Fix some leftovers in the process.
|
2011-05-27 01:10:51 +02:00 |
|
MrZYX
|
c5630006b6
|
better compatibillity with old git versions to get the current rev.
|
2011-05-26 16:27:56 +02:00 |
|
Jordi Mallach
|
89086c2453
|
Shorter message for one string that was overlapping.
|
2011-05-26 10:35:09 +02:00 |
|
Raphael Sofaer
|
17521f99cf
|
Fix build for those without integration environments configured
|
2011-05-25 15:49:57 -07:00 |
|
Raphael Sofaer
|
38289b1a47
|
Multi-server integration tests are now possible
|
2011-05-25 15:16:14 -07:00 |
|
MrZYX
|
ba08c38a74
|
fixed activity_streams::photo controller spec
|
2011-05-26 00:01:10 +02:00 |
|
MrZYX
|
0c5bdece5a
|
warn and exit if there's no config at all
|
2011-05-25 23:39:54 +02:00 |
|
MrZYX
|
47dd3ba076
|
when you get a mail from CI, look at it
|
2011-05-25 23:08:00 +02:00 |
|
MrZYX
|
cf1d83878c
|
fixed #747
|
2011-05-25 22:50:13 +02:00 |
|
Maxwell Salzberg
|
52487e87de
|
added a very basic page for the stream of all public activity stream photos
|
2011-05-25 12:57:29 -07:00 |
|
danielgrippi
|
d12944d57e
|
record objectId in post (cant use object_id booo)
|
2011-05-25 12:16:52 -07:00 |
|
Sarah Mei
|
c6d61c68c0
|
Backfill some tests for app config, refactor base file name so people copy it instead of moving it
|
2011-05-25 11:07:29 -07:00 |
|
Sarah Mei
|
f29a605a7c
|
Remove photo-related pending specs.
|
2011-05-25 09:08:49 -07:00 |
|
Sarah Mei
|
85eb2d9de0
|
Unpending the relayable spec
|
2011-05-25 08:54:57 -07:00 |
|
MrZYX
|
406622eeed
|
prevent timing issue when autosuggest is too slow
|
2011-05-25 13:32:11 +02:00 |
|
Maxwell Salzberg
|
56644c9d1e
|
use notification people link for likes.... it should now get refactored, but it works nicely now, even with I18n
|
2011-05-24 21:45:12 -07:00 |
|
Maxwell Salzberg
|
4c535f3eb4
|
hackity hack to fix notifciation page decrementing
|
2011-05-24 20:41:28 -07:00 |
|
Sarah Mei
|
5e56b8a0ee
|
HULK SMASH PENDING SPEC
|
2011-05-24 23:36:00 -04:00 |
|
MrZYX
|
574deada03
|
get rid of nil values in app config, they destroy the merge
|
2011-05-24 23:54:31 +02:00 |
|
MrZYX
|
d6e9e9cca5
|
fixed comment count update on comment posting
|
2011-05-24 21:03:24 +02:00 |
|
MrZYX
|
e946600ad4
|
Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca
|
2011-05-24 17:33:40 +02:00 |
|
MrZYX
|
ce9e7c5369
|
updated locales
|
2011-05-24 17:33:36 +02:00 |
|
MrZYX
|
db22be43a8
|
really no string concatenation and proper pluralization in notifications helper AKA THE REASON I DIDN'T WANTED TO TOUCH THIS STUFF
|
2011-05-24 17:03:48 +02:00 |
|
danielgrippi
|
3f66458386
|
remove text from token page explaining there is no FF cubbies extension
|
2011-05-24 07:42:37 -07:00 |
|
MrZYX
|
f4213b63a6
|
fixed notification helper spec
|
2011-05-24 16:25:48 +02:00 |
|
Jordi Mallach
|
75e7b0e45d
|
Update Catalan translation to fc7b2cf.
|
2011-05-24 16:17:00 +02:00 |
|
Maxwell Salzberg
|
20cc3f0c7d
|
change the smiley for a heart.... the smiley looked sad at that size..
|
2011-05-23 23:53:18 -07:00 |
|
Raphael Sofaer
|
fc7b2cfe3f
|
Take out some of the concatenation from NotificationsHelper. VSO languages will still be impossible, but our Caucasian friends should now be able to have valid sentences here. I don't particularly like passing a translation into a link helper which is passed into a translation.
|
2011-05-23 23:09:48 -07:00 |
|
Raphael Sofaer
|
609439f948
|
Destroy notifications on contact destroy
|
2011-05-23 18:33:18 -07:00 |
|
Raphael Sofaer
|
e28ec16781
|
Gross, but hopefully temporary solution for namespaced classes and old versions of libxml
|
2011-05-23 16:24:28 -07:00 |
|
Raphael Sofaer
|
6b094b2f35
|
Take out begin rescue in diaspora parser, that's handled in the resque job wrapper
|
2011-05-23 15:40:03 -07:00 |
|
MrZYX
|
5dca73e535
|
updated locales
|
2011-05-24 00:07:24 +02:00 |
|
Raphael Sofaer
|
cc84051541
|
Fall back to author if the diaspora_handle isn't set, that column just needs to be removed
|
2011-05-23 14:54:27 -07:00 |
|
Raphael Sofaer
|
d22878f3f0
|
Fix AS::Photo federation, hopefully
|
2011-05-23 13:56:42 -07:00 |
|
Raphael Sofaer
|
6a88abb6dd
|
Add in photoscontroller spec for as
|
2011-05-23 13:56:41 -07:00 |
|
Maxwell Salzberg
|
ff1168a6ba
|
comment out the websocket notice. it was my idea to put it there, and it was a bad idea
|
2011-05-23 11:55:44 -07:00 |
|
MrZYX
|
c732940b58
|
match trailing slash for vimeo links
|
2011-05-23 14:32:16 +02:00 |
|
danielgrippi
|
8e3149ca01
|
better page explaining cubbi.es and why we're promoting it on diaspora
|
2011-05-23 01:14:33 -07:00 |
|
Sarah Mei
|
7a2ab42948
|
Locking to older version of rspec-core as new version has invalid specification
|
2011-05-22 17:51:53 -07:00 |
|
Maxwell Salzberg
|
4fa842de96
|
remove puts
|
2011-05-22 17:41:49 -07:00 |
|
Sarah Mei
|
57aa8fd7c3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-05-22 17:40:36 -07:00 |
|
Sarah Mei
|
ce867d8125
|
.rvmrc should always specify patchlevel
|
2011-05-22 17:40:26 -07:00 |
|
Maxwell Salzberg
|
d776105558
|
grammer nazi cleanup of notification_people_link and refactor + tests
|
2011-05-22 17:18:44 -07:00 |
|
Maxwell Salzberg
|
160d34dd98
|
add sasscache to gitignore
|
2011-05-22 15:45:44 -07:00 |
|
Maxwell Salzberg
|
90d62f3c8a
|
small ui tweak for mobile login page
|
2011-05-22 15:43:39 -07:00 |
|
Maxwell Salzberg
|
a4017ba16f
|
small linebreak for cubbies view for mobile
|
2011-05-22 15:25:37 -07:00 |
|
Maxwell Salzberg
|
59ae829254
|
there is a dumb bug where likes are targeting themselves
|
2011-05-22 15:02:01 -07:00 |
|
Maxwell Salzberg
|
77fc40d404
|
add application helper to notification helper spec, made the link an object_link rather than status_message_link
|
2011-05-22 14:59:04 -07:00 |
|
Maxwell Salzberg
|
bb62a3dc61
|
move double post in notifications
|
2011-05-22 14:50:50 -07:00 |
|