nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17979 commits 4 branches 0 tags 121 MiB
Commit graph

819 commits

Author SHA1 Message Date
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
Steffen van Bergerem
0df0926739 Convert BackToTop to a backbone view 2015-08-25 04:17:24 +02:00
Florian Staudacher
ea397ffdfb Add connection test for pods in the network 
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
 2015-08-24 22:04:53 +02:00
Steffen van Bergerem
eddfa7cb5c Merge pull request #6309 from AugierLe42e/left-navbar-polishing 
Left and right navbar polishing
 2015-08-23 11:29:51 +02:00
augier
450bf4f4ba Refactor and minor styling 2015-08-23 09:59:12 +02:00
Steffen van Bergerem
40ef382a6e Merge branch 'stable' into develop 2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448 Issue #6180: Update stream faces block if somebody was blocked 
closes #6320
 2015-08-22 01:35:23 +02:00
augier
281d1a9161 Rebasing and fixing tests 2015-08-11 18:12:02 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +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ß
4abc0c5988 Merge branch 'stable' into develop 2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465 Update backbone.js 
closes #6262
 2015-07-29 10:04:18 +02:00
Steffen van Bergerem
04191996a5 Add updates for 'only sharing' and 'all contacts' 2015-07-24 14:18:43 +02:00
Steffen van Bergerem
4a178e20e5 Update number of contacts on contact page when adding/removing contacts 2015-07-24 02:38:49 +02:00
Jonne Haß
f4e0785e96 Merge branch 'stable' into develop 2015-07-23 17:02:55 +02:00
cmrd Senya
e30293b9c1 Enable the jasmine testsuite to work across LAN by setting its Host variable to "0.0.0.0" (instead of default 127.0.0.1) so you could test it with a foreign web browser. 
closes #6234
 2015-07-23 17:02:52 +02:00
Steffen van Bergerem
44c370513e Refactor publisher_view.js 2015-07-22 17:36:25 +02:00
Steffen van Bergerem
8f27e8fae8 Improve wording for admin dashboard 2015-07-21 20:43:18 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Spanti Nicola (RyDroid)
df440ed8d8 Very minor changes of some JS files 2015-07-08 19:09:08 +02:00
Jonne Haß
202b6108e9 Merge branch 'stable' into develop [ci skip] 2015-07-05 12:22:35 +02:00
Mohammed Rashid
c652374787 typo in spec [ci skip] 
closes #6167
 2015-07-05 12:22:23 +02:00
Steffen van Bergerem
61edda0fca Aspect creation modal now creates an aspect when pressing enter 2015-07-03 18:20:32 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Steffen van Bergerem
18a8211cc3 Add img-responsive to image class 2015-06-12 00:01:56 +02:00
Dennis Schubert
e0420d733a Merge branch 'stable' into develop 2015-06-08 00:49:55 +02:00
Benjamin Neff
010afa1019 refactor: iterate over visiblities 
closes #6060
 2015-06-08 00:45:16 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
Jonne Haß
8df9cb9cd2 Merge branch 'stable' into develop 2015-06-05 09:40:39 +02:00
Benjamin Neff
214ce1cf6e change path to uma.jpg to /assets 
closes #6064
 2015-06-05 09:40:34 +02:00
Steffen van Bergerem
700df9af23 Fix jasmine tests 
Fix notifications jasmine tests
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41 Fix hound remarks 2015-06-04 18:05:44 +02:00
theworldbright
98f11b944a Fix styleguide violations 
Fix hound remark 12

Remove unnecessary explicit div tag

Rename el_**** to ****El (hound remark 2 and 3)

Only find and replace operations were done with
this commit

Fix hound remark 4 and 8

Fix hound remark 6

Fix hound remark 7

Fix hound remark 9

Fix hound remark 10 and 11

Fix hound remark 13

Fix hound remark 1

Change single quotes to double quotes

Change single quotes to double in publisher view

Fix camelCase and missing {} in publisher view

Change single quotes to double in bookmarklet view

Use dot notation for serializedForm in publisher

Change single quotes to double in bookmarklet spec

Change single quotes to double in publisher spec

Fix missing {} in publisher views

Use ruby 1.9 hash syntax in invite_link

Fix indentation in publisher view
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557 Refactor button colors 2015-06-04 18:05:44 +02:00
Augier
207b6c6153 Port to Bootstrap 3 
correcting images display on stream sidebar

Corrections on profile page
 2015-06-04 18:05:43 +02:00
Dennis Schubert
ba9b947173 Merge branch 'stable' into develop 2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Dennis Schubert
3446cb2f3f Merge branch 'stable' into develop 2015-05-18 03:31:17 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00