Jonne Haß
f70cefb983
Link user menu button to the users profile
2015-12-30 15:14:29 +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
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
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
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
Jonne Haß
09f4eeac2a
Merge branch 'stable' into develop
2015-10-12 16:12:36 +02:00
Steffen van Bergerem
b68daaece3
Redirect to sign in on 401 ajax response
...
closes #6496
2015-10-12 16:12:30 +02:00
Steffen van Bergerem
b9e6f749e2
Clean up view.js
2015-10-12 11:36:09 +02:00
Steffen van Bergerem
4a55fc5fb6
Clean up view.js
2015-10-11 20:50:22 +02:00
Jonne Haß
77295ffcfb
Merge pull request #6487 from svbergerem/move-reshare-count
...
Move reshare count
2015-10-10 20:51:27 +02:00
Steffen van Bergerem
74a3a9719c
Display reshares under the post
2015-10-10 14:22:59 +02:00
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ß
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
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
Jonne Haß
7b4d7dc737
Merge branch 'stable' into develop
2015-10-06 22:50:42 +02:00
Steffen van Bergerem
25e4d8c365
Fix shortcuts after changing streams
2015-10-06 22:34:36 +02:00
Steffen van Bergerem
e4a850ff9a
Fix console error for map in SPV
2015-10-05 11:38:43 +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
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
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
realtin
6716b4c175
rename location_view to locator
...
because it is confusing with the other location files
2015-09-09 12:25:45 +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
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
Florian Staudacher
738413c65f
fix some issues with pod-checking
...
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
2015-08-30 18:50:34 +02:00
Dennis Schubert
4f2f3cca59
Merge branch 'stable' into develop
2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706
Fix back-to-top backbone view
...
closes #6360
2015-08-29 21:44:24 +02:00
Steffen van Bergerem
696eebbe5d
Add mobile comment box only once
2015-08-29 15:21:44 +02:00
Steffen van Bergerem
cd602c19fd
Fix i18n spec
2015-08-29 14:46:20 +02:00
Steffen van Bergerem
3bc5b673c6
Refactor mobile comment js code and add tests
2015-08-29 14:46:20 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98
Using Blueimp image gallery
2015-08-27 23:50:20 +02:00
Steffen van Bergerem
7e9a88573b
Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu
...
Add 'Toggle mobile' item to menu + minor styling
2015-08-27 22:58:00 +02:00
augier
4364a80330
Keeping badges on the header
2015-08-27 22:00:43 +02:00
Jonne Haß
a30ba5697e
Merge pull request #6290 from Raven24/pod_test
...
test pods for connectivity
2015-08-27 11:38:18 +02:00
Dennis Schubert
6b863defa3
Merge branch 'stable' into develop
2015-08-27 05:25:51 +02:00
Steffen van Bergerem
0df0926739
Convert BackToTop to a backbone view
2015-08-25 04:17:24 +02:00
