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

15358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonne Haß
10f3a071c5 Merge pull request #5420 from diaspora/update_gems 
Update gems

Conflicts:
	Gemfile.lock
 2014-11-24 23:02:50 +01:00
Jonne Haß
49dfc27011 Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process 
Optimize jsxc login process and bump jsxc version
 2014-11-24 23:01:03 +01:00
Lukas Matt
77ce94db40 bump jsxc to version 0.0.8 2014-11-24 19:12:05 +01:00
Steffen van Bergerem
77b627dbe9 Merge pull request #5419 from SansPseudoFix/add-handle-search-terms 
Add handle search terms
 2014-11-24 18:09:02 +01:00
Lukas Matt
ef29de8176 Configure form element and move xmpp config 2014-11-24 17:19:57 +01:00
Lukas Matt
0d4da2fba8 Login function deprecated 
related to diaspora/jsxc#50
 2014-11-24 17:19:30 +01:00
Lukas Matt
44bc48ad5e Remove debug output on default 2014-11-24 17:19:09 +01:00
Jonne Haß
c305293314 bump mini_magick 2014-11-24 16:51:45 +01:00
Jonne Haß
5622f72420 bump jasmine 2014-11-24 16:44:39 +01:00
Jonne Haß
c2e355fce9 bump guard 2014-11-24 16:43:00 +01:00
Jonne Haß
64b9a4769b bump fog 2014-11-24 16:38:38 +01:00
Jonne Haß
3d757abf6d bump mysql2 2014-11-24 16:34:37 +01:00
Jonne Haß
dca06ae075 bump sidekiq 2014-11-24 16:31:22 +01:00
Jonne Haß
e4f68acf0a bump rails 2014-11-24 16:29:41 +01:00
SansPseudoFix
322ca4dac0 display handle for search bar 
fix margin and color

hidden overflow for long handle and names

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss

add min width 300px

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss
 2014-11-24 13:17:57 +01:00
Steffen van Bergerem
8cb6e242bf Fix character count placement for publisher 2014-11-23 18:36:05 +01:00
Jonne Haß
914b1c5374 Merge pull request #5414 from jaywink/downgrade-simple-oauth 
Revert "bump simple_oauth"
 2014-11-22 23:02:09 +01:00
Jason Robinson
76c74cd154 Revert "bump simple_oauth" 
This reverts commit 13cb07fed7.

Fixes simple_oauth regression that breaks Twitter posting, see issue #5411
 2014-11-22 23:57:11 +02:00
Steffen van Bergerem
55b60f7bde Remove unused files in lib 2014-11-22 21:21:38 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
6a034f172b Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint 
fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error
 2014-11-22 19:00:55 +01:00
Jonne Haß
32c5508f3d Merge pull request #5408 from Zauberstuhl/show_roster_minimized 
Display chat box minimized on default
 2014-11-22 18:58:16 +01:00
Jonne Haß
9b49df80a5 Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster 
Chat: add extra padding for the roster
 2014-11-22 18:57:51 +01:00
Steffen van Bergerem
8f956383bd Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden 
Issue #5251: fix hidden overflow
 2014-11-22 16:38:16 +01:00
SansPseudoFix
66b76024ed Issue #5251: fix hidden overflow 
modified:   app/assets/stylesheets/getting-started.css.scss

	modified:   app/assets/stylesheets/getting-started.css.scss
 2014-11-22 15:01:20 +01:00
Steffen van Bergerem
472d65cb61 Chat: add extra padding for the roster 2014-11-21 23:29:06 +01:00
Lukas Matt
5fee67e5e7 Display chat box minimized on default 
Currently it slides in if you login. with time it is annoying
 2014-11-21 21:56:27 +01:00
Jonne Haß
827b68fe63 Improve wording on mail configuration section [ci skip] 2014-11-20 20:19:56 +01:00
Jonne Haß
1311286771 Merge pull request #5404 from pravi/remove-graphics-exec-permissions 
remove execution permissions from images and css
 2014-11-20 19:47:06 +01:00
Praveen Arimbrathodiyil
6378af5417 remove execution permissions from images and css 2014-11-20 23:38:36 +05:30
Jonne Haß
91c734e4fc Avoid mixed content warning through oEmbed content 
- Switch dailymotion oEmbed endpoint to https
- Accept Mixcloud https URLs
- Accept dailymotion https URLs
 2014-11-19 15:48:12 +01:00
Jonne Haß
2b41316693 Merge pull request #5393 from pravi/patch-1 
bump sidekiq to 3.2.6
 2014-11-17 13:03:43 +01:00
Praveen Arimbrathodiyil
91c7020003 bump sidekiq to 3.2.6 
From upstream changelog,

    Deprecate delay extension for ActionMailer 4.2+ . [seuros, #1933]
    Poll interval tuning now accounts for dead processes [epchris, #1984]
    Add non-production environment to Web UI page titles [JacobEvelyn, #2004]

Debian already have 3.2.6 and I'd like to keep both versions in sync.
 2014-11-17 15:40:02 +05:30
Faldrian
328a515dbe fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error 2014-11-16 18:19:32 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Jonne Haß
7f51d8710e Merge pull request #5073 from Zauberstuhl/xmpp_chat_feature 
[Feature] XMPP javascript client plus ruby (vines) server
 2014-11-15 17:02:20 +01:00
Lukas Matt
e40cf25177 Swap aspect chat privilege title 2014-11-13 14:38:23 +01:00
Lukas Matt
2712b413c3 Fixed privilege spec; use correct container for trigger event 2014-11-13 12:28:45 +01:00
Lukas Matt
bb18c8e028 Test chat privilege option; should replace text/icon on trigger 2014-11-13 11:49:03 +01:00
Lukas Matt
32dcf8cabb Test jsxc helper spec; should respond with correct url 2014-11-13 11:43:56 +01:00
Lukas Matt
46097ba8c8 Test token authentication; should allow it 2014-11-13 11:42:24 +01:00
Lukas Matt
0308b70287 Print a warning unless they use a proxy 
If you try to connect from a secure connection
to a insecure connection; Most modern browser
block the request and flag it as mixed-content.
 2014-11-13 11:41:13 +01:00
Lukas Matt
9f827b9309 Start vines if chat and server is enabled 2014-11-13 11:38:34 +01:00
Lukas Matt
095608827e Add vines as foreman task 2014-11-13 11:36:55 +01:00
Lukas Matt
c7d9d8804d Update .gitignore for vines cert directory 2014-11-13 11:34:59 +01:00
Lukas Matt
ea11133084 Include the chat front-end if chat is enabled 
* add jsxc helper file
 2014-11-13 11:34:21 +01:00
Lukas Matt
556190b154 Add locales for chat privilege function 2014-11-13 11:32:34 +01:00
Lukas Matt
b54fb649b0 Add vines README file for cert instructions 2014-11-13 11:31:55 +01:00
Lukas Matt
94318ca27a Modify diaspora config file and add defaults 2014-11-13 11:31:12 +01:00