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

6901 commits

This branch
This branch
All branches
Author SHA1 Message Date
maxwell
1de52d3ba2 fixed failing cucumber 2011-03-17 13:59:53 -07:00
maxwell
14ff1e0143 ms dg improved styling, fixed delete 2011-03-17 13:59:53 -07:00
maxwell
61bffb50d6 remove puts from photoscontroller 2011-03-17 13:59:53 -07:00
maxwell
4e419f7d1a photo specs pass 2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe wrote a test for the callback, need to make it pass... 2011-03-17 13:59:53 -07:00
maxwell
58282b91cb move processing to photo callback 2011-03-17 13:59:53 -07:00
maxwell
7ba90a5a98 stuff works 2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3 photos are now successfully delayed 2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f there is a job to process photos and it is called from the controller 2011-03-17 13:59:53 -07:00
maxwell
516b620148 gif and delayed processing wip 2011-03-17 13:59:53 -07:00
Raphael Sofaer
0aa5193434 Use the new local batch receive job 2011-03-17 13:41:30 -07:00
Raphael Sofaer
52691920f7 Change 406 to 422 2011-03-17 13:13:47 -07:00
Raphael Sofaer
d2cdc20e2b Finish receive local batch job 2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9 SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3 added job and spec for BatchLocalReceive. wip 2011-03-17 12:56:23 -07:00
MrZYX
149b1832fd added newline to stream element partial, otherwise timeago & comment won't display if aspect badge is too big 2011-03-17 20:51:08 +01:00
zhitomirskiyi
574a3b45b1 made it flash the sm on the profile page 2011-03-17 11:54:13 -07:00
Raphael Sofaer
3718a72f46 log renders of collections of partials with more info 2011-03-17 11:36:16 -07:00
maxwell
0fa2f5d3b6 Merge branch 'kiranh-868-new-bug' 2011-03-17 11:13:13 -07:00
maxwell
388423a76a add a missing space for notifications with less than 4 people 2011-03-17 10:57:00 -07:00
MrZYX
3c64da8981 fixed #935 2011-03-17 10:57:00 -07:00
Jordi Mallach
a60912bc22 Updated Catalan translation to a787106. 2011-03-17 10:57:00 -07:00
Jordi Mallach
d6ebc04402 Fix some leftovers thanks to MrZYX's diff-yml-keys.py. 2011-03-17 10:57:00 -07:00
MrZYX
759b570748 updated locales 2011-03-17 10:57:00 -07:00
MrZYX
a2f1381dde moar translations 2011-03-17 10:56:59 -07:00
Jordi Mallach
dda14e1629 Correct indentation and re-add requests & message_inbox tags. 2011-03-17 10:56:59 -07:00
Jordi Mallach
34450621ae Adding "1" to notification message. 2011-03-17 10:56:59 -07:00
MrZYX
8cf96f4b3d fixed syntax errors in ca.yml 2011-03-17 10:56:59 -07:00
Jordi Mallach
561c377bc5 Two of the keys are verb, not noun. Adapt accordingly. 2011-03-17 10:56:59 -07:00
Jordi Mallach
2fd6cab1f1 Fix typo. 2011-03-17 10:56:59 -07:00
Jordi Mallach
dd293d8bff Updated Catalan translations to 6a33ae7. 2011-03-17 10:56:59 -07:00
Jordi Mallach
7d97d7ea1f Adapt Catalan translation to the reformatting of ed8d4db. Hopefully 
everything is correct, but it wouldn't be surprising if something has been
overlooked.
 2011-03-17 10:56:59 -07:00
zhitomirskiyi
2026b4c326 fixed the css, added a space 2011-03-17 10:56:59 -07:00
zhitomirskiyi
a30affe8d3 moved the fixture to the right place 2011-03-17 10:56:59 -07:00
danielgrippi
2e1123275e add styling on tag header 2011-03-17 10:56:59 -07:00
danielgrippi
70091deef4 show tags under names in people partials 2011-03-17 10:56:58 -07:00
danielgrippi
b7970b23e3 add a people count on tag page 2011-03-17 10:56:58 -07:00
zhitomirskiyi
3d34e3bd35 publishing from a person profile page wip 
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
 2011-03-17 10:56:58 -07:00
maxwell
eed32f70be add a missing space for notifications with less than 4 people 2011-03-17 10:50:11 -07:00
MrZYX
78eebc8920 fixed #935 2011-03-17 16:59:02 +01:00
Jordi Mallach
57aa8e71bf Updated Catalan translation to a787106. 2011-03-17 15:57:12 +01:00
Jordi Mallach
25691ac8b2 Merge branch 'master' of git://github.com/diaspora/diaspora 2011-03-17 15:45:27 +01:00
Jordi Mallach
f7391ca7ae Fix some leftovers thanks to MrZYX's diff-yml-keys.py. 2011-03-17 15:42:14 +01:00
MrZYX
c661bce988 updated locales 2011-03-17 15:23:34 +01:00
MrZYX
a78710690a moar translations 2011-03-17 15:11:24 +01:00
Jordi Mallach
4ee9642d02 Correct indentation and re-add requests & message_inbox tags. 2011-03-17 14:44:10 +01:00
Jordi Mallach
a2da1240b8 Adding "1" to notification message. 2011-03-17 14:34:53 +01:00
MrZYX
5a8ba0e805 fixed syntax errors in ca.yml 2011-03-17 14:31:14 +01:00
Jordi Mallach
5c9370f2e0 Two of the keys are verb, not noun. Adapt accordingly. 2011-03-17 14:16:25 +01:00
Jordi Mallach
a03238ec40 Fix typo. 2011-03-17 13:45:02 +01:00