Jonne Haß
|
d396d5555f
|
Merge branch 'stable' into develop
|
2015-08-21 14:23:46 +02:00 |
|
Benjamin Neff
|
663835ed3a
|
remove old webfinger/hcard code
closes #6310
|
2015-08-21 14:23:08 +02:00 |
|
Benjamin Neff
|
d28e03f053
|
use discovery from diaspora_federation gem
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
21e5bd8697
|
add save callback for webfinger
|
2015-08-21 14:21:43 +02:00 |
|
Benjamin Neff
|
65b056341c
|
update federation gem
|
2015-08-21 14:21:42 +02:00 |
|
Jonne Haß
|
3de942fd88
|
Merge pull request #6334 from Zauberstuhl/bump_jsxc_develop
bump diaspora_jsxc to v0.1.4-develop
|
2015-08-21 13:24:37 +02:00 |
|
Jonne Haß
|
8e1301c969
|
Merge branch 'stable' into develop
|
2015-08-21 13:24:27 +02:00 |
|
Jonne Haß
|
a7bb6170ab
|
Merge pull request #6333 from Zauberstuhl/bump_jsxc_alpha
Bump jsxc alpha
|
2015-08-21 13:20:23 +02:00 |
|
Lukas Matt
|
bfcb1c3c88
|
bump diaspora_jsxc to v0.1.4-develop
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-21 13:04:38 +02:00 |
|
Lukas Matt
|
afde20f638
|
bump diaspora_jsxc to v0.1.4.alpha
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-21 13:01:32 +02:00 |
|
Lukas Matt
|
dbc57d9371
|
Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-21 12:43:50 +02:00 |
|
Jonne Haß
|
7714b83a72
|
Merge branch 'stable' into develop
|
2015-08-20 00:21:33 +02:00 |
|
Lukas Matt
|
5dd3675258
|
bump diaspora-vines to v0.1.28
closes #6329
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-08-20 00:20:04 +02:00 |
|
Jonne Haß
|
b4923cc17c
|
Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc
bump diaspora_jsxc to v0.1.2
|
2015-08-19 10:18:22 +02:00 |
|
Jonne Haß
|
bd707c0d12
|
Merge pull request #6293 from svbergerem/typeahead
Replace jquery.autocomplete with typeahead.js
|
2015-08-12 15:05:46 +02:00 |
|
Steffen van Bergerem
|
e8acaa08ad
|
Remove browser detection
|
2015-08-10 22:55:05 +02:00 |
|
Steffen van Bergerem
|
8bc86eb98b
|
Replace jquery.autocomplete with typeahead.js
|
2015-08-10 22:55:05 +02:00 |
|
Jonne Haß
|
25be9ecfd2
|
Merge branch 'stable' into develop
|
2015-08-09 18:35:44 +02:00 |
|
theworldbright
|
d7c92431ae
|
Extract service from comments controller
closes #6307
|
2015-08-09 18:35:11 +02:00 |
|
Jonne Haß
|
5cc88b8177
|
Merge pull request #6305 from jaywink/social-relay-trim-whitespace-on-tags
Strip leading/trailing whitespace from pod tags list in social relay well known
|
2015-08-09 10:50:54 +02:00 |
|
Jason Robinson
|
cb909c0d70
|
Strip leading/trailing whitespace from pod tags list in social relay well known
Closes #6303
|
2015-08-09 00:33:35 +03:00 |
|
Jonne Haß
|
480384a077
|
Merge branch 'stable' into develop
|
2015-08-06 22:56:30 +02:00 |
|
Steffen van Bergerem
|
dc576fb0d6
|
Check if person is nil in person_image_tag
closes #6286
|
2015-08-06 22:55:41 +02:00 |
|
Steffen van Bergerem
|
0aa453e437
|
Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile
Use entypo icons on mobile posts
|
2015-08-06 18:00:03 +02:00 |
|
augier
|
f917757b5b
|
Use entypo icons on mobile posts
|
2015-08-06 15:56:58 +02:00 |
|
Steffen van Bergerem
|
633d65fe27
|
Merge branch 'stable' into develop
|
2015-08-06 14:42:28 +02:00 |
|
Anton Tkachov
|
f1d6e9440b
|
Issue #6281: add url to hovercard avatar
closes #6297
|
2015-08-06 14:42:14 +02:00 |
|
Jonne Haß
|
85f9a0eaa9
|
Merge branch 'stable' into develop
|
2015-08-04 10:41:43 +02:00 |
|
Mikica Ivosevic
|
78b0fbbee6
|
Refactor HomeController#toggle_mobile
closes #6260
|
2015-08-04 10:41:21 +02:00 |
|
Jonne Haß
|
ed4b2a2c4b
|
Merge branch 'stable' into develop
|
2015-08-03 03:12:37 +02:00 |
|
Jonne Haß
|
7c611ca509
|
rubocop: skip db/schema.rb [ci skip]
|
2015-08-03 03:11:43 +02:00 |
|
Steffen van Bergerem
|
b9db891fef
|
Merge pull request #6283 from AugierLe42e/clean-images
Suppress useless images
|
2015-08-02 23:26:46 +02:00 |
|
augier
|
5087f47e44
|
Suppress useless images
|
2015-08-02 21:42:09 +02:00 |
|
Jonne Haß
|
b7864a9976
|
Merge branch 'stable' into develop
|
2015-08-02 16:58:07 +02:00 |
|
theworldbright
|
cae5f94af0
|
Refactor status messages controller
closes #6280
|
2015-08-02 16:58:01 +02:00 |
|
Dennis Schubert
|
db9c39b6eb
|
Merge pull request #6277 from svbergerem/use-css-spinner
Use css spinner instead of gif
|
2015-08-01 21:30:14 +02:00 |
|
Jonne Haß
|
22a8997c47
|
Merge branch 'stable' into develop
|
2015-08-01 20:05:29 +02:00 |
|
theworldbright
|
b3242500b0
|
Disable ambiguous regex for step definitions
Signed-off-by: theworldbright <kent@kentshikama.com>
closes #6272
|
2015-08-01 20:05:24 +02:00 |
|
Steffen van Bergerem
|
8e99a240c9
|
Use css spinner instead of gif
|
2015-08-01 13:00:48 +02:00 |
|
Lukas Matt
|
c95164a7e9
|
bump diaspora_jsxc to v0.1.3
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-07-31 00:36:38 +02:00 |
|
Lukas Matt
|
fbc88ab56f
|
Adjusting chat implementation into diaspora container
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-07-30 22:42:33 +02:00 |
|
Lukas Matt
|
524a0bdaf0
|
Obsolete with diaspora/jsxc#113
Using the logout element caused some trouble in the past
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-07-30 22:41:47 +02:00 |
|
Lukas Matt
|
9a96836594
|
Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
|
2015-07-30 22:40:19 +02:00 |
|
Jonne Haß
|
248fa9213b
|
Merge pull request #6274 from svbergerem/mobile-getting-started-input-field
Add Bootstrap classes to mobile getting started input fields
|
2015-07-30 15:39:36 +02:00 |
|
Steffen van Bergerem
|
bc89f73179
|
Add Bootstrap classes to mobile getting started input fields
|
2015-07-30 14:44:14 +02:00 |
|
Jonne Haß
|
2a06d78d12
|
Merge branch 'stable' into develop
|
2015-07-30 12:04:50 +02:00 |
|
theworldbright
|
23bea8e3d3
|
Raise rubocop abc size metric from 15 to 20
closes #6271
|
2015-07-30 12:04:46 +02:00 |
|
Jonne Haß
|
4442616b0d
|
Merge branch 'stable' into develop
|
2015-07-30 12:01:35 +02:00 |
|
Steffen van Bergerem
|
536d1fe0e7
|
Move nsfw-shield to status-message
closes #6270
|
2015-07-30 12:00:48 +02:00 |
|
Jonne Haß
|
cf13672148
|
Stabilize mobile/not_safe_for_work.feature
|
2015-07-30 11:39:40 +02:00 |
|