fla
3a1235e2b2
Unify not connected header on desktop and mobile
2015-12-30 00:04:13 +01:00
fla
119ded6fdc
remove landing header on sign in mobile page
2015-12-29 23:55:46 +01:00
fla
96af4a0aec
Add header on not connected pages on mobile version
2015-12-29 23:55:46 +01:00
Jonne Haß
245698865f
Merge branch 'stable' into develop
2015-12-28 18:28:20 +01:00
Steffen van Bergerem
40ff47f84b
Update code of conduct to 1.3.0
...
closes #6602
2015-12-28 18:28:17 +01:00
Jonne Haß
20ba097918
Merge branch 'stable' into develop
2015-12-28 17:31:38 +01:00
Steffen van Bergerem
78df0f5158
Update highlightjs
2015-12-28 17:25:45 +01:00
Steffen van Bergerem
eb3cc24a4a
Merge branch 'stable' into develop
2015-12-28 16:42:43 +01:00
Steffen van Bergerem
4cb2575474
Add media.ccc.de as trusted oEmbed endpoint
2015-12-28 16:42:34 +01:00
Jonne Haß
505071336f
Merge branch 'stable' into develop
2015-12-27 17:51:33 +01:00
Besnik Bleta
680955ad8c
Update for sq translation
2015-12-27 17:49:39 +01:00
Steffen van Bergerem
29a5a35caf
Merge branch 'stable' into develop
2015-12-21 17:32:03 +01:00
Lukas Matt
cf49276aa8
bump jsxc to v0.1.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #6569
2015-12-21 17:29:42 +01:00
Steffen van Bergerem
7f146a8af9
Merge pull request #6570 from Zauberstuhl/bump_jsxc_develop
...
[develop] bump jsxc to v0.1.5.develop
2015-12-20 15:58:13 +01:00
Steffen van Bergerem
f6a409924b
Merge pull request #6567 from AugierLe42e/chat-height-fix
...
[Quickfix] Use BS variable to stick chat to header
2015-12-20 15:54:24 +01:00
Dennis Schubert
86fead30a4
Merge branch 'stable' into develop
2015-12-20 00:47:42 +01:00
Dennis Schubert
c238329cd8
Merge branch 'master' into stable
2015-12-20 00:41:49 +01:00
Dennis Schubert
9cb4b732c6
Merge branch 'hotfix/0.5.5.1'
2015-12-20 00:41:01 +01:00
Dennis Schubert
3028b283e4
Bump nokogiri
2015-12-20 00:27:11 +01:00
Steffen van Bergerem
e20f2ae566
Fix XSS in sharing message
2015-12-20 00:15:32 +01:00
Dennis Schubert
3ac340e03e
Prepeare 0.5.5.1 hotfix
2015-12-20 00:06:19 +01:00
Jonne Haß
179964fd15
Merge branch 'stable' into develop
2015-12-17 01:20:31 +01:00
Steffen van Bergerem
2025fae420
Disable hovercards for logged out users and prevent redirect to sign in page
...
closes #6587
2015-12-17 01:20:24 +01:00
Jonne Haß
13029235d0
Merge branch 'stable' into develop
2015-12-13 12:28:04 +01:00
cmrd Senya
f0fc62e94d
Fix a security issue that author_signature is not checked on the to-downstream receive of a federated relayable entity, allowing to forge relayables if you are an owner of the pod where a parent object is stored.
...
closes #6539
2015-12-13 12:26:59 +01:00
cmrd Senya
922d26f976
Implement integration tests for the federation messages receive feature
...
These are some initial tests, more to come.
It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
2015-12-13 12:24:52 +01:00
cmrd Senya
08b910bd88
bump diaspora_federation
2015-12-13 12:24:52 +01:00
cmrd Senya
4e41b8dc86
Allow Retraction to deal with Relayables
2015-12-13 12:23:51 +01:00
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
Jonne Haß
22711ff7f0
Merge branch 'stable' into develop
2015-12-04 06:55:41 +01:00
Stéphane Guillou
2f4b817c46
Fix missing word in locked account message
...
closes #6577
2015-12-04 06:55:10 +01:00
Lukas Matt
b9729db0d6
bump jsxc to v0.1.5.develop
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-11-30 15:06:15 +01:00
augier
fd468b873a
Use BS variable to stick chat to header
2015-11-28 20:09:13 +01:00
Steffen van Bergerem
75e3085ca9
Merge branch 'stable' into develop
2015-11-27 12:46:46 +01:00
Manoj Mishra
ab21e6b134
Fix: Adding mention through paste user name from clipboard is not successfull
...
Input buffer wasn't getting updated with the user input when user did a
paste from clipboard, it caused search for the available contacts
to not trigger
closes #6510
2015-11-27 12:46:02 +01:00
Jonne Haß
578f196a7b
Merge branch 'stable' into develop
2015-11-24 00:43:37 +01:00
Jonne Haß
91127ce95f
Merge branch 'release/0.5.5.0' into stable
2015-11-24 00:43:22 +01:00
Jonne Haß
e195651592
bump nokogiri
2015-11-24 00:43:12 +01:00
Jonne Haß
086931d745
Merge branch 'stable' into develop
2015-11-23 03:13:13 +01:00
Jonne Haß
29d10a42f8
start 0.5.6.0 cycle
2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7
freeze 0.5.5.0
2015-11-23 03:10:46 +01:00
Jonne Haß
c4b96d97ef
Merge pull request #6560 from svbergerem/update-rails-assets-gems-develop
...
Update autosize
2015-11-22 22:47:00 +01:00
Steffen van Bergerem
92802a7949
Merge pull request #6491 from AugierLe42e/flash-messages-use-BS-variable
...
[Quickfix] Use BS variable $navbar-height for flash messages animation
2015-11-22 18:25:06 +01:00
Steffen van Bergerem
24301084fe
Update autosize
2015-11-22 18:17:38 +01:00
Jonne Haß
d9c4f6fe07
Merge branch 'stable' into develop
2015-11-22 18:02:47 +01:00
Jonne Haß
bbb348ea5b
updated 32 locale files [ci skip]
2015-11-22 16:02:28 +01:00
Jonne Haß
c109a6f6b0
Merge branch 'stable' into develop
2015-11-22 15:50:13 +01:00
Steffen van Bergerem
98eb103446
Update highlight.js
...
closes #6558
2015-11-22 15:47:56 +01:00
Steffen van Bergerem
b8756cb16f
Update markdown-it-sanitizer
2015-11-22 15:44:32 +01:00
