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

6646 commits

This branch
This branch
All branches
Author SHA1 Message Date
maxwell
9e5890288c more bookmarklet improvements 2011-03-28 18:34:52 -07:00
maxwell
f08b5dfafe basic functionality done, fixing rough edges 2011-03-28 18:11:59 -07:00
Raphael Sofaer
349aa13c05 Revert "reduce db quries on aspects#index" 
This reverts commit 3af5e24ac6.

Conflicts:

	app/controllers/aspects_controller.rb
 2011-03-28 14:59:16 -07:00
Raphael Sofaer
c33a952bbd Forgot parens 2011-03-28 11:22:03 -07:00
Raphael Sofaer
a0d3921d72 Fix 500 on tag show with comments 2011-03-28 10:01:19 -07:00
MrZYX
c2a4c2157d oh yeah it's delete_all on has_many, seems like I shouldn't code today… 2011-03-28 18:04:21 +02:00
MrZYX
824c4b38ad dependent delete for likes 2011-03-28 17:54:07 +02:00
Sarah Mei
ffe48fe189 Refactor aspects#index to be easier to read; move some expensive operations after the guard clause 2011-03-27 19:19:25 -07:00
Sarah Mei
ae106e71ae Move sort order to a before filter, because this index method is waaaaay too big. 2011-03-27 18:52:43 -07:00
Sarah Mei
4d0338efa4 Merge branch 'master' of github.com:diaspora/diaspora 2011-03-27 18:32:25 -07:00
Sarah Mei
59650c8104 Refactor saved state cucumber feature to be more consistent. (It was occasionally failing locally due to a timing issue.) 2011-03-27 18:32:11 -07:00
Raphael Sofaer
4180d5dcf8 Take out rspec convention link 2011-03-27 17:39:28 -07:00
Raphael Sofaer
36a262a3ad Revert "update selenium-webdriver to 0.1.4,fixes #829" 
This reverts commit eddd8d969f.
 2011-03-27 16:32:40 -07:00
MrZYX
5c4979ccf0 use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why 2011-03-28 00:09:07 +02:00
MrZYX
eddd8d969f update selenium-webdriver to 0.1.4,fixes #829 2011-03-27 22:52:33 +02:00
MrZYX
40810741f3 fixed cucumber 2011-03-27 22:04:36 +02:00
adonix
b71bfdf583 972-issue:all-aspects-spelling 2011-03-27 12:14:09 -07:00
MrZYX
315fdabd76 let the user upload an image without touching the textarea, improved check in Photo#process to not yield no method on nil error in some cases 2011-03-27 21:08:30 +02:00
Sarah Mei
c4bc24d485 Add spec for remembering sort order 2011-03-27 10:56:08 -07:00
Sarah Mei
56b0d7821d Move a few specs out of an expensive context they don't need 2011-03-27 10:47:04 -07:00
Sarah Mei
a5f6b6512d Upgrade cucumber version 2011-03-27 10:46:38 -07:00
MrZYX
a9e3511c19 updated locales 2011-03-27 18:50:01 +02:00
MrZYX
e2f6427724 just realized that the change to AspectsController#index in the previous commit isn't needed 2011-03-27 17:26:17 +02:00
MrZYX
3af5e24ac6 reduce db quries on aspects#index 2011-03-27 17:22:35 +02:00
MrZYX
52fee96bfc whoops, recieve is a post route, not a get, thanks mb-log 2011-03-27 16:11:38 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
d50cfe8d5d updated locales 2011-03-27 00:40:34 +01:00
MrZYX
3a5f8d814d fixed spec 2011-03-27 00:23:14 +01:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
11b0a2c19d dependent destroy for likes 2011-03-26 21:47:40 +01:00
MrZYX
421e50d2ca specify what we don't want in a tag for now 2011-03-26 19:02:04 +01:00
MrZYX
5918dbf786 typo in script/server 2011-03-26 18:58:18 +01:00
MrZYX
38673158f6 actually it was the other way around, we have to tell ruby that it's utf8, though now the build fails because (first guess) \w probably doesn't include utf8 chars in 1.9 2011-03-26 18:43:31 +01:00
MrZYX
9ff0ceab07 Revert "someone doesn't save his files as UTF8 :\" 
This reverts commit c84f767174.
 2011-03-26 18:28:47 +01:00
MrZYX
c84f767174 someone doesn't save his files as UTF8 :\ 2011-03-26 18:21:07 +01:00
MrZYX
867a5e143f comment out init_public in script server for now as it's buggy and confuses users 2011-03-26 17:57:13 +01:00
MrZYX
92d6b618aa ups that shouldn't be in the previous commit 2011-03-26 17:41:58 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
6855447204 unicode fix in tags 2011-03-25 17:39:44 -07:00
danielgrippi
8a2dd36b7e Fix autocomplete JSON 2011-03-25 17:28:04 -07:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
Raphael Sofaer
b9af450628 Relayable retractions pretty much done 2011-03-25 16:09:37 -07:00
Raphael Sofaer
31f43696cb Initial work on retracting comments 2011-03-25 16:09:37 -07:00
Raphael Sofaer
cc84ddbe94 Move encryptable out of relayable for use in relayable_retraction 2011-03-25 16:09:37 -07:00
danielgrippi
40953d37bd Put an upper limit on the per_page param 2011-03-25 15:31:23 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8 Make pending specs green, I think there are still some to_jsons where there should be as_json 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00