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

12543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Staudacher
b71e1a08dc adapt install.sh to the new config files, 
remove some unnecessary stuff
 2012-10-06 12:06:59 +02:00
Florian Staudacher
83ab60ab9e Merge branch 'hotfix/mobile-bookmarklet' into develop 
fix layout determination for mobile bookmarklet
 2012-10-05 12:25:33 +02:00
Jason Robinson
a26dc34a7b Fix broken mobile bookmarklet, isse #3613 2012-10-05 09:53:19 +02:00
Florian Staudacher
a9bec8a4ee Merge branch 'hotfix/oembed-selector' into develop 
fix for the click event handler on oembed-ed content
 2012-10-03 19:12:48 +02:00
Florian Staudacher
ad15897567 Merge branch 'hotfix/oembed-selector' 
fix for the click event handler on oembed-ed content
 2012-10-03 19:12:10 +02:00
Florian Staudacher
bf82fc17fe fix oembed onclick behavior + specs 2012-10-03 19:05:17 +02:00
Florian Staudacher
599d2e9aae minor install script improvements 2012-10-02 22:09:52 +02:00
Jonne Haß
5b73176d07 make diaspora.yml.example a bit clearer about sections [ci skip] 
thanks to @hfase01 for pointing that out
 2012-10-01 15:43:21 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Jonne Haß
4c8e08e608 bump omniauth-tumblr as tumblr made breaking api changes 2012-09-30 22:09:58 +02:00
Florian Staudacher
8678c14735 Merge pull request #3589 from MrZYX/refactor_config 
New configuration system, details: see changelog
 2012-09-30 13:07:40 -07:00
Florian Staudacher
a4e6486293 Merge pull request #3619 from davecocoa/feature/3591-chrome-frame-specs 
chrome frame specs
 2012-09-30 12:52:01 -07:00
David McMullin
586e23727c add specs for chromeframe 
fix typo in ChromeFrame itself
remove unneccessary chromeframe meta tags from layouts
 2012-09-30 17:04:50 +01:00
Jonne Haß
dc62587021 Merge pull request #3617 from mklew/feature/2317-links-in-notifications-should-authenticate 
Force user to authenticate instead of raising error
 2012-09-29 08:17:52 -07:00
Marek Lewandowski
125e45cdba Force user to authenticate instead of raising error 2012-09-29 16:57:34 +02:00
Jonne Haß
531c5b0c32 Merge pull request #3616 from movilla/css_problem_viewer_post 
css error in post-viewer after update bootstrap
 2012-09-29 06:44:20 -07:00
movilla
aa8c89a0e4 css error in post-viewer after update bootstrap 2012-09-29 15:19:39 +02:00
Jonne Haß
f42c4799ac updated plural rules [ci skip] 2012-09-28 16:07:48 +02:00
Jonne Haß
468982f3cc updated 28 locale files [ci skip] 2012-09-28 16:07:37 +02:00
Jonne Haß
d04d6faab7 correct dumb typo in diaspora.yml.example 2012-09-28 14:54:45 +02:00
Jonne Haß
4cebaee4db Remove stats.rake, if you really use it revert this commit and fix it 2012-09-26 20:23:47 +02:00
Jonne Haß
5754f334ed Change Procfile to minimal one 2012-09-26 20:23:47 +02:00
Jonne Haß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
ce728f6b7b add possibility to embed a resque worker into the unicorn process 2012-09-26 20:19:38 +02:00
Jonne Haß
89c1fd5f7f query the set url only through #pod_uri in the app 2012-09-26 20:19:37 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
5bea630910 Merge pull request #3593 from diaspora/update_gems 
Update gems / participation wanted
 2012-09-26 11:11:28 -07:00
Jonne Haß
ac59a3fa7a rails_admin version that is no longer conflicting with client_side_validations was released 2012-09-26 18:55:06 +02:00
Jonne Haß
7ba092ae0b bump jquery-rails 2012-09-26 18:55:06 +02:00
Jonne Haß
d5be4d6e2b bump asset_sync 2012-09-26 18:55:06 +02:00
Jonne Haß
254d4fd335 bump heroku and fog 2012-09-26 18:55:06 +02:00
Jonne Haß
0560cedab0 bump activerecord-import 2012-09-26 18:55:06 +02:00
Jonne Haß
7a478704d5 just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
Jonne Haß
06d9ff221d Merge branch 'LoD' into develop 2012-09-23 19:33:33 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00
Jonne Haß
f0619dbbfd readd develop branch to .travis.yml, somehow lost in merge 2012-09-23 19:06:54 +02:00
Jonne Haß
3b7dbd6703 change rspec format to documentation to debug travis 2012-09-23 19:01:57 +02:00
Jonne Haß
1277cf92b2 refactor ci scripts 2012-09-23 19:00:52 +02:00
Florian Staudacher
9d391d5885 Merge pull request #3597 from devendram/diaspora-refactoring-1 
refactored user model (using scope instead of class methods) + rspec tests
for daily, monthly, yearly activities
 2012-09-23 09:36:35 -07:00
Jonne Haß
0a1be1400d Merge pull request #3603 from movilla/translation_ignore_user_popup 
traslation popup ignore user => /stream
 2012-09-22 13:47:34 -07:00
movilla
812fce7181 traslation popup ignore user /stream 2012-09-22 22:07:17 +02:00
Jonne Haß
24c1c908f7 remove routes to removed controller 2012-09-22 14:16:28 +02:00
Devendra
a2fa083c3e added rspec tests and refactored user model to use scope, for daily, monthly, and yearly actives 2012-09-22 01:56:34 +05:30
Jonne Haß
db11b9d214 Merge branch 'update_gems' into develop 2012-09-20 14:37:34 +02:00
Jonne Haß
9534caeb05 Merge pull request #3568 from diaspora/update_gems 
Update gems / participation wanted
 2012-09-20 04:57:17 -07:00
Sean Tilley
48049d9b49 Merge pull request #3590 from movilla/reshares_mobile_2_the_revenge_absolute_root 
reshare mobile doesnt show the original author - absolute_root - Fix: #3368 [ci skip]
 2012-09-19 20:54:18 -07:00
Florian Staudacher
c4712f71a4 Merge branch 'hotfix/3499-chromeframe' 2012-09-19 13:09:01 +02:00
Florian Staudacher
3f0bcc8a10 rack expects an array instead of a string, fixes #3499 2012-09-19 13:08:12 +02:00
Florian Staudacher
84c8b4686b Merge branch 'hotfix/3499-chromeframe' into develop 2012-09-19 13:02:02 +02:00