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

8839 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jonne Hass
54044067e7 get sure script/get_config is executed with the right environment 2011-09-11 16:46:25 +02:00
Jonne Hass
cce2ab2151 cleaned up application.yml.example 2011-09-11 14:45:47 +02:00
Jonne Hass
bdd6b9127a overlooked one last old single process check 2011-09-11 14:19:26 +02:00
Jonne Hass
a614985d83 made single process mode configuration more consistent 
* SINGLE_PROCESS_MODE environment variable takes precedence over
  application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
  SINGLE_PROCESS_MODE environment variable to be backward compatible
 2011-09-11 13:54:14 +02:00
Jonne Hass
28b6e276f8 added possibility to install all database gems 
…via DB=all bundle install, useful for development
 2011-09-11 13:07:52 +02:00
Daniel Grippi
95aad7f15d Merge pull request #1940 from alda519/profiles_helper-image 
default profile photo is no longer marked as set
 2011-09-10 19:25:47 -07:00
Jonne Hass
79a8ab709f updated 77 locales [ci skip] 2011-09-11 03:20:59 +02:00
Sarah Mei
ae32ffc667 Merge branch 'master' of github.com:diaspora/diaspora 2011-09-10 13:38:12 -07:00
Sarah Mei
8b789bfe35 Notifications don't 500 anymore, but I don't know how to make it render the mobile view. 2011-09-10 13:38:01 -07:00
Jonne Hass
523d565dd5 Merge pull request #1939 from everplays/css-rtl 
fixed html markup which broke applied direction
 2011-09-10 13:27:19 -07:00
danielgrippi
fe915ecb09 don't redirect to AspectsController#new from AspectsController#index if no aspect is present 2011-09-10 09:25:38 -07:00
danielgrippi
36a9e1643e touched up AspectsController#index for readability's sake 2011-09-10 09:24:35 -07:00
alda519
b5f8f49ddd default profile photo is no longer marked as set 2011-09-10 17:31:34 +02:00
Daniel Grippi
4ab112645f removed a puts in Person.search 2011-09-10 07:40:35 -07:00
behrooz shabani (everplays)
0370fab706 Merge branch 'css-rtl' of github.com:everplays/diaspora into css-rtl 2011-09-10 16:20:15 +04:30
behrooz shabani (everplays)
22bb6177d4 <p> can't be inside another one - breaks direction detection 
we are applying direction of content on <p> & markdownify always
generates a <p> so we have something like <p
class="ltr"><p>...</p></p> but paragraph can't be inside another
paragraph & browsers sees something like <p
class="rtl"></p><p>...</p></p> so applied direction will be ignored
 2011-09-10 16:14:30 +04:30
Ilya Zhitomirskiy
ad11bd2a31 the Devise email regex was not catching pods that were anything other than a standard url 2011-09-09 18:05:58 -07:00
Ilya Zhitomirskiy
aeef0b5f6e changed the Gemfile to default to mysql 2011-09-09 12:04:31 -07:00
danielgrippi
961272d1bd tweaked search a little (don't put a double wildcard on diaspora_id) -- this is a quick fix; solr pending 2011-09-09 11:54:10 -07:00
Maxwell Salzberg
1fa01a811e DG MS; updated text to reflect the fact that hiding posts now 
mutes notifications as well
 2011-09-09 10:52:19 -07:00
Maxwell Salzberg
328269e40d re-added single process mode to the example 2011-09-09 10:10:10 -07:00
Maxwell Salzberg
bea76a4801 move the ugly type check into the ugly method, to keep all the ugly in 
one place; restore listening to single process mode in resque; move the
exception handling to inside the method, rather than around the
intializer, and log when resque errors happen in development in single
process mode
 2011-09-09 08:58:06 -07:00