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

674 commits

Author SHA1 Message Date
Raphael
214685e5a9 Dev seed might now work 2010-08-06 17:11:50 -07:00
Raphael
7076097ee4 RS, IZ; The tests are green. 2010-08-06 16:56:13 -07:00
Raphael
4350e17656 RS, IZ; removed lots of putses, fixed up request, parser, retractions 2010-08-06 16:01:39 -07:00
Raphael
f2e327d908 User factory now works 2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4 Refactored message_queue getting, fixed retraction spec 2010-08-06 13:13:00 -07:00
Raphael
d130b82e42 RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns? 2010-08-06 11:52:33 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
Raphael
b5cbfab36e RS, IZ; Comment spec now passes 2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4 MS DG; 19 failing specs left 2010-08-05 17:16:51 -07:00
maxwell
dc0eb7de51 Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-05 15:13:59 -07:00
maxwell
5e6d0c1153 Merge branch 'master' of github.com:diaspora/diaspora_rails into 
friend-refactor, also fixed more specs

Conflicts:
	app/models/person.rb
	app/models/user.rb
	spec/factories.rb
 2010-08-05 15:13:05 -07:00
Raphael
bffb63d9f0 IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml 2010-08-05 14:39:48 -07:00
danielvincent
dae8f26692 DG MS; fixed most photo specs 2010-08-05 11:56:37 -07:00
Raphael
bb66e87905 RS, IZ; Encryption specs now pass with openssl 2010-08-05 11:56:31 -07:00
Raphael
f8e7d3f313 RS, IZ; Rolling back special casing of friend-request 2010-08-05 11:14:40 -07:00
Raphael
2429a1a476 RS, IZ; keys should roxml 2010-08-05 11:13:38 -07:00
Raphael
ebe14b5afd RS, IZ; Not using person in friend request verification 2010-08-05 11:09:36 -07:00
Raphael
f487e271c0 RS, IZ; Posts now sign, signatures and keys now serialize 2010-08-05 10:43:02 -07:00
danielvincent
4827953bec DG MS; person specs are now passing. retraction on unfriend is now uncommented 2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068 one failing test in Person. i have no idea. 2010-08-04 23:54:15 -07:00
danielvincent
d6bc93fb96 commented out retraction on unfriending due to ROXML messing things up 
.
 2010-08-04 23:47:27 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
f11e973602 added the inport key thing in user 2010-08-04 20:44:18 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84 unfriend still not removing association from bad_friend 2010-08-04 20:29:54 -07:00
danielvincent
7a556e1b3c Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor 2010-08-04 19:23:56 -07:00
danielvincent
c92a225556 DG MS; user-person relationship done. bunch of failing stuff. 2010-08-04 19:22:14 -07:00
Raphael
6832c67a78 RS IZ friend requests are hopefully now signed 2010-08-04 17:20:34 -07:00
Raphael
7676179e54 IZ, RS; now passing correct object to verify_signature 2010-08-04 17:10:38 -07:00
Raphael
5a802299d5 IZ, RS; Retractions should now be signed 2010-08-04 17:06:15 -07:00
Raphael
2388237174 RS, IZ; Replace type_name method with object.class.to_s 2010-08-04 16:36:08 -07:00
Raphael
b8a2e8ecdf RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific 2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-08-04 16:01:37 -07:00
Raphael
c245d8c60c Merging ostatus deletion with selenium start 2010-08-04 16:01:19 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
danielvincent
09958bc207 DG MS; removed delete friend button from current user's show page 2010-08-04 15:43:24 -07:00
danielvincent
278189462b fixed ostatus generator references in models 2010-08-04 09:59:15 -07:00
danielvincent
c5ace3069d diaspora module correctly loads everything (lazy) 2010-08-04 00:41:23 -07:00
danielvincent
c78b111fec Merge branch 'master' into group-top 2010-08-03 16:42:33 -07:00
Raphael
e3c28c4fee Fixed Photos, and Carrierwave initializer 2010-08-02 21:31:14 -07:00
Raphael
da3bf35d81 Typo in album 2010-08-02 18:30:09 -07:00
Raphael
6b1f020839 Moved utilities out to special controller, took pound sign out of database name 2010-08-02 18:03:16 -07:00
danielvincent
5030fbb8b5 Merge branch 'master' into group-top 2010-08-02 17:28:17 -07:00
danielvincent
3d5f27fe5a javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing 2010-08-02 17:27:45 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
danielvincent
102b912878 moved group nav to its own partial 2010-08-02 16:20:30 -07:00
Raphael
9fe37b1d8c RS, IZ; Cleaned up user spec, started to add current_user.post 2010-08-02 16:16:23 -07:00
danielvincent
3e5cecd532 Merge branch 'master' into group-top 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-08-02 16:09:13 -07:00
Raphael
d503c6541f RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
danielvincent
5974bf3571 group nav is now links to nothing 2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3 top nav for groups partially there. 2010-08-01 22:26:56 -07:00
Raphael
c95ceecf9e Clarified socket helper, added a selenium test 2010-07-30 12:40:02 -07:00
Raphael
6fe00982f2 RS, IZ, fixing another error on person show 2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1 RS, IZ, fixing error on person show with no posts 2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed Websocketed photos now fade in 2010-07-30 10:20:50 -07:00
ilya
3eeb81ad34 DG IZ; time_created_at uses published_at instead of created_at for OstatusPost 2010-07-29 20:43:03 -07:00
ilya
f191aef981 DG IZ profile profile photos should update, removed the scaled down hack 2010-07-29 19:44:58 -07:00
ilya
abc5ee412d DG IZ assiging the new profile to the person in the parse objects from xml 2010-07-29 19:24:52 -07:00
ilya
0aa268a62d DG IZ trying asymetric searization and marshaling 2010-07-29 19:12:20 -07:00
ilya
27bf29119d restoring display inline 2010-07-29 18:03:18 -07:00
ilya
085ea0a665 RS, IZ, DG Removing display inline 2010-07-29 17:59:44 -07:00
ilya
f6495e2bec RS IZ photos now fade in on the album upload page 2010-07-29 17:26:05 -07:00
maxwell
6aa1fa1826 DG MS profiles send? who knows... 2010-07-29 15:53:38 -07:00
Raphael
a636d97837 Removed crash if there was no latest status message 2010-07-29 14:38:46 -07:00
Raphael
3376057c33 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 13:58:49 -07:00
danielvincent
11a099914c on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited. 2010-07-29 11:07:44 -07:00
danielvincent
fd4475370d added profile url to author show page 2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
c8b40001e5 IZ album edit page was not added 2010-07-28 21:10:35 -07:00
Raphael
1e954eae4f took out old puts, put in new one 2010-07-28 20:37:42 -07:00
maxwell
6a8291b56f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 18:35:06 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
ilya
96a9c9455d DG IZ; make photos in stream larger, because they need love too 2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
acb295d695 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 17:05:14 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -07:00
maxwell
e14e391a22 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 16:50:48 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
ilya
1700ce8e18 DG IZ; tweaks to album index page 2010-07-28 16:12:49 -07:00
ilya
3f27e1f67d DG IZ photo spacing now works 2010-07-28 14:48:28 -07:00
ilya
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
ilya
9e3c6a0936 DG IZ; brushed up ostatus user page 2010-07-28 12:13:36 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
a57727c1fc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 16:18:59 -07:00
maxwell
c41dea1e8b MS small profile tweaks 2010-07-27 16:18:46 -07:00
danielvincent
7992b1b0e0 delete photo button on photo show page instead of delete album. 2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b more recovery 2010-07-27 16:04:59 -07:00
maxwell
92cc48beaf Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 15:52:50 -07:00
maxwell
3cecbf1511 MS profile page fixes 2010-07-27 15:52:42 -07:00
danielvincent
34291340b2 trying to get back up to speed 2010-07-27 15:50:44 -07:00
maxwell
9dd5c08296 fixed two small UI bugs 2010-07-27 14:45:04 -07:00
maxwell
86e090bac3 MS figured out moz gradient business 2010-07-27 14:34:16 -07:00
maxwell
9c7b3f0c07 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 14:23:44 -07:00
maxwell
bdca2348a6 MS IZ profile page has more useful info, but ultimatly kinda ugly 2010-07-27 14:23:31 -07:00
danielvincent
d4ac19e9ce all form buttons are now using button definition in UI 2010-07-27 12:23:21 -07:00