theworldbright
efdfe318fd
Add ability to get user info from access tokens
2016-01-04 16:48:42 +09:00
Augier
a1f3d5f5f9
Getting token from user credential flow
2016-01-04 16:45:21 +09:00
augier
8d8faf684c
OpenID Connect debut work
2016-01-04 16:45:21 +09:00
Steffen van Bergerem
99289491ef
Merge pull request #6607 from jhass/link_profile_in_user_menu
...
Link user menu button to the users profile
2015-12-30 18:37:16 +01:00
Jonne Haß
f70cefb983
Link user menu button to the users profile
2015-12-30 15:14:29 +01:00
Dennis Schubert
d4fbbd86b3
Merge branch 'stable' into develop
2015-12-30 14:51:05 +01:00
Benjamin Neff
082e300a40
remove PublicsController completely
2015-12-30 14:50:34 +01:00
Benjamin Neff
5c8f0c1671
create queue callbacks and remove receive routes
2015-12-30 14:50:34 +01:00
Benjamin Neff
24f5244f76
move glue code back to the initializer
2015-12-30 14:48:38 +01:00
Thor77
056b00fff4
fix flash mesage clickthrough on profile-page
2015-12-29 18:32:13 +01:00
Jonne Haß
434deaa75a
Merge branch 'stable' into develop
2015-12-29 13:07:08 +01:00
Steffen van Bergerem
f3e897ab43
Activate hovercards for logged out users
...
closes #6603
2015-12-29 13:07: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
Steffen van Bergerem
e20f2ae566
Fix XSS in sharing message
2015-12-20 00:15:32 +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
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
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
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
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
3cf2e90e5c
Merge pull request #6536 from AugierLe42e/close-gallery-outside-click
...
Close gallery on outside click
2015-11-22 14:10:34 +01:00
Dennis Schubert
5081d69847
Merge branch 'stable' into develop
2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd
Add participation to root.author on receiving reshare
...
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.
closes #6481
2015-11-22 02:50:38 +01:00
Jonne Haß
17d0ddab41
Merge branch 'stable' into develop
2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506
Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
...
closes #6552
2015-11-18 03:16:54 +01:00
Steffen van Bergerem
09a26fbf57
Merge pull request #6448 from AugierLe42e/replace-entypo-mail
...
[Quickfix] Use entypo-mail on mobile view
2015-11-16 01:41:50 +01:00
augier
02e82029c3
Use entypo-mail on mobile view
2015-11-15 14:11:29 +01:00
Jonne Haß
c6939361ee
Revert "Revert "Force flash message width to 80% of screen on small devices""
...
This reverts commit 53a7d36e44
2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73
Merge branch 'stable' into develop
2015-11-13 16:03:44 +01:00
Jonne Haß
53a7d36e44
Revert "Force flash message width to 80% of screen on small devices"
...
This reverts commit e731bb86c5
2015-11-13 15:59:18 +01:00
Jonne Haß
5de0655e54
Merge branch 'stable' into develop
2015-11-13 14:31:10 +01:00
Augier
e731bb86c5
Force flash message width to 80% of screen on small devices
...
closes #6529
2015-11-13 14:31:06 +01:00
Manuel Vögele
1680c0c924
Do not disable submit button if comment is empty in mobile view
...
Fixes #5485
2015-11-13 02:46:22 +01:00
augier
49836e267b
Close gallery on outside click
2015-11-07 18:19:58 +01:00
Jonne Haß
7fca5cf93a
Merge branch 'stable' into develop
2015-11-04 22:10:07 +01:00
theworldbright
a054a35863
Catch Diaspora::NotMine on post controller
...
closes #6533
2015-11-04 22:10:00 +01:00
augier
d6391afb36
Use BS variable -height for flash messages animation
2015-10-30 12:40:45 +01:00
Steffen van Bergerem
3c43819bce
Merge pull request #6504 from sarithats/fix/login_button
...
Change login button color
2015-10-21 08:16:54 +02:00
Dennis Schubert
1338725308
Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts
...
Add invite links when no contacts
2015-10-21 01:20:59 +02:00
Jonne Haß
800be9b2cf
Merge branch 'stable' into develop
2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8
Disable self-notification possibility
...
closes #6512
2015-10-20 16:27:39 +02:00
Saritha
7b08cdd488
Change button color to blue
...
Fix #6449
Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
2015-10-20 12:53:59 +05:30
Dennis Schubert
00ebe4963e
Merge branch 'stable' into develop
2015-10-19 18:50:36 -07:00
