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 |
|
MrZYX
|
4e94fe46d2
|
updated locales
|
2011-05-22 23:49:22 +02:00 |
|
Maxwell Salzberg
|
2f6d079635
|
added failure test for deleted likes
|
2011-05-22 14:45:16 -07:00 |
|
Maxwell Salzberg
|
66c28c4caf
|
notification page now has links for likes
|
2011-05-22 14:35:35 -07:00 |
|
Maxwell Salzberg
|
d4d3b1e44c
|
MSSM like notification are concatinated, and backfilled some like tests
|
2011-05-22 13:59:33 -07:00 |
|
MrZYX
|
a68031179b
|
prevent inviting yourself, #515
|
2011-05-22 14:48:07 +02:00 |
|
MrZYX
|
07395fb2c9
|
added maxlength attribute to aspect name input, fixed #675
|
2011-05-22 13:50:44 +02:00 |
|
MrZYX
|
e6f3adb69f
|
updated locales
|
2011-05-22 01:06:23 +02:00 |
|
danielgrippi
|
3fb81d37d0
|
missing closing tag in aspect_dropdown helper
|
2011-05-21 15:08:19 -07:00 |
|
danielgrippi
|
6a108104e8
|
add spacing
|
2011-05-21 14:56:11 -07:00 |
|
danielgrippi
|
0391795f80
|
better right pane sections
|
2011-05-21 14:52:59 -07:00 |
|
danielgrippi
|
7c949f4377
|
show diaspora handle on token page
|
2011-05-20 21:48:45 -07:00 |
|
MrZYX
|
6ee85bb626
|
add a .rvmrc_custom if you want to overide the one in the repo
|
2011-05-21 00:26:37 +02:00 |
|
Raphael Sofaer
|
286f1b876d
|
Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions.
|
2011-05-20 15:14:23 -07:00 |
|
danielgrippi
|
e9dbcc7972
|
rvmrc says ree
|
2011-05-20 14:59:13 -07:00 |
|
Maxwell Salzberg
|
15c4463c2a
|
gemfile wars
|
2011-05-20 14:54:04 -07:00 |
|
MrZYX
|
a605ed80dd
|
updated locales
|
2011-05-20 21:40:56 +02:00 |
|
MrZYX
|
e79ef29a39
|
fixed that super annoying bug on the notificaitons page
|
2011-05-20 21:36:06 +02:00 |
|
danielgrippi
|
16351227f7
|
use aspect dropdowns everywhere; updated rake to 0.9.0
|
2011-05-20 11:50:41 -07:00 |
|