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

1534 commits

Author SHA1 Message Date
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
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
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
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
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
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
Pablo Cuadrado
c38da4c787 controlling right sidebar behaviour on large screens 2015-08-11 18:08:13 +02:00
Pablo Cuadrado
754d8107a8 reasonable max-width for right sidebar 2015-08-11 18:08:12 +02:00
Pablo Cuadrado
9bd7ceb722 removing uppercase to prevent l18n issues 2015-08-11 18:08:12 +02:00
Pablo Cuadrado
c8ba4f061e polishing of the right sidebar 2015-08-11 18:08:12 +02:00
Steffen van Bergerem
e8acaa08ad Remove browser detection 2015-08-10 22:55:05 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Steffen van Bergerem
0aa453e437 Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile 
Use entypo icons on mobile posts
 2015-08-06 18:00:03 +02:00
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +02:00
Steffen van Bergerem
633d65fe27 Merge branch 'stable' into develop 2015-08-06 14:42:28 +02:00
Anton Tkachov
f1d6e9440b Issue #6281: add url to hovercard avatar 
closes #6297
 2015-08-06 14:42:14 +02:00
augier
5087f47e44 Suppress useless images 2015-08-02 21:42:09 +02:00
Steffen van Bergerem
8e99a240c9 Use css spinner instead of gif 2015-08-01 13:00:48 +02:00
Lukas Matt
fbc88ab56f Adjusting chat implementation into diaspora container 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-30 22:42:33 +02:00
Lukas Matt
524a0bdaf0 Obsolete with diaspora/jsxc#113 
Using the logout element caused some trouble in the past

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-30 22:41:47 +02:00
Lukas Matt
9a96836594 Load bower dependencies on jsxc initialization 
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-30 22:40:19 +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
Steffen van Bergerem
e402bbdd3d Merge pull request #6245 from AugierLe42e/fix-nsfw-author 
Fix nsfw author
 2015-07-30 00:28:15 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
fla
4aef8de571 Improve mobile drawer 2015-07-29 14:22:19 +02:00
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts 
closes #6266
 2015-07-29 12:08:35 +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
Jonne Haß
4094fb260d Merge pull request #6263 from svbergerem/remove-remaining-span 
Remove remaining span-* and improve mobile photos page
 2015-07-29 01:35:05 +02:00
Steffen van Bergerem
816092c477 Remove remaining span-* and improve mobile photos page 2015-07-28 23:36:47 +02:00
Steffen van Bergerem
a2349052f4 Use autosize for mobile publisher 2015-07-28 20:15:11 +02:00
Steffen van Bergerem
1c11b374bf Remove mbp-helper 2015-07-28 19:50:17 +02:00
Jonne Haß
d62c4387f3 Merge branch 'stable' into develop 2015-07-28 18:24:19 +02:00
cmrd Senya
fa411c73a7 Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js (#5939). 
closes #6257
 2015-07-28 18:24:10 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +02:00
theworldbright
d724397168 Refactor posts controller 2015-07-26 12:58:42 +02:00
Steffen van Bergerem
1aebf74a3f Merge pull request #6247 from AugierLe42e/bs3-regression-profile-stream 
Fix page width on people view (BS3 regression)
 2015-07-26 12:38:20 +02:00
Steffen van Bergerem
7f28c79156 Merge pull request #6246 from AugierLe42e/spv-align-icons 
Better alignement of interaction icons
 2015-07-26 01:46:37 +02:00
Jonne Haß
11a8ac614c Merge pull request #6240 from svbergerem/contact-page-update-counts 
Update number of contacts on contact page when adding/removing contacts
 2015-07-24 22:02:39 +02:00
augier
00674fee74 Fix page width on people view (BS3 regression) 2015-07-24 21:08:54 +02:00
augier
1423ba73b8 Better alignement of interaction icons 2015-07-24 20:08:29 +02:00
Steffen van Bergerem
04191996a5 Add updates for 'only sharing' and 'all contacts' 2015-07-24 14:18:43 +02:00
Dennis Schubert
be8f920c29 Merge branch 'stable' into develop 2015-07-24 04:05:32 +02:00
Jonne Haß
b7064677ff Collapse StatisticsController into NodeInfoController 2015-07-24 03:51:31 +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ß
5a5d595339 Merge pull request #6238 from svbergerem/mobile-location-polls 
Add location and polls to mobile website
 2015-07-23 20:02:11 +02:00
Steffen van Bergerem
6fafa731e6 Display locations on mobile devices 2015-07-23 16:06:28 +02:00
Steffen van Bergerem
5d39461443 Display polls on mobile devices 2015-07-23 14:09:38 +02:00
Steffen van Bergerem
853dc093cd Fix poll design (show result) 2015-07-23 12:59:29 +02:00
Steffen van Bergerem
031faeece5 Fix regression for default.html 2015-07-22 22:00:37 +02:00
Jonne Haß
2cede713b1 Merge pull request #6228 from svbergerem/refactor-publisher-js 
Refactor publisher_view.js
 2015-07-22 20:59:35 +02:00
Steffen van Bergerem
3d6918646e Add js for aria-labelledby in conversations 2015-07-22 18:37:02 +02:00
Steffen van Bergerem
44c370513e Refactor publisher_view.js 2015-07-22 17:36:25 +02:00
Jonne Haß
5ecafa2bb0 Merge pull request #6227 from svbergerem/accessibility 
Improve accessibility of signin/signup/password and conversation pages
 2015-07-22 15:09:21 +02:00
Steffen van Bergerem
4819544030 Use sr-only and aria-labelledby on signup/signin/password pages 2015-07-22 12:24:09 +02:00
Jonne Haß
3af30718f9 Merge branch 'stable' into develop 2015-07-22 11:55:59 +02:00
Steffen van Bergerem
aa53763b98 Fix peeping tom on 404 error page 
closes #6226
 2015-07-22 11:55:24 +02:00
Dennis Schubert
3210fb3835 Merge pull request #6224 from svbergerem/sticky-footer 
Sticky footer
 2015-07-22 04:21:18 +02:00
Steffen van Bergerem
37352b1b10 Sticky footer 2015-07-22 02:40:23 +02:00
Steffen van Bergerem
839d76c15e Moar entypo on mobile website 2015-07-21 21:16:46 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Dennis Schubert
b4bc7d8198 Merge branch 'stable' into develop 2015-07-20 03:56:59 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Steffen van Bergerem
295c8533a1 Fix profile visibility icon 2015-07-17 14:37:22 +02:00
Augier
adef7ee37c Better display for stream faces 2015-07-15 20:31:40 +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
Dennis Schubert
aa86003cf9 Keep the hacky scope workaround in comments.js 
because we still are supporting browsers without .bind() and I do not
want to break the patterns here.

Follow up to #6171 - I wanted to avoid feedback loop delays for that
little change.
 2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)
df440ed8d8 Very minor changes of some JS files 2015-07-08 19:09:08 +02:00
Dennis Schubert
c703cadf9b Merge branch 'stable' into develop 2015-07-07 02:51:38 +02:00
Dennis Schubert
b5b5f1f028 Revert "Issue #6145: Set a fixed body-height" for global side effects 
This reverts commit 990c678cd3.
 2015-07-07 02:50:30 +02:00
Dennis Schubert
eecceacd46 Merge branch 'stable' into develop 2015-07-07 02:46:39 +02:00
Haidy777
990c678cd3 Issue #6145: Set a fixed body-height 
closes #6169
 2015-07-07 02:46:34 +02:00
Jonne Haß
69974bdc13 Merge pull request #6161 from svbergerem/fix-conversation-modal 
Fix two modal issues
 2015-07-03 20:26:31 +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
db00bd1b03 Fix conversation modal on contacts page 2015-07-03 17:44:12 +02:00
Steffen van Bergerem
aeda8e37e3 Remove aspects-dropdown.js 2015-07-03 16:56:25 +02:00
Steffen van Bergerem
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Dennis Schubert
8b773c89e1 Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments 
Fix for #5483 and #5757 (mobile stream comments)
 2015-06-27 04:43:50 +02:00
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Jonne Haß
0b6dc320cb Merge pull request #6132 from svbergerem/fix-perfect-scrollbar 
Fix overflow with perfect scrollbar
 2015-06-22 01:29:40 +02:00