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

3685 commits

This branch
This branch
All branches
Author SHA1 Message Date
maxwell
c27cc719a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-02 12:46:28 -07:00
maxwell
c3d0c78bd1 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	lib/diaspora/user/receiving.rb
 2010-11-02 12:46:08 -07:00
Raphael
dc6a01e7e4 Remove random href, thanks to Hexagon 2010-11-02 12:39:17 -07:00
maxwell
19bbf8ce4d IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive 2010-11-02 12:38:30 -07:00
Raphael
bfcb2a9e18 Remove random href 2010-11-02 12:37:32 -07:00
Raphael
a9b429d163 Merge remote branch 'ed0h/helper-method-for-markdown' 2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4 Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'" 
This reverts commit 2b128d88ec, reversing
changes made to 8778bdab3b.
 2010-11-02 12:14:12 -07:00
MrZYX
80b8e5e42d updated german locale (informal) to reflect latest changes 2010-11-02 12:12:47 -07:00
MrZYX
7cd6e3a868 updated german locale (informal) with keys from pull request 465 
again with help of michiwend
 2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72 updated german locale so no keys are missing (informal) 
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
 2010-11-02 12:12:47 -07:00
danielvincent
fdd3264812 proxy buffering enabled and gzip compression for files other than text/html in nginx.conf 2010-11-02 12:03:10 -07:00
Raphael
2b128d88ec Merge remote branch 'ed0h/336-markdown-for-status-messages' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-02 11:45:16 -07:00
Raphael
8778bdab3b Merge remote branch 'ed0h/503-language-html-tag' 2010-11-02 11:43:12 -07:00
Raphael
9d71ed1120 Merge remote branch 'robustdj/453-aspect-labels' 
Conflicts:
	app/models/user.rb
	pkg/ubuntu/dist
 2010-11-02 11:31:51 -07:00
Raphael
7fdd0475ae robustdj's specs now green 2010-11-02 11:27:51 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Raphael
0b8425cbde user.aspect is gone 2010-11-02 11:02:08 -07:00
Raphael
c031416ca8 Merge branch 'master' into HEAD 
Conflicts:
	lib/diaspora/user/receiving.rb
	pkg/ubuntu/dist
 2010-11-02 10:54:37 -07:00
Raphael
67219248b0 unscope i18n calls 2010-11-02 10:32:34 -07:00
maxwell
9e1c6174bf IZ MS remove two unused methods from diaspora_parser 2010-11-02 10:06:41 -07:00
Alec Leamas
fceffba261 Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor 2010-11-02 16:34:47 +01:00
Sarah Mei
e282abd526 cucumber feature for user authentication. 2010-11-01 22:22:35 -07:00
Sarah Mei
dc97c852f4 Person delegates first_name and last_name to profile. 2010-11-01 22:22:15 -07:00
livefromthemoon@gmail.com
aab74cf1ff Added markdown support for status messages 2010-11-02 03:55:14 +01:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
Raphael
7244730961 Merge remote branch 'ed0h/fr-update' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 17:36:05 -07:00
Raphael
d0690b6139 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-01 17:30:21 -07:00
Raphael
fd0f3a9a1c Fix reshare, user_menu 2010-11-01 17:30:10 -07:00
maxwell
3c8b40c427 IZ MS retractions now use diaspora handle 2010-11-01 17:11:06 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
Raphael
bd6a8df7cc Revert to getElementById in FileUploader, jquery isn't working 2010-11-01 17:07:28 -07:00
Raphael
47f040f740 Use jquery id selector 2010-11-01 16:45:09 -07:00
Raphael
de52e59727 Merge branch 'master' into ohai-javascript-improvements 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 16:34:21 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Raphael
377cae8cba Merge remote branch 'ed0h/i18n-fallbacks' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:57:43 -07:00
Raphael
41d839ecf4 Merge remote branch 'ecleel/master' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:39:38 -07:00
danielvincent
3a4f100806 remove * 2010-11-01 15:01:49 -07:00
OhaiBBQ
a548ab1345 Small optimizations 2010-11-01 14:58:53 -07:00
maxwell
1e1a8087c4 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-01 14:56:56 -07:00
maxwell
ccf897ed62 IZ MS; fixing parser spec 2010-11-01 14:56:31 -07:00
maxwell
a0ac6db946 IZ MS; fixing parser spec 2010-11-01 14:54:40 -07:00
maxwell
3aab691c78 updating requests for me now that person is taken out of requests 2010-11-01 14:54:40 -07:00
maxwell
3c16a46f0e MS IZ updated the backer script to use aspects.create 2010-11-01 14:54:40 -07:00
maxwell
922aa85fb7 MS IZ refactor green 2010-11-01 14:54:40 -07:00
danielvincent
f6b4be97a3 requests are almost there 2010-11-01 14:54:40 -07:00
OhaiBBQ
8b0d20dec7 Small optimizations 2010-11-01 14:45:51 -07:00
OhaiBBQ
94e4c22fcf Fixed some tabbing 
Removed some more unneeded jQuery object constructors for the button fancyboxes
Replaced event.target with the this keyword
 2010-11-01 14:23:16 -07:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
Alec Leamas
d979ad4fc0 Documentation update 2010-11-01 22:05:51 +01:00