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

6269 commits

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ß
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
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ß
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
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
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
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ß
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
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
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
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ß
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
Gonzalo
e1756b5b3f Privatize non-action controller methods 2012-10-14 19:32:53 -02:00
Gonzalo
83809c924a Refactor MessagesController 2012-10-13 17:10:52 -02:00
movilla
ebd1b28b2d Fix problem javascript with read-unread notifications on notifications popup 2012-10-13 15:16:06 +02: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
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
movilla
928a8a02d8 Fix "if display_password_reset_link?" when diaspora.yml => enable_registrations: false 2012-10-10 16:49:45 +02: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
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
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
bf82fc17fe fix oembed onclick behavior + specs 2012-10-03 19:05:17 +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
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
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ß
234b76a936 properly integrate asset_sync 2012-09-26 20:23:45 +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ß
7a478704d5 just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
Jonne Haß
e70e48d6ca some refactoring regarding the law of demeter 2012-09-23 19:33:19 +02:00