Commit graph

16746 commits

Author SHA1 Message Date
Jonne Haß
6407b446fc Merge branch 'stable' into develop 2015-09-13 12:35:56 +02:00
Jonne Haß
f7a883917c Merge branch 'master' into stable 2015-09-13 12:35:46 +02:00
Jonne Haß
04b3531cd0 bump to 0.5.3.1 2015-09-13 12:33:44 +02:00
Jonne Haß
0f1295718f Merge branch 'stable' into develop 2015-09-13 12:25:18 +02:00
Jonne Haß
6fb5e88ead Merge branch 'master' into stable 2015-09-13 12:23:41 +02:00
Steffen van Bergerem
ebad0961a9 Show private profile info if contact is sharing 2015-09-13 12:16:25 +02:00
Jonne Haß
9dc76fc3f4 Merge pull request #6397 from svbergerem/fix-mobile-comments
Fix adding the first comment in the mobile view
2015-09-12 16:17:12 +02:00
Steffen van Bergerem
953b03d086 Fix adding the first comment in the mobile view 2015-09-12 14:52:18 +02:00
Steffen van Bergerem
441656b480 Display headline and new conversation button in same line for mobile conversations 2015-09-12 12:23:37 +02:00
Steffen van Bergerem
7bcccde9f4 Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design
[Quickfix] Improve mobile conversations design
2015-09-12 12:20:59 +02:00
augier
44d71c3905 Improve mobile conversations design 2015-09-11 23:17:02 +02:00
realtin
1cdcc50c63 fix all the pronto remarks finally
- fix map controls in stream
2015-09-11 10:24:39 +02:00
Steffen van Bergerem
fdbb32ff96 Use white entypo icons for active list-group items in notifications 2015-09-11 07:48:20 +02:00
realtin
52fac5740e fix indentation & jshint predefines
according to svbergerem's annotations
2015-09-10 14:48:25 +02:00
zaziemo
263dc6f119 refactor code that choses the tile server based on podmin's choice
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
2015-09-09 12:26:47 +02:00
zaziemo
e5cc8dff0e outsource map credentials
and allow podmin to enable and disable the feature
(#5813)
2015-09-09 12:25:45 +02:00
realtin
6716b4c175 rename location_view to locator
because it is confusing with the other location files
2015-09-09 12:25:45 +02:00
zaziemo
dc25c01bcd add a different map representation to the SPV
so a small map is rendered in the SPV and a location is provided
via toggling the map gets bigger

(#5813)
2015-09-09 12:25:19 +02:00
Julia
c0f909d228 add map to header
and add toggle map function
to show and load map only when user is clicking on address

(#5813)
2015-09-09 12:23:38 +02:00
zaziemo
f92a2ee0dd merge address & coordinates in one location object
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813)
2015-09-09 12:22:48 +02:00
zaziemo
298e195a8f add a map subview
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813)
2015-09-09 12:19:38 +02:00
Jonne Haß
f9a452265d Merge branch 'stable' into develop 2015-09-07 13:35:56 +02:00
Lukas Matt
e57bdeed19 Set onlineHelp link in jsxc options
related to diaspora/jsxc#125

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6388
2015-09-07 13:35:51 +02:00
Lukas Matt
a40a34ee8c autoLang default value is true
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-07 13:35:49 +02:00
Jonne Haß
6528f1479c Merge branch 'stable' into develop 2015-09-07 13:32:19 +02:00
Jonne Haß
0dd5447e63 Fix tumblr service deletion spec to actually test deletion 2015-09-07 13:31:45 +02:00
Jonne Haß
ba61ca4bdf Merge branch 'stable' into develop 2015-09-07 13:25:14 +02:00
Jonne Haß
0e64d8de2a Refactor tumblr service spec
closes #6386
2015-09-07 13:24:53 +02:00
Vinothan Shankar
2ace9b47b1 * app/models/services/tumblr.rb (Services::Tumblr#post): Post only to primary blog
Hardly a total fix, but it's a start.  Based on meitar/diaspora:b5c01598.

* app/models/services/tumblr.rb: style: double-quote string

Line 22.  Change from single-quotes.

* app/models/services/tumblr.rb: parse URL only for blogs we care about

...which in this case is just the primary.

This also fixes the failed test in 7079fda (and by extension, 7a1d3a9).

* spec/models/services/tumblr_spec.rb: Add "primary" flag to test user-info

* spec/models/services/tumblr_spec.rb: Add a secondary blog to test user-info

This should not cause a request to be issued, so we can continue to
expect the request for the primary blog only.  Any request for the
secondary indicates a bug in the service implementation.

* spec/models/services/tumblr_spec.rb: Make the second blog returned the primary

Just to catch if it's picking the first one

* app/models/services/tumblr.rb: use blogs.find instead of blogs.each

Since we're only handling the primary blog, this should be easy enough

* app/models/services/tumblr.rb: Remove redundant if block

The condition it would have caught is dealt with by the ifnone on the find

* app/models/services/tumblr.rb: Style: remove space between { and |
2015-09-07 12:45:16 +02:00
Jonne Haß
176b32c815 Merge branch 'stable' into develop 2015-09-07 12:41:36 +02:00
zaziemo
d38741d5eb add more specs to test moderator role
fixes #5324

closes #6351
2015-09-07 12:38:12 +02:00
zaziemo
c2c6ed5dea refactor moderator role and add specs
#5324
2015-09-07 12:32:09 +02:00
realtin
15b186518c add moderators to report email recievers
and refactor coding style according to pull request comments

(#5324)
2015-09-07 12:31:25 +02:00
realtin
098c30c2b7 adapt report spec for the moderator 2015-09-07 12:29:46 +02:00
realtin
0b420d0308 adapt templates to allow moderator to view reports
(#5324)
2015-09-07 12:29:46 +02:00
zaziemo
b2dc77e1e6 change method name for a better understanding of what the befor_filter does
and correct test syntax
#5324
2015-09-07 12:24:12 +02:00
realtin
bc75371b7a report controller renders index for the moderator
(#5324)
2015-09-07 12:24:12 +02:00
zaziemo
3a3c881735 add new role moderator analogue to admin role
#5324
2015-09-07 12:24:12 +02:00
Dennis Schubert
908f63fae9 Merge branch 'stable' into develop 2015-09-07 04:23:33 +02:00
Dennis Schubert
81084cde46 Merge branch 'master' into stable 2015-09-07 04:23:23 +02:00
Dennis Schubert
782c1ef6ee Merge branch 'release/0.5.3.0' 2015-09-07 04:22:47 +02:00
Jonne Haß
6fb6b8dc8a Merge branch 'stable' into develop 2015-09-06 13:56:25 +02:00
Jonne Haß
c0da031e33 Merge branch 'release/0.5.3.0' into stable 2015-09-06 13:56:10 +02:00
Jonne Haß
f855fb9718 updated 60 locale files [ci skip] 2015-09-06 13:53:41 +02:00
Steffen van Bergerem
426f55e685 Merge branch 'stable' into develop 2015-09-05 16:12:00 +02:00
sjain1107
928576bc88 6306-add-spinner-on-initial-stream-load
closes #6384
2015-09-05 16:11:09 +02:00
Jonne Haß
ac6e9fd7c7 Merge branch 'stable' into develop 2015-09-03 21:39:24 +02:00
Jonne Haß
ca5fa14376 Merge branch 'release/0.5.3.0' into stable 2015-09-03 21:39:13 +02:00