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

8861 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Hass
eb85cdab5b lets set the example collation to utf8_general_ci instead of utf8_bin, #1395 2011-09-13 17:45:53 +02:00
Daniel Grippi
06cd986c45 Merge pull request #1966 from buddhamagnet/gemfile_cleanup 
cleaned up Gemfile
 2011-09-13 08:23:54 -07:00
The Lambda Calculus
b7399cda8f Merge pull request #1970 from TheLambdaCalculus/b1126-additional-refactoring 
Refactoring for B#1126 fix. Photo model is now fatter with #destroy logic while Photo controller is thinner.
 2011-09-13 07:15:29 -07:00
buddhamagnet
acb98ddc51 cleaned up Gemfile 2011-09-13 11:56:31 +01:00
Jonne Hass
da967a4622 Merge pull request #1965 from buddhamagnet/gitignore 
added vendor/cache to gitignore file
 2011-09-13 02:13:55 -07:00
buddhamagnet
8e3809929a added vendor/cache to gitignore file 2011-09-13 10:03:13 +01:00
The Lambda Calculus
f8f1ef3f91 Refactored code so that the controller got thinner while the model become fatter [Finishes #1126] 2011-09-13 03:04:22 -04:00
Daniel Grippi
2df00ed98f Merge pull request #1963 from alda519/search_hashtag_underline 
removes underline in tag search form on getting started page
 2011-09-12 23:39:53 -07:00
alda519
2d47658b08 removes underline in tag search form on getting started page 2011-09-13 08:14:20 +02:00
danielgrippi
2022187942 sprinkle a little documentation around lib, mostly just specifying return types 2011-09-12 23:01:47 -07:00
Gonzalo Rodriguez
2947ee46f4 Bold titles on profile information sidebar. Closes #1934. 2011-09-13 00:04:51 -03:00
Maxwell Salzberg
ee257b2a7c MS DG forgot require for cucumber 2011-09-12 17:35:54 -07:00
Maxwell Salzberg
665facaeb0 DG MS renamed private dispatcher; started refactor including public 
dispatcher
 2011-09-12 17:02:40 -07:00
Maxwell Salzberg
ca8a9e8025 update schema 2011-09-12 15:42:00 -07:00
Maxwell Salzberg
27d882b2b6 Merge branch 'public_receive' 2011-09-12 15:19:47 -07:00
Maxwell Salzberg
0ab0526cd6 DG MS; put validates_associated in relayable, removed from receiver logic 2011-09-12 15:06:17 -07:00
Maxwell Salzberg
5177e5b218 DG MS test receive_relayable 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6e60905d0d DG MS major refactor of salmon and corresponding federation logic 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
87c994fa47 MS DG cleaned up and fleshed out salmon specs 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
6dede984e9 delegate instead of denormalize 2011-09-12 14:05:32 -07:00
Maxwell Salzberg
34ed07260f MS IZ DG moar salmon refactoring 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
e0429ee823 MS DG pulling apart salmon and making our custom hacks more obvious 2011-09-12 14:05:31 -07:00
Maxwell Salzberg
6b0507949c updated salmon to let us not always encrypt the header 2011-09-12 14:05:31 -07:00
Jonne Hass
5ae96efdf6 fix oauth keys, deep_merge vs deep_merge! my bad 2011-09-12 22:28:13 +02:00
Ilya Zhitomirskiy
6a6c4cd82b unsubscribers in csvs 2011-09-12 11:11:53 -07:00
Jonne Hass
df8a2261d1 Merge pull request #1959 from lprelle/translate_donate_button 
move _donate.html.erb to _donate.html.haml and make it translateable
 2011-09-12 09:32:01 -07:00
Lennart Prelle
5a3445150c move _donate.html.erb to _donate.html.haml and make it translateable 2011-09-12 18:29:07 +02:00
Maxwell Salzberg
57de976396 dont call settingslogic single process mode, use the hash accessor so it is not required 2011-09-12 08:42:38 -07:00
Jonne Hass
fbf7c5c708 apply patch from and fix #1954 2011-09-12 16:29:39 +02:00
danielgrippi
cb2c094139 use method not instance var 2011-09-11 20:08:00 -07:00
danielgrippi
293afd80ff all_public scope in Post for clarity 2011-09-11 19:28:52 -07:00
Jonne Hass
4b0c45d895 rescue unmeaningful exception from settingslogic if the namespace doesn't exists and replace it with meaningful error message 2011-09-12 01:05:49 +02:00
Sarah Mei
91756663a7 In my irritation, I didn't actually try my renamed aspect. The name I picked was too long. >.< 2011-09-11 15:22:31 -07:00
danielgrippi
2d1bb92a5a added missing sample() in _selected_contacts.html.haml 2011-09-11 15:18:46 -07:00
Sarah Mei
e1f80acdcf Fix occassional postgres failure. 
So the cucumber step 'And I follow "link title"' does substring matching, and will click on the first link it finds that contains "link title". Thus if you have 2 aspects, one called PostingTo and the other called NotPostingTo, doing 'And I follow "PostingTo"' may click a different link depending on what order the aspect links are in.
ka-sigh.
 2011-09-11 15:14:56 -07:00
danielgrippi
1d0bec11f7 Add counter cache for comments on posts 2011-09-11 15:02:24 -07:00
Jonne Hass
37787605aa updated 44 locale files [ci skip] 2011-09-12 00:00:58 +02:00
Jonne Hass
fcc6d95067 Merge branch 'refactor_models_2' of https://github.com/buddhamagnet/diaspora 2011-09-11 23:46:13 +02:00
Jonne Hass
41effa7bd2 load oauth_keys.yml.example as default so I don't have to touch my oauth_keys.yml to have the specs pass on my machine 2011-09-11 23:45:14 +02:00
danielgrippi
586746868c Merge branch 'stream-object' 2011-09-11 14:18:19 -07:00
danielgrippi
1bd37038cc fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
21182c88ec initial tests for AspectStream 2011-09-11 14:16:48 -07:00
danielgrippi
ec4dc7a905 Created AspectStream; removed all logic from AspectsController#index 2011-09-11 14:16:48 -07:00
buddhamagnet
010024c4f9 continuing refactor of model validation calls to rails 3 syntax 2011-09-11 21:39:02 +01:00
buddhamagnet
cfa659c47e refactored model validations to use newer rails 3 syntax 2011-09-11 21:31:39 +01:00
Jonne Hass
96fc057974 correct Rails.logger call in resque initializer 2011-09-11 22:07:54 +02:00
Jonne Hass
0f5dbb0f83 on_success: always is now default for irc notifications on travis 2011-09-11 18:54:47 +02:00
Jonne Hass
d0dc96a752 Merge pull request #1945 from lprelle/make_string_in_authorizations_translateable 
Make string in authorizations translateable
 2011-09-11 09:08:28 -07:00
Lennart Prelle
8041fea96c added mobile version to the change 2011-09-11 17:29:23 +02:00
Lennart Prelle
40ac7b7620 make string in authorizations translateable 2011-09-11 17:20:54 +02:00