danielvincent
|
41b3117a41
|
removed that annoying rollover on diaspora text
|
2010-08-23 15:13:27 -07:00 |
|
Raphael
|
dbb16faed1
|
Photo filename is now better
|
2010-08-23 15:10:19 -07:00 |
|
Raphael
|
0cff5a45a2
|
Deleting gridfs controller
|
2010-08-23 15:02:28 -07:00 |
|
Raphael
|
511f571ae5
|
Specs mostly pass again
|
2010-08-23 15:01:39 -07:00 |
|
Raphael
|
48959b3ded
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:45:20 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
danielvincent
|
4e996f8412
|
user name darker
|
2010-08-23 14:30:20 -07:00 |
|
danielvincent
|
fb7e945fc2
|
removed useless if/else
|
2010-08-23 14:19:16 -07:00 |
|
danielvincent
|
60b7c30a8a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:17:26 -07:00 |
|
danielvincent
|
d874ba3b38
|
dropdown menu for user
|
2010-08-23 14:17:05 -07:00 |
|
Raphael
|
5a02f92448
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 13:58:46 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
Raphael
|
efb4100e01
|
Split up socket debug and app debug
|
2010-08-23 13:58:09 -07:00 |
|
Raphael
|
97aa8a4dc9
|
No photos index route
|
2010-08-23 13:57:33 -07:00 |
|
danielvincent
|
d9c091d3f8
|
search box in top nav
|
2010-08-23 12:43:12 -07:00 |
|
Raphael
|
9ef2008613
|
Remove tinymce init block
|
2010-08-23 11:59:58 -07:00 |
|
Raphael
|
0092069372
|
Take signed in check out of websocket js
|
2010-08-23 11:57:29 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
danielvincent
|
37a67b29a4
|
left/right arrow keys on photo show page go to prev/next
|
2010-08-23 11:22:55 -07:00 |
|
danielvincent
|
2355947d8e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 11:05:36 -07:00 |
|
danielvincent
|
2d21ac0460
|
moving things around
|
2010-08-23 11:05:28 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
Raphael
|
4abf6a2cbd
|
Changing branch, deleting old servers
|
2010-08-23 10:30:18 -07:00 |
|
Raphael
|
364cdfed22
|
Allowed email checking no longer so ridiculous
|
2010-08-23 10:20:19 -07:00 |
|
Raphael
|
15b2c23b51
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-23 09:50:38 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20:34 -07:00 |
|
ilya
|
37819be974
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 20:07:14 -07:00 |
|
ilya
|
643c52fd62
|
making a clear text on the user index page
|
2010-08-19 18:10:55 -07:00 |
|
Raphael
|
37e5c4e9b2
|
correct branch
|
2010-08-19 16:55:54 -07:00 |
|
Raphael
|
5d1c1a0efa
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-19 16:51:22 -07:00 |
|
Raphael
|
87a5db225c
|
bundle with test:
|
2010-08-19 16:51:07 -07:00 |
|
Raphael
|
51b07784fe
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-19 16:47:01 -07:00 |
|
Raphael
|
09ed7141dd
|
json
|
2010-08-19 16:46:46 -07:00 |
|
Raphael
|
170ef67181
|
set browser in selenium.yml for linux
|
2010-08-19 16:43:56 -07:00 |
|
Raphael
|
8e253a6d49
|
Left in a merge marker
|
2010-08-19 16:20:38 -07:00 |
|
Raphael
|
125f70abff
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
|
2010-08-19 16:17:09 -07:00 |
|
Raphael
|
6f20d07cf4
|
don't bundle test gems in cap
|
2010-08-19 16:16:40 -07:00 |
|
Raphael
|
f66b5f4006
|
Merge branch 'master' of github.com:diaspora/diaspora into pivots
Conflicts:
app/controllers/users_controller.rb
app/models/user.rb
config/sprinkle/provision.rb
|
2010-08-19 16:09:08 -07:00 |
|
maxwell
|
616c701faf
|
Merge branch 'selenium' of github.com:diaspora/diaspora
|
2010-08-19 15:44:51 -07:00 |
|
maxwell
|
20678060e7
|
selenium, ymls, a sample test
|
2010-08-19 15:44:23 -07:00 |
|
ilya
|
7eb1bb5a00
|
removing the sanity check
|
2010-08-19 14:36:15 -07:00 |
|
ilya
|
542c1769f9
|
doing a sanity check, that not requiring serialized key passes the validation
|
2010-08-19 14:25:34 -07:00 |
|
ilya
|
501d62f215
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 14:13:27 -07:00 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
danielvincent
|
36b2445a11
|
added title to search page
|
2010-08-19 13:41:48 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -07:00 |
|
maxwell
|
02da9bf634
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 12:00:21 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|