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

4183 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Alec Leamas
b0b917fd6f pkg bugfixes 2010-11-01 16:42:39 +01:00
OhaiBBQ
c8e8ef06e7 You don't need to make a new jQuery object to do that. 
Fixed typo in the click param
Cache the .edit_photo jQuery object
 2010-11-01 05:26:58 -07:00
Alec Leamas
fb13ff2212 Merge branch 'sv-update-3' of http://github.com/Hexagon/diaspora into Hexagon-sv-update-3 2010-11-01 09:36:12 +01:00
Raphael
cc521261c8 Forgot to change spelling in feature 2010-11-01 00:55:16 -07:00
Raphael
07e96e5a37 Merge remote branch 'jdeisenberg/492-vague-signup-wording' 2010-10-31 23:44:50 -07:00
Raphael
0d09a7e4fe Merge remote branch 'robotarmy/431-copy-change' 2010-10-31 23:42:32 -07:00
Raphael
399a8965cc Merge remote branch 'ultrasaurus/365-app-config-warning' 2010-10-31 23:30:56 -07:00
Derrick Camerino
1a03dd799a showing aspect labels when posting status messages 2010-10-31 23:26:04 -07:00
Raphael
882389e396 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-31 23:23:14 -07:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
zhitomirskiyi
9a7e23b665 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-31 22:54:08 -07:00
Alec Leamas
85f94a2b00 Refactored into separate generic, source dir + distro addons. 2010-11-01 06:54:02 +01:00
zhitomirskiyi
71ebc90714 Merge branch 'secure-command-exec' of http://github.com/himanshuc/diaspora into himanshuc-secure-command-exec 2010-10-31 22:53:10 -07:00
Sarah Mei
9594e11ded Add feature for skipping the setup wizard. 2010-10-31 22:50:20 -07:00
Sarah Mei
cb09249058 Refactor aspect cucumber feature - now happy path only. 2010-10-31 22:49:40 -07:00
Alec Leamas
1ac0ebc32c Merge remote branch 'upstream/master' 
Conflicts:
	pkg/fedora/README.md
	pkg/fedora/dist
	pkg/fedora/make-dist.sh
	pkg/ubuntu/diaspora-setup
	pkg/ubuntu/dist
 2010-11-01 06:44:22 +01:00
Alec Leamas
518e06c1b7 Merge branch 'pkg-refactor' 2010-11-01 06:13:58 +01:00
Alec Leamas
23e566ce2e bugfix 2010-11-01 06:13:31 +01:00
Alec Leamas
6037dc1ca4 Merge branch 'pkg-refactor' 2010-11-01 05:20:55 +01:00
Alec Leamas
d8376b5a84 bugfix, refactor funcs 2010-11-01 05:20:33 +01:00
Sarah Mei
8193f2e350 Adding the rest of the new user setup to cucumber. 
wip scenario for skipping the profile wizard.
 2010-10-31 20:05:15 -07:00
Sarah Mei
a9cbf43fa4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-31 20:04:49 -07:00
Sarah Mei
50efd27710 Removing webmock from cucumber - interferes with capybara (more investigation needed). 2010-10-31 20:04:24 -07:00
zhitomirskiyi
c86a3eb608 moved getting started logic to the controller 2010-10-31 19:33:11 -07:00
Sarah Mei
e69da7c5e8 Cucumber feature for user registration. 2010-10-31 17:50:03 -07:00
Sarah Mei
ce213513eb PeopleController#update handles getting an empty string for :image 2010-10-31 17:49:47 -07:00
Sarah Mei
0817409e9a Fixed deprecation warning 2010-10-31 17:48:38 -07:00
danielvincent
3cdb48232a all box-shadows in views rendering in gecko 2010-10-31 17:29:23 -07:00
Michael Sofaer
82160d234a Symlink the gems, too. This is probably crazy, but should work for now 2010-10-31 17:16:23 -07:00
Michael Sofaer
fd55a56235 Symlink the RVM wrapper scripts to /usr/local/bin 2010-10-31 17:02:22 -07:00
livefromthemoon@gmail.com
60f6e091d3 Added missing strings to french translation 2010-11-01 00:27:32 +01:00
Hexagon
cf6c2deba3 Added missing strings to swedish translation 2010-10-31 22:54:37 +01:00
danielvincent
3f7955f978 removed two unused methods 2010-10-31 14:50:14 -07:00