Commit graph

3816 commits

Author SHA1 Message Date
Alec Leamas
a615eb5509 Restoring fedora/dist 2010-11-02 08:25:11 +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
livefromthemoon@gmail.com
2b890e6ef2 Added 'lang' attribute in the html tag 2010-11-01 21:31:12 +01:00
Raphael
9d273c6d24 Now expecting a 500 on someone passing an id to create, should really be a 422 2010-11-01 12:31:00 -07:00
Raphael
354f6d13c2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-01 11:59:10 -07:00
Raphael
28fc8ac762 remove local dist folder 2010-11-01 11:59:05 -07:00
Raphael
488df6eaa0 RS IZ a good test to overwrite ids 2010-11-01 11:35:37 -07:00
Raphael
6c0b187d40 Merge remote branch 'jwinky/446-user-name-length-limit'
Conflicts:
	app/models/user.rb
2010-11-01 11:00:02 -07:00
OhaiBBQ
175e5bdc30 Added strict equality operator to #publisher and #stream keydown event
Added caching of the $container jQuery object
Added caching of $controls and $this in the .make_profile_photo click event
changed the success callback to use this.src = photo_url; instead of creating a new jQuery object
2010-11-01 10:37:07 -07:00
OhaiBBQ
6474f5c5f3 Added more caching of jQuery objects, saved a line by using .toggleClass() 2010-11-01 10:07:41 -07:00
Alec Leamas
9f5dcc21da Merge remote branch 'upstream/master'
Conflicts:
	pkg/ubuntu/dist
2010-11-01 16:44:24 +01:00
Alec Leamas
bf4f402c30 pkg bugfixes 2010-11-01 16:42:47 +01:00
Himanshu Chhetri
2c8f6c27ba Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion. 2010-11-01 16:42:47 +01:00
Gabriel Gilder
be4f33bf67 redirecting to :back instead of manage page on failed aspect creation +spec 2010-11-01 16:42:47 +01:00
Hexagon
65419e423a Added missing strings to swedish translation 2010-11-01 16:42:47 +01:00
Raphael
9a56296214 Forgot to change spelling in feature 2010-11-01 16:42:47 +01:00
J David Eisenberg
1a32766fb0 Issue #492: Informal, vague description when signing up as a new user 2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3 i put in a dash 2010-11-01 16:42:46 +01:00
Sarah Allen
fb145beb9a Rails.env is a string, not a symbol 2010-11-01 16:42:46 +01:00
Sarah Mei
7f7f160ca1 Add feature for skipping the setup wizard. 2010-11-01 16:42:46 +01:00
Sarah Mei
f33fded400 Refactor aspect cucumber feature - now happy path only. 2010-11-01 16:42:46 +01:00
Himanshu Chhetri
b0b1fa51c2 Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion. 2010-11-01 16:42:46 +01:00
Gabriel Gilder
168843bcd5 redirecting to :back instead of manage page on failed aspect creation +spec 2010-11-01 16:42:46 +01:00