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

8218 commits

Author SHA1 Message Date
Steffen van Bergerem
bd73214219 Use Bootstrap media objects for posts 2015-09-23 02:21:31 +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
Steffen van Bergerem
f2456eda9c Merge pull request #6345 from Flaburgan/override-bootstrap-list-group 
Override bootstrap list group default
 2015-09-20 01:37:14 +02:00
Steffen van Bergerem
5aeac0c2e3 Merge pull request #6324 from AugierLe42e/styling-main-stream 
Styling main stream
 2015-09-18 20:55:43 +02:00
augier
f00f3965ff Styling main stream 2015-09-18 19:13:49 +02:00
fla
e7790a5935 Override bootstrap list group default 2015-09-18 14:01:54 +02:00
SansPseudoFix
ccaf107ae5 Fix for tag overflow - fixes #6142 
Fix for tag overflow - fixes #6142
 2015-09-17 13:54:41 +02:00
Jonne Haß
92113749c0 highlight-white is still referenced on stable 2015-09-15 10:44:23 +02:00
Jonne Haß
70b200e10d Merge branch 'stable' into develop 2015-09-15 09:52:12 +02:00
Steffen van Bergerem
8bb3d4d8a8 Remove unused color variables 
closes  #6404
 2015-09-15 09:51:06 +02:00
Jonne Haß
0508c1b8d4 Merge branch 'stable' into develop 2015-09-14 22:06:52 +02:00
Steffen van Bergerem
05a6d95811 Always show public photos 
closes #6398
 2015-09-14 22:04:53 +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
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ß
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
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
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
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
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
5020ac45c7 Merge branch 'stable' into develop 2015-08-29 18:19:12 +02:00
SansPseudoFix
110284626a Fix mobile pagination for notifications view 
Fix syntax

Fix syntax

closes #6364
 2015-08-29 18:13:54 +02:00
Jonne Haß
bf92a7441e Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API 2015-08-29 15:58:08 +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
5b918606fa Display mobile reaction box only once 2015-08-29 14:33:42 +02:00
augier
3a5406a6e1 Styling of mobile header compilant with desktop version 2015-08-28 20:30:07 +02:00
augier
2ca963fadb Correcting BS3 regression on badge color + spelling mistake 2015-08-28 13:02:48 +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ß
24d9be2e68 Merge branch 'stable' into develop 2015-08-27 21:03:16 +02:00
augier
2ce7a1e185 Mobile subdomain 
closes #6354
 2015-08-27 21:01:36 +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
Steffen van Bergerem
b4a5819aa8 Merge pull request #6349 from Faldrian/beautify-blocked-persons 
Beautify ignored people list and add diaspora handle for identification
 2015-08-27 11:00:56 +02:00
Faldrian
37793f7dbb beautify ignored people list and add diaspora handle for identification 2015-08-27 09:52:49 +02:00
Dennis Schubert
6b863defa3 Merge branch 'stable' into develop 2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e Remove unused js code (stream widget and dropdowns) 
closes #6279
 2015-08-25 04:26:17 +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
Jonne Haß
2bf6c87964 Merge branch 'stable' into develop 2015-08-23 22:49:51 +02:00
theworldbright
6e74ee7d21 Make PostPresenter inherit from BasePresenter 
closes #6315
 2015-08-23 22:49:45 +02:00
theworldbright
335b1c32aa Refactor post presenter 2015-08-23 22:49:12 +02:00
Jonne Haß
865cfc1cc2 Merge pull request #6342 from svbergerem/sidebar-polishing-code-style 
Fix style regressions and code style for sidebar polishing PR
 2015-08-23 16:13:40 +02:00
Steffen van Bergerem
89a3ea6d20 Merge branch 'stable' into develop 2015-08-23 14:45:33 +02:00
Jonne Haß
a1ca45b201 Update NodeInfo to final 1.0 schema 
closes #6340
 2015-08-23 14:45:20 +02:00
augier
a7bd029526 Add 'toggle mobile' item to menu + minor styling 2015-08-23 13:53:05 +02:00
Steffen van Bergerem
eaf012c82c Fix style regressions and code style for sidebar polishing PR 2015-08-23 13:15:01 +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
a76b228478 Merge pull request #6321 from AugierLe42e/admin-use-bs-forms 
[Quickfix] Admin panel use 'form-control' class for selects
 2015-08-22 03:56:39 +02:00
Steffen van Bergerem
36eb283546 Merge pull request #6302 from AugierLe42e/comment-button-misbehaving 
[Quickfix] Fixing comment button misbehaving
 2015-08-22 02:07:14 +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
38f811f9fd Admin panel use 'form-control' class for selects 2015-08-22 01:20:33 +02:00
Steffen van Bergerem
51bfc6e114 Merge pull request #6319 from AugierLe42e/body-padding-use-variable 
[Quickfix] Body padding-top use BS' SCSS variable
 2015-08-22 01:19:36 +02:00
Jonne Haß
d396d5555f Merge branch 'stable' into develop 2015-08-21 14:23:46 +02:00
Benjamin Neff
663835ed3a remove old webfinger/hcard code 
closes #6310
 2015-08-21 14:23:08 +02:00
Benjamin Neff
d28e03f053 use discovery from diaspora_federation gem 2015-08-21 14:21:43 +02:00
Lukas Matt
dbc57d9371 Load bower dependencies on jsxc initialization 
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-21 12:43:50 +02:00
Jonne Haß
b4923cc17c Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc 
bump diaspora_jsxc to v0.1.2
 2015-08-19 10:18:22 +02:00
augier
95c3d9694b Body padding-top use BS' SCSS variable 2015-08-15 11:31:25 +02:00
Augier
75b317895d Fixing comment button misbehaving 2015-08-14 16:18:42 +02:00
augier
281d1a9161 Rebasing and fixing tests 2015-08-11 18:12:02 +02:00
Pablo Cuadrado
bc1b6bd44d polishing the sidebar on large (lg on BS3) screens 2015-08-11 18:08:26 +02:00
Pablo Cuadrado
37e3a2749f - left background to the far left of the screen 
- large screen breakpoints from BS3
- hover color is the same of link color (variable $blue)
 2015-08-11 18:08:26 +02:00
Pablo Cuadrado
b787db13ba minor css polishing for the username 
trying a new set of responsive grid rules
 2015-08-11 18:08:26 +02:00
Pablo Cuadrado
b34f0e792f followed tags selected state was missing 2015-08-11 18:08:26 +02:00
Pablo Cuadrado
267d98f132 leftnavbar with full sized clickable anchors, better padding, weight font reduced, overall looks polished 
fixed background added for contrast, hideable on SM or XS bootstrap-based sizes.
 2015-08-11 18:08:26 +02:00