Commit graph

865 commits

Author SHA1 Message Date
Steffen van Bergerem
eae9e01f14
Add 'no posts yet' message to empty streams 2016-08-12 12:55:06 +02:00
Steffen van Bergerem
d9746a8461
Escape HTML in mentions box 2016-08-10 17:19:58 +02:00
Steffen van Bergerem
a591ae781a
Refactor tileLayer creation 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
3fb7b420eb
Always show expanded map in SPV 2016-08-10 11:30:48 +02:00
Steffen van Bergerem
0bc5ec4bb4
Make customsearch filter async results for typeahead.js 2016-08-10 00:41:07 +02:00
Steffen van Bergerem
cefffc6082
Move contacts search to contacts#index 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
f1e9c99866
Add contacts search 2016-08-09 19:20:40 +02:00
Steffen van Bergerem
73ce521bb3
Modify search to include contacts 2016-08-09 15:12:44 +02:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
Benjamin Neff
ecd13fc713 cleanup old attributes from code 2016-08-08 19:37:09 +02:00
cmrd Senya
82ac611396
Client-side rendering of aspect dropdown for hovercards 2016-08-08 17:21:30 +03:00
cmrd Senya
923fb8a763
Refactor app.views.AspectMembership
in order to support adding new aspect to a dropdown without full
page reload
2016-08-08 17:21:14 +03:00
cmrd Senya
838e5ca432
Use the factory in the publisher_view_spec.js 2016-08-08 17:18:53 +03:00
cmrd Senya
f0bd1f9f06
AspectSelections spec corrections 2016-08-08 17:18:45 +03:00
cmrd Senya
06352b7809
AspectSelections style fixes 2016-08-08 17:18:37 +03:00
cmrd Senya
d50ab83157
Rename app.collections.Aspect{,Selection}s 2016-08-08 17:18:31 +03:00
cmrd Senya
ac2f161271
Fix views.js corner case 2016-08-08 17:18:20 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Jonne Haß
1ef3c1387b
Merge pull request #6872 from denschub/autolink-with-rel-noopener
Add rel="noopener noreferrer" to autolinks
2016-06-19 16:21:04 +02:00
Jonne Haß
35a4998707
Merge branch 'stable' into develop 2016-06-19 16:14:13 +02:00
Dennis Schubert
898c3d404f
Throw exception if no templateName gets provided but allow setting templateName to false explicitly
closes #6877
2016-06-19 16:14:00 +02:00
Dennis Schubert
652050a87e Add rel="noopener noreferrer" to autolinks 2016-06-19 13:43:43 +02:00
Steffen van Bergerem
657eec29f0 Update status message text after prefilling mentions 2016-06-18 23:29:59 +02:00
Steffen van Bergerem
3210d0d260 Fix publisher overflow on submit 2016-03-18 05:04:22 +01:00
Steffen van Bergerem
11b659864f Fix typeahead suggestions with nonlatin chars 2016-03-07 14:54:45 +01:00
Steffen van Bergerem
f556a5210e Refactor js search views 2016-03-04 22:55:39 +01:00
Steffen van Bergerem
f948120ba6 Refactor keycodes 2016-03-04 18:02:22 +01:00
Augier
e34960392c Code simplifications and typo 2016-03-04 18:02:22 +01:00
Augier
8f021be20b Do not instanciate publisher if not publisher element is present 2016-03-04 18:02:22 +01:00
augier
b1d60d7c9a Jasmine tests 2016-03-04 18:02:22 +01:00
augier
f1e8c57c26 CSS guidestyle 2016-03-04 18:02:22 +01:00
Jonne Haß
b0d983e85c Merge branch 'stable' into develop 2016-02-26 11:27:29 +01:00
Steffen van Bergerem
98d76af318 Remove empty test file, move i18n spec
closes #6720
2016-02-26 11:27:17 +01:00
Dennis Schubert
51eb3a79fc Merge pull request #6718 from svbergerem/fix-contacts-page-notification-count
Fix notification count change on contacts page
2016-02-25 09:26:34 +01:00
Steffen van Bergerem
dafafcd680 Fix notification count change on contacts page 2016-02-24 23:56:01 +01:00
Dennis Schubert
3d3e82f7f0 Merge branch 'stable' into develop 2016-02-21 04:20:19 +01:00
Steffen van Bergerem
02b330de70 Add jasmine test for aspect name form on contacts page
closes #6706
2016-02-21 04:19:33 +01:00
Steffen van Bergerem
f8f05371e0 Merge pull request #6394 from AugierLe42e/mobile-js-refactor
Mobile JS refactor
2016-02-15 22:22:35 +01:00
Augier
28c509baeb Add jasmine specs for mobile view 2016-02-15 12:14:35 +01:00
Steffen van Bergerem
89f21e87f8 Remove unused code 2016-02-14 02:48:51 +01:00
Steffen van Bergerem
6efde34bb8 Remove stream faces 2016-02-08 17:42:36 +01:00
Dennis Schubert
26e37c46bd Merge branch 'svbergerem-textarea-autosize' into develop 2016-02-07 05:39:49 +01:00
Steffen van Bergerem
936460e874 Merge branch 'stable' into develop 2016-02-06 15:40:16 +01:00
Dennis Schubert
87ef4446e1 Remove uma.jpg and wolf.jpg
closes #6673
2016-02-06 15:39:38 +01:00
Steffen van Bergerem
3f72b231d4 Enable autosize for all textareas 2016-02-06 15:10:32 +01:00
Steffen van Bergerem
0c05b474c5 Merge pull request #6509 from AugierLe42e/fix-mobile-comment
Refactor mobile comment section
2016-02-05 11:30:04 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
fla
1e27b509f9 Add number of votes on poll answers 2016-01-24 14:31:06 +01:00
Steffen van Bergerem
a52c8a2f55 Tell user that the author might ignore them when commenting/liking failed 2016-01-21 21:02:39 +01:00
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
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