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

12617 commits

This branch
This branch
All branches
Author SHA1 Message Date
Florian Staudacher
ded69477ba replace the monstrous link regex with a slightly less complicated one, 
based on the one from the markdown parser, fixes #3553
adding a list of urls for testing the regex in the specs
 2012-10-11 23:39:44 +02:00
Jonne Haß
d979ac4499 Merge pull request #3649 from movilla/display_registration 
Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false
 2012-10-10 08:31:04 -07:00
movilla
928a8a02d8 Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false 2012-10-10 16:49:45 +02:00
Jonne Haß
e6ec41930b Merge branch 'hotfix/0.0.1.1' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2012-10-09 22:37:53 +02:00
Jonne Haß
3eb628c2a3 fix french javascript pluralization rule and add specs for locale loading 2012-10-09 22:36:30 +02:00
Sean Tilley
a0bf1722bf Merge pull request #3638 from movilla/facebox_fix_width 
Facebox invitations top on left - outerWidth fail! [ci skip]
 2012-10-08 14:38:25 -07:00
Sean Tilley
bbaf41aa8d Merge pull request #3637 from movilla/dropdown_welcome_page 
Aspect dropdown on welcome page (after signup) - overflow hidden - Fix #3604 [ci skip]
 2012-10-08 14:36:01 -07:00
movilla
81f48d6526 facebox invitations top on left - outerWidth fail 2012-10-08 23:08:50 +02:00
movilla
7be7ac3176 Aspect dropdown on welcome page (after signup) - overflow hidden - fix 3604 2012-10-08 19:15:21 +02:00
Jonne Haß
8febcfac9c Merge pull request #3635 from movilla/fix_checkbox_select_profiles 
Edit Profile issue with misaligned elements - Fix #3599
 2012-10-08 06:51:04 -07:00
movilla
509aa3116d Edit Profile issue with misaligned elements - Fix 3599 2012-10-08 15:25:17 +02:00
Jonne Haß
8493dfe86d post release version bump [ci skip] 2012-10-08 13:22:43 +02:00
Jonne Haß
1f9f0c2932 Changing release mode to true, hopefully the last commit ever violating the branching model. DO NOT BACKPORT THIS COMMIT TO DEVELOP 2012-10-07 15:08:21 +02:00
Jonne Haß
3a59ea7798 Merge branch 'release/0.0.1.0' into develop 2012-10-07 15:06:06 +02:00
Jonne Haß
91a39dfefd Merge branch 'release/0.0.1.0' 2012-10-07 15:05:06 +02:00
Jonne Haß
b56ef50872 pre release changes for 0.0.1.0 2012-10-07 15:04:45 +02:00
Florian Staudacher
4b20e762e7 more changelog entries 2012-10-07 14:56:46 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
bd9b4543dc updated 15 locale files [ci skip] 2012-10-07 14:19:48 +02:00
Florian Staudacher
746b5f89b9 Merge pull request #3626 from marpo60/fix_seeds 
fix db/seeds.rb 

update usages of factory girl to respect the changes introduced with the bumped version
 2012-10-06 05:39:38 -07:00
Florian Staudacher
a5b97f72a3 forgot one in the text ... always scroll to the bottom [ci skip] 2012-10-06 12:10:29 +02:00
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
Florian Staudacher
f45c5be95c Merge branch 'hotfix/mobile-bookmarklet' 
fix view layout determination for mobile bookmarklet
 2012-10-05 12:24:38 +02:00
Jason Robinson
a26dc34a7b Fix broken mobile bookmarklet, isse #3613 2012-10-05 09:53:19 +02:00
Fabián Rodríguez
ebd9f87e61 fix db/seeds.rb 2012-10-03 20:39:35 -03: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ß
a0d60e7333 Remove unused rake tasks, make cumber rake file the vanilla one 2012-09-27 17:07:33 +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