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
JesseWeinstein
fb51e9aa43
Only include the quote markdown if needed
...
Intentionally do a converting-comparison against the empty string, to see if text is selected.
2014-11-10 23:41:34 -08:00
JesseWeinstein
ea33ef9e0b
Add Markdown to generated post
...
Switch to using content parameter, which doesn't alter its value, unlike the other ones.
Use a H2 header for the document.title, quote the selected text, and put the URL at the bottom, in a separate paragraph.
2014-11-10 23:24:23 -08:00
JesseWeinstein
9585a1877b
Split bookmarklet_url literal string into lines
...
To improve the readabilit of diffs that modify it, per https://github.com/diaspora/diaspora/pull/5384#issuecomment-62443426
2014-11-10 23:16:31 -08: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
Jonne Haß
7fc022a9b9
bump selenium-webdriver
2014-11-09 19:33:26 +01:00
Jonne Haß
fceba693f6
bump ruby-oembed
2014-11-09 19:33:04 +01:00
Jonne Haß
0a33a5f95a
bump rails-assets-punycode
2014-11-09 19:32:39 +01:00
Jonne Haß
abe0629c02
bump rails-assets-perfect-scrollbar
2014-11-09 19:31:26 +01:00
Jonne Haß
9d967e9585
bump nokogiri
2014-11-09 19:30:52 +01:00
Jonne Haß
96c7624d82
bump guard-cucumber
2014-11-09 19:26:47 +01:00
Jonne Haß
a050d1bbba
bump gon
2014-11-09 19:26:03 +01:00
Jonne Haß
0bd6ecd666
bump factory_girl_rails
2014-11-09 19:25:14 +01:00
Jonne Haß
f42d519e51
bump devise
2014-11-09 19:24:23 +01:00
Jonne Haß
f890121b8f
bump sass-rails
2014-11-09 19:23:21 +01:00
Jonne Haß
30de98cf3e
Merge pull request #5335 from svbergerem/paginate-contacts
...
Paginate contacts
2014-11-09 19:04:07 +01:00
Jonne Haß
7e46502bf9
Merge pull request #5353 from goobertron/ac_removal_mail
...
Reword account removal email notification
2014-11-09 18:58:19 +01:00
Jonne Haß
404a286588
Merge pull request #5355 from Chocobozzz/header-logo-hover
...
Replace the black header logo with the white logo on hover
2014-11-09 18:55:59 +01:00
Jonne Haß
c7c57d40f5
Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix
...
Feature/3098 publisher imageupload layouterror fix
2014-11-09 18:52:13 +01:00
Jonne Haß
a3a8a22844
Merge pull request #5386 from denschub/camo
...
Add Camo support
2014-11-09 18:48:39 +01:00
Dennis Schubert
4c98445f1c
Fix presenters instead of modifying the getters
2014-11-09 07:47:40 -08:00
Dennis Schubert
6808150920
Method calling convention and doc improvements
...
... and a stealth-commit of an already introduced bug prevention system.
;)
2014-11-09 07:20:30 -08:00
Dennis Schubert
fd63fca7d5
Add Camo to MessageRenderer#markdownified
...
for mobile views
2014-11-09 07:29:36 +01:00
Dennis Schubert
df4063fd45
Documentation improvements and changelog entry
...
I just assume camo is cool enough to get an own section.
2014-11-09 06:51:17 +01:00
Dennis Schubert
a4a63c4c85
A little bit of cleanup
2014-11-09 02:27:17 +01:00
Dennis Schubert
5bcd5087bf
Add Camo for remote images
2014-11-09 02:17:43 +01:00
Dennis Schubert
5c9cc49363
Only RegEx if there is something to RegEx
2014-11-09 02:16:28 +01:00
Dennis Schubert
db2560d7fc
Add Camo for OpenGraph images
2014-11-09 01:36:16 +01:00
