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

8543 commits

Author SHA1 Message Date
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
cmrd Senya
a2ce47fae5 Remove parent author signature for relayables from the DB 
since it is considered redundant
 2015-12-16 22:00:35 +03:00
Jonne Haß
13029235d0 Merge branch 'stable' into develop 2015-12-13 12:28:04 +01:00
cmrd Senya
922d26f976 Implement integration tests for the federation messages receive feature 
These are some initial tests, more to come.

It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
 2015-12-13 12:24:52 +01:00
Jonne Haß
21cb1f44cd Merge branch 'stable' into develop 2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826 
closes #6573
 2015-12-08 17:30:27 +01:00
Lukas Matt
b9729db0d6 bump jsxc to v0.1.5.develop 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-11-30 15:06:15 +01:00
augier
fd468b873a Use BS variable to stick chat to header 2015-11-28 20:09:13 +01:00
Steffen van Bergerem
92802a7949 Merge pull request #6491 from AugierLe42e/flash-messages-use-BS-variable 
[Quickfix] Use BS variable $navbar-height for flash messages animation
 2015-11-22 18:25:06 +01:00
Steffen van Bergerem
3cf2e90e5c Merge pull request #6536 from AugierLe42e/close-gallery-outside-click 
Close gallery on outside click
 2015-11-22 14:10:34 +01:00
Dennis Schubert
5081d69847 Merge branch 'stable' into develop 2015-11-22 02:52:37 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare 
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
 2015-11-22 02:50:38 +01:00
Jonne Haß
17d0ddab41 Merge branch 'stable' into develop 2015-11-18 03:37:34 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions 
closes #6552
 2015-11-18 03:16:54 +01:00
Steffen van Bergerem
09a26fbf57 Merge pull request #6448 from AugierLe42e/replace-entypo-mail 
[Quickfix] Use entypo-mail on mobile view
 2015-11-16 01:41:50 +01:00
augier
02e82029c3 Use entypo-mail on mobile view 2015-11-15 14:11:29 +01:00
Jonne Haß
c6939361ee Revert "Revert "Force flash message width to 80% of screen on small devices"" 
This reverts commit 53a7d36e44.
 2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73 Merge branch 'stable' into develop 2015-11-13 16:03:44 +01:00
Jonne Haß
53a7d36e44 Revert "Force flash message width to 80% of screen on small devices" 
This reverts commit e731bb86c5.
 2015-11-13 15:59:18 +01:00
Jonne Haß
5de0655e54 Merge branch 'stable' into develop 2015-11-13 14:31:10 +01:00
Augier
e731bb86c5 Force flash message width to 80% of screen on small devices 
closes #6529
 2015-11-13 14:31:06 +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
augier
49836e267b Close gallery on outside click 2015-11-07 18:19:58 +01:00
Jonne Haß
7fca5cf93a Merge branch 'stable' into develop 2015-11-04 22:10:07 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller 
closes #6533
 2015-11-04 22:10:00 +01:00
augier
d6391afb36 Use BS variable -height for flash messages animation 2015-10-30 12:40:45 +01:00
Steffen van Bergerem
3c43819bce Merge pull request #6504 from sarithats/fix/login_button 
Change login button color
 2015-10-21 08:16:54 +02:00
Dennis Schubert
1338725308 Merge pull request #6492 from marienfressinaud/6062-add-search-and-invte-links-when-no-contacts 
Add invite links when no contacts
 2015-10-21 01:20:59 +02:00
Jonne Haß
800be9b2cf Merge branch 'stable' into develop 2015-10-20 16:27:43 +02:00
cmrd Senya
00588e1ef8 Disable self-notification possibility 
closes #6512
 2015-10-20 16:27:39 +02:00
Saritha
7b08cdd488 Change button color to blue 
Fix #6449
 Fix: SyntaxError in 'app/views/devise/passwords/edit.mobile.haml'
 2015-10-20 12:53:59 +05:30
Dennis Schubert
00ebe4963e Merge branch 'stable' into develop 2015-10-19 18:50:36 -07:00
Dennis Schubert
1f4ad4019f Merge branch 'release/0.5.4.0' into stable 2015-10-19 18:49:08 -07:00
Dennis Schubert
aabe6951e5 Do not reload Streams asynchronously 
Fixes #6494 and #6473
Partly reverts 517cd56f21
[ci skip]
 2015-10-19 18:46:09 -07:00
Jonne Haß
810f24db74 Merge branch 'stable' into develop 2015-10-15 12:20:46 +02:00
Steffen van Bergerem
06c1d2e9e3 Compare person id in people show view 
closes #6505
 2015-10-15 12:20:13 +02:00
Dennis Schubert
228f3852b2 Merge branch 'stable' into develop 2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37 Display publisher on user profile path 
closes #6503
 2015-10-15 05:58:38 +02:00
Steffen van Bergerem
829d4db213 Fix #6452 regressions 2015-10-15 00:45:37 +02:00
Jonne Haß
99d4e0b332 Merge branch 'stable' into develop 2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6 Notifications for comments on local posts by non-contacts 2015-10-14 22:32:19 +02:00
Marien Fressinaud
461e4cfd8c Cleanup the code 
- Extract JS from HTML
- Remove search link on message
- Remove duplicated invitation modal
 2015-10-14 22:31:39 +02:00
Giniouxe
1ae838b596 Open invite link in modal 2015-10-14 22:31:22 +02:00
fla
da1b0b5666 Add links to add or invite contacts 2015-10-14 22:31:22 +02: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ß
2aed793d19 Merge branch 'stable' into develop 2015-10-11 17:30:47 +02:00
Steffen van Bergerem
123e6d1dd4 Redirect logged out users to sign up page for limited posts 
closes #6490
 2015-10-11 17:29:01 +02:00
Steffen van Bergerem
5d7470d94a Merge pull request #6452 from AugierLe42e/typehead-uses-bs-variable 
Use BS variable for typehead + header CSS enhancements
 2015-10-11 14:58:46 +02:00
augier
aa48c412a8 Use BS variable for typehead + header CSS enhancements 2015-10-11 12:21:34 +02:00
Jason Robinson
dd5409dce3 Merge pull request #6393 from pravi/patch-2 
switch back to jquery-colorbox
 2015-10-10 21:10:08 +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
e9350a57fc Fix pronto error, remove unused file 2015-10-10 14:22:59 +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ß
858bdb0808 Merge branch 'stable' into develop 2015-10-09 23:11:05 +02:00
Steffen van Bergerem
2fc7caf0bd Fix infinite scroll console error 
closes #6478
 2015-10-09 23:10:58 +02:00
Steffen van Bergerem
4e5d09e6c5 Fix 'post to single aspect' cukes 2015-10-09 23:10:53 +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
Jonne Haß
202afe0405 Merge branch 'stable' into develop 2015-10-09 11:00:33 +02:00
Steffen van Bergerem
dccad3f7e1 Remove old stream instance when reloading the stream 
closes #6472
 2015-10-09 11:00:27 +02:00
Jonne Haß
c18c1b1d84 Merge branch 'stable' into develop 2015-10-08 14:44:07 +02:00
Steffen van Bergerem
da9cb52007 Scroll to top when reloading the stream 
closes #6470
 2015-10-08 14:44:02 +02:00
Jonne Haß
23099823c1 Merge branch 'stable' into develop 2015-10-08 10:52:25 +02:00
Steffen van Bergerem
0c214cd4ca Make click on active stream link reload the stream 
closes #6466
 2015-10-08 10:52:18 +02:00
Jonne Haß
92b5ea29ed Merge branch 'stable' into develop 2015-10-07 22:29:45 +02:00
Steffen van Bergerem
e0be1b49f1 Add public stream 
closes #6465
 2015-10-07 22:29:39 +02:00
Steffen van Bergerem
c663d9d55e Merge branch 'stable' into develop 2015-10-07 22:00:52 +02:00
Faldrian
058bcb43f8 Added avatar image fallback for notifications 
closes #6463
 2015-10-07 21:58:56 +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ß
8c5534a850 Merge pull request #6464 from Zauberstuhl/fix_report_translation 
Uncapitalize type if trying to find translation-string
 2015-10-07 17:52:10 +02:00
Lukas Matt
74fbd122a1 Uncapitalize type if trying to find translation-string 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-07 16:51:17 +02:00
Jonne Haß
1df5c7f7bf Merge branch 'stable' into develop 2015-10-07 10:58:10 +02:00
Faldrian
a946251a9e Show getting_started only if user has made no profile changes on the page 
closes #6456
 2015-10-07 10:58:06 +02:00
Steffen van Bergerem
b2e3c4f930 Fix scss pronto errors 2015-10-06 23:29:09 +02:00
Steffen van Bergerem
64773d883e Add permalink for stream elements 2015-10-06 23:29:09 +02:00
Jonne Haß
7b4d7dc737 Merge branch 'stable' into develop 2015-10-06 22:50:42 +02:00
Steffen van Bergerem
517cd56f21 Don't reload stream pages 
closes #6462
 2015-10-06 22:46:58 +02:00
Steffen van Bergerem
25e4d8c365 Fix shortcuts after changing streams 2015-10-06 22:34:36 +02:00
Steffen van Bergerem
20385701d2 Move interactions.scss 2015-10-06 10:30:11 +02:00
Steffen van Bergerem
b59c99807b Move settings.scss 2015-10-05 16:12:40 +02:00
Steffen van Bergerem
66fb953591 Move registration.scss 2015-10-05 16:12:40 +02:00
Steffen van Bergerem
dfe5d32e06 Move login.scss 2015-10-05 15:28:48 +02:00
Steffen van Bergerem
1ba593797c Move forms.scss 2015-10-05 15:28:48 +02:00
Jonne Haß
4f23b901e1 Merge pull request #6459 from svbergerem/spv-map-fix-console-error 
Fix console error for map in SPV
 2015-10-05 13:00:43 +02:00
Steffen van Bergerem
e4a850ff9a Fix console error for map in SPV 2015-10-05 11:38:43 +02:00
Steffen van Bergerem
a6d1556502 Move typography.scss 2015-10-05 02:25:12 +02:00
Steffen van Bergerem
92ba0b6374 Move poll.scss 2015-10-05 02:16:42 +02:00
Steffen van Bergerem
e7e1242227 Move code.scss 2015-10-05 01:55:13 +02:00
Steffen van Bergerem
052d20d30d Move base.scss 2015-10-05 01:51:13 +02:00
Steffen van Bergerem
7d04a9461e Move animations.scss 2015-10-05 01:16:12 +02:00
Steffen van Bergerem
d3cb8f9c4c Fix participants count in RTL conversations view 2015-10-04 16:33:26 +02:00
Steffen van Bergerem
beb9f11da1 Remove unused rtl code 2015-10-04 16:12:22 +02:00
Lukas Matt
78f9b39e55 Use polymorphic association for the report item 
* Adopt pronto suggestions

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:18:03 +02:00
Lukas Matt
97ee2cd975 Display all reports and give the ability to review them 2015-10-03 17:18:03 +02:00
Lukas Matt
6bf47c7ff0 Fix spec files and report model 
* Adopt pronto suggestions
 2015-10-03 17:17:45 +02:00
Lukas Matt
a6c3f67ba2 Check if post or comment exist while rendering 
It is possible that the item was deleted
during the time it was reported and the admin review

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:17:45 +02:00
Lukas Matt
95072d6010 Add get_reported_guid spec for report helper 
* two new methods in report model reported_author and item
* merge deletion methods in report model

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 17:17:06 +02:00
Lukas Matt
d1e3e568b9 Report tab; bootstrap3 compatible, add user detail btn 
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 10:58:01 +02:00
Steffen van Bergerem
7c777ca904 Merge branch 'stable' into develop 2015-10-02 23:42:36 +02:00
augier
22882aa24d Infinite scroll triggered relative to last element top rather than window bottom 
closes #6451
 2015-10-02 23:42:26 +02:00
augier
647a422d6c Replace mobile background image by a color 2015-10-02 17:53:06 +02:00
fla
97a5a5cbe3 Hide publisher cancel button on xsmall screens 2015-09-30 23:19:14 +02:00
Steffen van Bergerem
ff99db1fd3 Change conversation page style 2015-09-27 23:11:19 +02:00
Jonne Haß
4087036e63 Merge pull request #6428 from svbergerem/unify-error-pages 
Unify error pages
 2015-09-27 11:42:03 +02:00
Steffen van Bergerem
a5ca78bc87 Fix post preview with location 2015-09-27 03:03:28 +02:00
Steffen van Bergerem
9d6ce5b110 Merge pull request #6336 from AugierLe42e/clean-publisher 
Cleaning publisher
 2015-09-26 00:49:34 +02:00
Steffen van Bergerem
8a02bc6e71 Redesign error pages 2015-09-25 22:24:04 +02:00
Steffen van Bergerem
06e2a445ab Remove Roboto 2015-09-25 21:25:20 +02:00
Steffen van Bergerem
bf6b0e4616 Fix remaining BS3 regressions 2015-09-25 00:31:16 +02:00
Steffen van Bergerem
36637672e3 Fix BS3 regressions for chromium 2015-09-24 21:16:17 +02:00
Steffen van Bergerem
548132ab48 Use full width for comment textarea 2015-09-24 19:38:17 +02:00
Steffen van Bergerem
18c3f298c6 Revert "Use Bootstrap media objects for posts" 
This reverts commit bd73214219.
 2015-09-24 19:36:38 +02:00
augier
c3ddd4c086 Cleaning publisher a bit + responsive styling 2015-09-24 08:54:19 +02:00
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
Praveen Arimbrathodiyil
1af7a0b410 remove colorbox.scss 
colorbox.scss is used only in examples
 2015-09-17 18:50:54 +05:30
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
Praveen Arimbrathodiyil
927480956f switch back to jquery-colorbox 
they provide the same assets and name change was not intentional
 2015-09-10 22:42:18 +05:30
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
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
Jonne Haß
25be9ecfd2 Merge branch 'stable' into develop 2015-08-09 18:35:44 +02:00
theworldbright
d7c92431ae Extract service from comments controller 
closes #6307
 2015-08-09 18:35:11 +02:00
Jason Robinson
cb909c0d70 Strip leading/trailing whitespace from pod tags list in social relay well known 
Closes #6303
 2015-08-09 00:33:35 +03:00
Jonne Haß
480384a077 Merge branch 'stable' into develop 2015-08-06 22:56:30 +02:00
Steffen van Bergerem
dc576fb0d6 Check if person is nil in person_image_tag 
closes #6286
 2015-08-06 22:55:41 +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
Jonne Haß
85f9a0eaa9 Merge branch 'stable' into develop 2015-08-04 10:41:43 +02:00
Mikica Ivosevic
78b0fbbee6 Refactor HomeController#toggle_mobile 
closes #6260
 2015-08-04 10:41:21 +02:00
augier
5087f47e44 Suppress useless images 2015-08-02 21:42:09 +02:00
Jonne Haß
b7864a9976 Merge branch 'stable' into develop 2015-08-02 16:58:07 +02:00
theworldbright
cae5f94af0 Refactor status messages controller 
closes #6280
 2015-08-02 16:58:01 +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
Steffen van Bergerem
bc89f73179 Add Bootstrap classes to mobile getting started input fields 2015-07-30 14:44:14 +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
bdfbbdc3eb Merge branch 'stable' into develop 2015-07-30 04:20:26 +02:00
Mohammed Rashid
dd42635442 Issue #6235: Add hoverable class inside the a tag 
closes #6267
 2015-07-30 04:18:06 +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ß
602ad2d209 Merge branch 'stable' into develop 2015-07-28 18:35:18 +02:00
Mikica Ivosevic
c8b01cb62c application_controller.rb 
refactor method after_sign_out_path_for

closes #6258
 2015-07-28 18:35:13 +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
SansPseudoFix
a0eb2f065c Fix capitalize for powered by diaspora - translation 2015-07-27 13:47:34 +02:00
Dennis Schubert
04135d7b28 Merge branch 'stable' into develop 2015-07-27 02:05:14 +02:00
Steffen van Bergerem
6fea450777 Fix mobile photos index page 
closes #6243
 2015-07-27 01:59:26 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +02:00
theworldbright
2a3dde1ae5 Refactor PostService and extract its tests 
Squashed commits:

[ada0f09] Remove favorites from Posts table

closes #6208
 2015-07-26 13:10:24 +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
Dennis Schubert
e8297f8d6b Merge pull request #6207 from jaywink/social-relay 
Implement social relay requirements
 2015-07-25 23:01:45 +02:00
Steffen van Bergerem
9ca8005b27 Fix percentage on mobile polls 2015-07-25 04:34:52 +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
Jonne Haß
97c9561ab7 Merge branch 'stable' into develop 2015-07-24 11:33:47 +02:00
Jonne Haß
b9bc20c7ce Backport statistics page to Bootstrap 2 2015-07-24 11:30:34 +02:00
Jonne Haß
c76cf90b62 Readd legacy services to statistics.json 2015-07-24 10:57:37 +02:00
Jonne Haß
d68b3f02bd Expose whether chat is enabled as NodeInfo metadata 
related to #6211
 2015-07-24 04:16:54 +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
Jonne Haß
c928d6c117 Expose whether chat is enabled as NodeInfo metadata 
related to #6211
 2015-07-24 03:51:31 +02:00
Jonne Haß
487b0d90ca Implement NodeInfo 2015-07-24 03:50:02 +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
Dennis Schubert
929248c112 Merge pull request #6230 from Flaburgan/add-viewport 
Add viewport to desktop view
 2015-07-23 23:46: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
fla
2090b5f909 Add viewport to desktop view 2015-07-22 19:27:30 +02:00