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
Lukas Matt
735b10cc63
Chat privilege checkbox
...
* add to contacts header for later modification
* add to aspect creation box
2014-11-13 11:30:12 +01:00
Lukas Matt
24e1732256
Implement token authentication
...
* create a new token on a new session
* delete the current token on session exit
2014-11-13 11:27:56 +01:00
Lukas Matt
ae582e4543
Add toggle_chat_privilege to aspect controller
2014-11-13 11:24:07 +01:00
Lukas Matt
4d14e7d3ba
Add jsxc to assets list
2014-11-13 11:22:22 +01:00
Lukas Matt
38a238eb36
Set chat-flag for every aspect manually
...
On default none is permitted to chat with you.
You have to set extra privilege for an aspect.
2014-11-13 11:21:21 +01:00
Lukas Matt
50a7541d14
Include jsxc deps and initialize the client on login
2014-11-13 11:17:19 +01:00
Lukas Matt
78100c6fb2
Add vines, jsxc and devise token dependencies
2014-11-13 11:15:30 +01:00
Lukas Matt
56e882879a
Add chat migration
...
* add chat_contacts table
* add chat_fragments table
* add chat_enabled column to aspects
* add chat_offline_messages table
2014-11-13 11:14:54 +01:00
Jonne Haß
b4a24bd49e
Drop no longer needed and too open crossdomain.xml
...
It allowed Flash apps on any domain to make requests on
behalf of a signed in user.
Thanks to Oliver Beg for the hint.
2014-11-11 14:25:10 +01:00
Dennis Schubert
aec00f834f
Add Camo for <img>-tags inside Markdown contents
2014-11-10 02:19:45 +01:00
Jonne Haß
e68704890e
make sure to import perfect scrollbar plugin before our own mixins
...
otherwise it overrides the border-radius mixin with an incompatible one
2014-11-09 20:31:24 +01:00
Jonne Haß
e0a2c6438a
lock down guard until all plugins updated
2014-11-09 20:18:14 +01:00
Jonne Haß
4be6dc208f
update maintenance mailer spec for new mail text
2014-11-09 19:47:37 +01:00
Jonne Haß
a6701e9172
bump ruby-progressbar
2014-11-09 19:38:15 +01:00
Jonne Haß
aeb049996e
bump mail
2014-11-09 19:37:57 +01:00
Jonne Haß
496eb2afe6
bump jquery-ui-rails
2014-11-09 19:37:42 +01:00
Jonne Haß
cd937bfb69
bump execjs
2014-11-09 19:37:20 +01:00
Jonne Haß
69f58e9c06
bump fog
2014-11-09 19:36:48 +01:00
Jonne Haß
e965db534f
bump webmock
2014-11-09 19:35:18 +01:00
Jonne Haß
62a7b130a2
bump twitter-text
2014-11-09 19:34:19 +01:00
Jonne Haß
791feab474
bump test_after_commit
2014-11-09 19:33:49 +01:00
