Commit graph

8887 commits

Author SHA1 Message Date
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Jonne Hass
c6502a7c7a Merge branch '1395-mysql2-ruby1.9-bug' of https://github.com/Flink/diaspora 2011-09-14 14:02:28 +02:00
Jonne Hass
d7a7154424 Revert "lets set the example collation to utf8_general_ci instead of utf8_bin, #1395"
This reverts commit eb85cdab5b.
2011-09-14 14:01:53 +02:00
Loïc Guitaut
e25dd94d63 Fixes issue #1395 (utf8 and ruby 1.9.2) 2011-09-14 11:25:20 +02:00
danielgrippi
79319ecf97 remove rbx from travis (temporarily) 2011-09-14 00:10:37 -07:00
danielgrippi
60793fa1aa fixed failing spec 2011-09-14 00:10:04 -07:00
danielgrippi
aed08d6283 removed unused method; moved includes() out of scope 2011-09-14 00:10:04 -07:00
Maxwell Salzberg
88688d9bb6 Merge pull request #1976 from jtimberman/refactor-chef
Refactor Chef recipes to utilize natural features of Chef
2011-09-13 23:40:19 -07:00
jtimberman
6a7c08c87f Refactor Chef recipes to utilize natural features of Chef
* Don't use executes for installing packages, use the package resource
* Use node platform attribute to affect platform-specific behavior
* Consolidate into a single cookbook
2011-09-13 23:19:22 -06:00
The Lambda Calculus
6be533b987 Merge pull request #1975 from TheLambdaCalculus/b1126-additional-refactoring
Added RSpec test for #1126
2011-09-13 20:55:46 -07:00
The Lambda Calculus
83fc972c61 Added RSpec test for #1126 2011-09-13 23:27:54 -04:00
Ilya Zhitomirskiy
6b9ad7c4c6 SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet 2011-09-13 20:20:49 -07:00
danielgrippi
810d8ab97a remove rcov from Gemfile (we never used it); this makes rbx happy. reverted back to using rbx on travis 2011-09-13 19:45:28 -07:00
Gonzalo Rodriguez
181bc6cd57 Dim a little bit separation bar. Closes #1936. [ci skip] 2011-09-13 23:38:37 -03:00
danielgrippi
8c435e5db4 rbx doesn't play nice with vagrant. let's try rbx-2.0.0pre instead 2011-09-13 19:16:22 -07:00
danielgrippi
22f088f454 added rubinius to travis. HEY SHANE 2011-09-13 19:01:59 -07:00
danielgrippi
015cc9e451 actually fix specs/cucumber 2011-09-13 18:21:16 -07:00
Maxwell Salzberg
119cb37ba5 DG MS; broke validations into methods in receiver 2011-09-13 16:42:47 -07:00
Maxwell Salzberg
df87b398c7 MS DG; fixed cucumber 2011-09-13 16:14:31 -07:00
Jonne Hass
10df8ef2c8 updated 6 locale files [ci skip] 2011-09-14 00:43:19 +02:00
Maxwell Salzberg
4307de96e2 Merge branch 'new_public_receive' 2011-09-13 13:35:04 -07:00
Maxwell Salzberg
adaefd0cb5 MS DG rspec is green update gemfile 2011-09-13 13:34:49 -07:00
Maxwell Salzberg
3184d7aad1 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:32:50 -07:00
Jonne Hass
cecd6ca5a1 Lets take another try at a consistent single process mode handling
Revert "dont call settingslogic single process mode, use the hash accessor so it is not required"

This reverts commit 57de976396.
2011-09-13 22:29:56 +02:00
Maxwell Salzberg
dd1b869705 wip 2011-09-13 13:14:43 -07:00
Maxwell Salzberg
5258a37ce5 MS DG clean up Postzord::Dispatcher::Private 2011-09-13 13:11:43 -07:00
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