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

12587 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
b6d7bf81f7 do not start a worker by default [ci skip] 2012-10-17 19:59:03 +02:00
Maxwell Salzberg
fd63cb78c8 the default worker entry in the procfile will not actually run a worker 2012-10-17 10:55:18 -07:00
Jonne Haß
107b7b1cba let closelabel.png and loading.gif respect the asset host 2012-10-16 16:56:08 +02:00
Gonzalo
7e0c8bdf68 Remove unreachable line of code 2012-10-15 20:25:10 -02:00
Jonne Haß
6d2c43869a Merge pull request #3660 from diaspora/privatize_some_controller_methods 
Privatize some controller methods
 2012-10-14 15:20:32 -07:00
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
78953fe2bf Move ApplicationController specs to application_controllers_spec 2012-10-14 19:32:53 -02:00
Jonne Haß
92e4cd34ae --amend cause I've no time 2012-10-14 01:11:53 +02:00
Jonne Haß
894af48579 add spec to ensure include_community_spotlight? is correctly passed into EvilQuery::MultiStream.new 2012-10-14 01:09:00 +02:00
Sean Tilley
0fedca33e3 Merge pull request #3658 from movilla/community_spo 
Fix show post Community Spotlight on stream [ci skip]
 2012-10-13 15:37:06 -07:00
movilla
f6f5a62f69 Fix show post Community Spotlight on stream 2012-10-14 00:01:46 +02:00
Jonne Haß
f594471c99 Merge pull request #3657 from diaspora/messages_controller_refactor 
Refactor MessagesController
 2012-10-13 13:19:31 -07:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
Jonne Haß
811ef66b1c No need for Gentoo having its own certificate_authorities example 2012-10-13 18:53:42 +03:00
Florian Staudacher
5994180900 Merge branch 'popup_notifications' of git://github.com/movilla/diaspora into notification-popup 
merge pull request #3656

Conflicts:
	Changelog.md (resolved)
 2012-10-13 16:18:09 +02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02:00
Jonne Haß
e3594d58d4 make Changelog an unorderdd list for now, we need to work out a consistent style for that [ci skip] 2012-10-13 13:56:23 +02:00
Jonne Haß
83c2458de8 Merge pull request #3647 from marpo60/3636-adds-password-confirmation-field 
adds password_confirmation field to registration page
 2012-10-13 04:48:33 -07:00
Fabián Rodríguez
0b21153dbd update changelog 2012-10-11 19:49:00 -02:00
Fabián Rodríguez
82082005ba redirect users back on registration failure 2012-10-11 19:47:04 -02:00
Fabián Rodríguez
40f5314184 adds password_confirmation field to registration page 2012-10-11 19:45:52 -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