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

12629 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabián Rodríguez
1d1b66f8cc remove unused helper 2012-11-06 21:39:35 -02:00
Fabián Rodríguez
aa8b37f2be remove app/views/requests/ 2012-11-06 21:39:35 -02:00
Fabián Rodríguez
5d169a3d73 remove app/views/shared/mail_signup_form 2012-11-06 21:39:35 -02:00
Fabián Rodríguez
f22ec35989 remove app/views/shared/author_info 2012-11-06 21:39:35 -02:00
Jonne Haß
051adfde45 Merge pull request #3709 from denschub/feature/3472-session-remember 
Make Devise remember the session for 2 weeks
 2012-11-06 13:59:01 -08:00
Dennis Schubert
ba5b779cd0 Make Devise remember the session for 2 weeks. Fix #3472 2012-11-06 22:24:57 +01:00
Besnik
1d3493909d updating sq locale 2012-11-06 19:46:51 +01:00
Jonne Haß
a78cacb799 Merge pull request #3687 from movilla/add_icon_mobile_my_activity 
Add My Activity icon mobile. Close #3680
 2012-11-06 09:02:46 -08:00
Jonne Haß
cc7f5d9626 Merge pull request #3708 from movilla/invitacion_search 
Fix Invite link box shows on search results page even if invites have been turden off - Fix #3707
 2012-11-06 08:58:24 -08:00
movilla
f3ce1e6c66 Fix Invite link box shows on search results page even if invites have been turned off 2012-11-06 15:56:53 +01:00
Jonne Haß
e75aa111e3 use foremans formation option and not the alias concurrency, start unicorn_rails instead of unicorn 2012-11-04 17:05:16 +01:00
Jonne Haß
f506c9c71e Merge pull request #3702 from jaywink/feature/twitter-posting-fixes 
Only include url to post for twitter when post exceeds maximum length or contains photos
 2012-11-03 14:45:03 -07:00
Jason Robinson
7fafabdb60 Only include url to post for twitter when post exceeds maximum length or contains photos 2012-11-03 23:25:19 +02:00
Jonne Haß
675bf614ae Merge pull request #3670 from MrZYX/feature/fix_services 
update and fix services
 2012-11-02 03:53:35 -07:00
Jonne Haß
2a45470232 Merge branch 'feature/fix-facebook-public-posts' of git://github.com/jaywink/diaspora into feature/fix_services 
Conflicts:
	Changelog.md
	app/models/services/facebook.rb
	spec/models/services/facebook_spec.rb
 2012-11-02 11:31:47 +01:00
Jason Robinson
e974d2934f Always use basic Facebook Graph API to post messages, fixes public posts. Remove unnecessary Facebook opengraph config items 2012-11-02 00:23:33 +02:00
Jonne Haß
3aef807f78 Merge pull request #3693 from jaywink/feature/3283-empty-page-after-service-callback 
Fix empty page after callback from service by redirecting to origin
 2012-11-01 13:33:27 -07:00
Jason Robinson
b96fbb0676 Fix empty page after callback from service by redirecting to origin. Also make settings/services page use the same window when authenticating with other services instead of launching a popup. 2012-11-01 21:50:31 +02:00
Jonne Haß
441c937ba6 Merge pull request #3697 from movilla/overflow_input 
Fix overflow button in mobile reset password
 2012-10-31 15:39:36 -07:00
movilla
86ca3a36fb Add Changelog 2012-10-31 23:36:25 +01:00
movilla
e943a1cab6 Fix overflow button in mobile reset password 2012-10-31 23:31:24 +01:00
movilla
880b16f530 Add My Activity icon mobile 2012-10-29 12:14:19 +01:00
Jonne Haß
f91ca7d650 added short description to the server section [ci skip] 2012-10-27 11:45:26 +02:00
movilla
c9b58c9ff6 Add My Activity icon mobile 2012-10-26 22:47:43 +02:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
6302181582 do not define rspec task if rspec is unavailable 2012-10-24 21:49:48 +02:00
Jonne Haß
1a93ccd548 don't error out if the root of a reshare of a reshare got deleted, fixes #3546 2012-10-24 19:51:31 +02:00
Jonne Haß
6ba10a4a7f Merge pull request #3675 from denschub/feature/fix-followhq-setting 
Change 'unless' to 'if' again because 'unless' is wrong here.
 2012-10-23 15:33:02 -07:00
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