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 |
|
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
|
87a5db225c
|
bundle with test:
|
2010-08-19 16:51:07 -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
|
6f20d07cf4
|
don't bundle test gems in cap
|
2010-08-19 16:16:40 -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 |
|
ilya
|
b723c5997e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:49:18 -07:00 |
|
ilya
|
54afb1bad4
|
Rolling assign_key into setup_person
|
2010-08-19 10:49:04 -07:00 |
|
maxwell
|
9942aef5d4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:46:58 -07:00 |
|
maxwell
|
5d25861dc6
|
IZ MS person profile page now displays only posts a user can see
|
2010-08-19 10:46:47 -07:00 |
|
ilya
|
e277244614
|
Fixing users routes
|
2010-08-19 10:38:42 -07:00 |
|
ilya
|
2e463c0e69
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:23:48 -07:00 |
|
ilya
|
9b47e67a15
|
call the right method in before_validation_on_create
|
2010-08-19 10:23:40 -07:00 |
|
maxwell
|
af8448dd51
|
photos on the profile edit page now are only your photos, for now. also, no more remove friend button on your profile page
|
2010-08-19 10:20:43 -07:00 |
|
maxwell
|
8131e413a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 22:59:18 -07:00 |
|
maxwell
|
84cc598017
|
MS a couple of small bug fixes when updateing user profile....starting to attept friend index/search page
|
2010-08-18 22:58:57 -07:00 |
|
ilya
|
9e78c9b64c
|
removing setup person
|
2010-08-18 21:58:29 -07:00 |
|
ilya
|
0a3277d306
|
maybe the instantiate method will help
|
2010-08-18 21:51:51 -07:00 |
|
ilya
|
0f6ec71dcd
|
we need assign key as well
|
2010-08-18 21:45:41 -07:00 |
|
ilya
|
b081bdcfdf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:43:20 -07:00 |
|
ilya
|
0c9f041f28
|
we need do bad things in the user for seeding the database
|
2010-08-18 21:42:37 -07:00 |
|
maxwell
|
ff41277088
|
one thing beta couldnt handle
|
2010-08-18 21:34:02 -07:00 |
|
maxwell
|
3986993b9f
|
updateing bundle task
|
2010-08-18 21:25:52 -07:00 |
|
maxwell
|
0eb0a69990
|
MS merging
|
2010-08-18 21:24:15 -07:00 |
|
maxwell
|
a26543b4a5
|
rolling back
|
2010-08-18 21:22:49 -07:00 |
|
Raphael
|
00b070f2fc
|
added stuff to clear_bundle
|
2010-08-18 21:21:56 -07:00 |
|
Raphael
|
7ce8f94d58
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:10:48 -07:00 |
|
Raphael
|
a23df47dbc
|
Trying to merge in the pivots changes that we want in master
|
2010-08-18 21:10:42 -07:00 |
|
maxwell
|
f7d74e9f93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-18 21:06:13 -07:00 |
|