augier
aefd7273d9
Drop ID
2015-10-10 12:34:59 +02:00
augier
c62927bf00
Use backbone for flash messages
2015-10-10 12:15:41 +02:00
Dennis Schubert
aab21be09d
Merge branch 'stable' into develop
2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62
Fix hovercard view console error
...
closes #6480
2015-10-10 06:45:09 +02:00
Jonne Haß
858bdb0808
Merge branch 'stable' into develop
2015-10-09 23:11:05 +02:00
Steffen van Bergerem
2fc7caf0bd
Fix infinite scroll console error
...
closes #6478
2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5
Fix 'post to single aspect' cukes
2015-10-09 23:10:53 +02:00
Jonne Haß
c27b629515
Merge branch 'stable' into develop
2015-10-09 17:47:39 +02:00
Steffen van Bergerem
f7bd0bbb24
DRY app/router.js
2015-10-09 17:45:51 +02:00
Jonne Haß
202afe0405
Merge branch 'stable' into develop
2015-10-09 11:00:33 +02:00
Steffen van Bergerem
dccad3f7e1
Remove old stream instance when reloading the stream
...
closes #6472
2015-10-09 11:00:27 +02:00
Jonne Haß
c18c1b1d84
Merge branch 'stable' into develop
2015-10-08 14:44:07 +02:00
Steffen van Bergerem
da9cb52007
Scroll to top when reloading the stream
...
closes #6470
2015-10-08 14:44:02 +02:00
Jonne Haß
23099823c1
Merge branch 'stable' into develop
2015-10-08 10:52:25 +02:00
Steffen van Bergerem
0c214cd4ca
Make click on active stream link reload the stream
...
closes #6466
2015-10-08 10:52:18 +02:00
Jonne Haß
92b5ea29ed
Merge branch 'stable' into develop
2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1
Add public stream
...
closes #6465
2015-10-07 22:29:39 +02:00
Steffen van Bergerem
c663d9d55e
Merge branch 'stable' into develop
2015-10-07 22:00:52 +02:00
Faldrian
058bcb43f8
Added avatar image fallback for notifications
...
closes #6463
2015-10-07 21:58:56 +02:00
Steffen van Bergerem
fc9d7396cc
Merge branch 'stable' into develop
2015-10-07 21:38:26 +02:00
Faldrian
d486e37487
following tags now normalized and sorted in ui
...
closes #6454
2015-10-07 21:38:12 +02:00
Steffen van Bergerem
64773d883e
Add permalink for stream elements
2015-10-06 23:29:09 +02:00
Jonne Haß
7b4d7dc737
Merge branch 'stable' into develop
2015-10-06 22:50:42 +02:00
Steffen van Bergerem
517cd56f21
Don't reload stream pages
...
closes #6462
2015-10-06 22:46:58 +02:00
Steffen van Bergerem
25e4d8c365
Fix shortcuts after changing streams
2015-10-06 22:34:36 +02:00
Steffen van Bergerem
b59c99807b
Move settings.scss
2015-10-05 16:12:40 +02:00
Steffen van Bergerem
e4a850ff9a
Fix console error for map in SPV
2015-10-05 11:38:43 +02:00
Steffen van Bergerem
7c777ca904
Merge branch 'stable' into develop
2015-10-02 23:42:36 +02:00
augier
22882aa24d
Infinite scroll triggered relative to last element top rather than window bottom
...
closes #6451
2015-10-02 23:42:26 +02:00
Steffen van Bergerem
a5ca78bc87
Fix post preview with location
2015-09-27 03:03:28 +02:00
Steffen van Bergerem
9d6ce5b110
Merge pull request #6336 from AugierLe42e/clean-publisher
...
Cleaning publisher
2015-09-26 00:49:34 +02:00
augier
c3ddd4c086
Cleaning publisher a bit + responsive styling
2015-09-24 08:54:19 +02:00
Steffen van Bergerem
b40d5362cf
Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
...
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
augier
f00f3965ff
Styling main stream
2015-09-18 19:13:49 +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
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
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
