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
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
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
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
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
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
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
danielvincent
bfb132280a
reshare button displays dropdown on click
2010-10-31 14:30:03 -07:00
danielvincent
dc330012d6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-31 12:35:56 -07:00
danielvincent
b08c4fb84e
removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)
2010-10-31 12:34:26 -07:00
J David Eisenberg
14ccf7229b
Issue #492 : Informal, vague description when signing up as a new user
2010-10-30 22:07:37 -07:00
Sarah Mei
07c216f31b
Putting the jasmine back in CI - changing selenium to be an external process.
2010-10-30 16:31:36 -07:00
Sarah Mei
2268cd204c
Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci
2010-10-30 13:52:52 -07:00
Sarah Mei
08a70e4980
Moved default rake task to default.rake. Now runs cucumber, rspec, and jasmine.
2010-10-30 11:51:54 -07:00
Sarah Mei
3bd3a63c5d
Enough jasmine specs to get us started.
2010-10-30 11:48:17 -07:00
Sarah Mei
d0446aa316
require => false on jasmine to get rid of warnings
2010-10-30 10:58:32 -07:00
Alec Leamas
b913444f2a
Merge remote branch 'upstream/master'
2010-10-30 18:13:44 +02:00
Alec Leamas
d572f8fafc
Packaging update
...
Handle git gems by cloning repo to local one, rewriting Gemfile
urls and sending both repos and gems in source packages.
Separate doc dir w licensec.
Gemfile, Gemfile.lock now lives in bundle, linked to application.
Rewrite http git urls to git: to make it uniform & simpler
2010-10-30 18:03:14 +02:00
Hexagon
bba3aaa684
Translating a huge amount of untranslated strings
2010-10-30 15:25:42 +02:00
Hexagon
0bef839261
Translating a huge amount of untranslated strings
2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6
Small fix
2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98
Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2
2010-10-30 09:54:28 +02:00
Sarah Mei
3fd198d1bc
mongrel doesn't build under 1.9
2010-10-29 22:35:33 -07:00
Sarah Mei
d819c98718
can haz working jasmine
2010-10-29 22:21:08 -07:00
Himanshu Chhetri
4db521657d
Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion.
2010-10-29 20:31:45 -07:00
Sarah Mei
07a54fea04
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 20:27:33 -07:00
Sarah Mei
f04634c415
Don't need to remove Gemfile.lock for 1.8.7 build
2010-10-29 20:27:26 -07:00
Raphael
ccf3b7d87b
stub out some stuff in publics_controller
2010-10-29 19:10:29 -07:00
Sarah Mei
53dbff42ad
CI creates gemset if it doesn't exist
...
CI 1.8.7 build uses REE
2010-10-29 19:08:47 -07:00
Raphael
f7708fb9bf
Get rid of deprecation warning
2010-10-29 18:55:30 -07:00
