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

13602 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Schubert
5ea998a382 Change 'unless' to 'if' again because 'unless' is wrong here. 
Also, add some specs and add it to the changelog.
 2012-10-24 00:27:45 +02:00
Jonne Haß
4b5b7fc77f Revert "Merge pull request #3655 from denschub/feature/fix-followhq-setting" 
This reverts commit b0fc95764d, reversing
changes made to 0057e9ed46.
 2012-10-21 22:12:36 +02:00
Sean Tilley
b0fc95764d Merge pull request #3655 from denschub/feature/fix-followhq-setting 
Change 'unless' to 'if' because 'unless' is wrong here. [ci skip]
 2012-10-21 12:55:01 -07:00
Florian Staudacher
0057e9ed46 some small code style changes + final fix for postgres (milliseconds) 
+ updated changelog
 2012-10-21 16:10:27 +02:00
Ruxton
25b57cdd2a trying to stabilize issue with datetime in test suite 2012-10-21 16:08:57 +02:00
Ruxton
a78cb352e6 updated spec to fix to_datetime issue 
Conflicts:
	spec/lib/diaspora/fetcher/public_spec.rb
 2012-10-21 16:08:57 +02:00
Florian Staudacher
f0eacc801b Merge pull request #3611 from MrZYX/feature/cleanup_rake_tasks 
rake tasks cleanup
 2012-10-21 06:33:46 -07:00
Jonne Haß
02b18a9460 Merge pull request #3659 from MrZYX/feature/startup_methods 
Refactor script/server and associated stuff
 2012-10-19 17:50:53 -07:00
Sean Tilley
4b372cfca9 Merge pull request #3669 from DeadSuperHero/feature/remove-alpha-logo 
Remove Alpha logo from branding [ci skip]
 2012-10-19 11:49:38 -07:00
Sean Tilley
e2a2767a74 remove alpha from branding 2012-10-19 13:47:27 -05:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Florian Staudacher
2694c930a5 Merge pull request #3645 from Raven24/fix-link-regex 
simplify link regex and fix #3553
 2012-10-19 02:24:24 -07: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
Dennis Schubert
7dc629179b Change 'unless' to 'if' because 'unless' is wrong here. 2012-10-12 00:59:42 +02: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
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ß
b3654cfc9e Merge branch 'hotfix/0.0.1.1' 2012-10-09 22:36:51 +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