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

7612 commits

Author SHA1 Message Date
Jonne Haß
f326b58d31 Merge pull request #5664 from svbergerem/remove-people-last_post 
Remove last_post from PeopleController
 2015-02-15 15:58:02 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +01:00
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails 
profile photos as thumbnails
 2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile 
related to diaspora/jsxc#77
 2015-02-13 19:23:26 +01:00
Steffen van Bergerem
2193ff2b58 Remove last_post from PeopleController 2015-02-13 12:25:50 +01:00
Steffen van Bergerem
1733131c0c Add invitation link to contacts page 2015-02-12 03:34:24 +01:00
Jonne Haß
3c58cbeaee Merge pull request #5646 from svbergerem/fix-conversation-scrolling 
Conversations: fix badge count and automatic scrolling
 2015-02-11 14:19:48 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
17c7771a6b Fix typo in AspectGlobalHelper 2015-02-10 16:43:14 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago 
Fix timeago for notifications, add 'no notifications yet' message
 2015-02-10 12:20:09 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation 
Technical limitations of how old one can be on D* #5373
 2015-02-09 02:28:15 +01:00
Akash Agrawall
6b105274af Technical limitation of how old one can be on D* 5373 2015-02-09 06:19:09 +05:30
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Faldrian
5d3145bf8f added avatar error correction on core view rendering 2015-02-08 19:32:50 +01:00
Faldrian
32ca5cc16d removed css-spill on reshare link in stream 2015-02-08 17:24:16 +01:00
Marc Burt
9f5131b6ec Fixed #5041 with new User method to find total accounts excluding closed and invitations 2015-02-08 13:49:12 +00:00
Jonne Haß
3114b04a08 Merge pull request #5635 from svbergerem/remove-unused-files 
Remove unused files, fix syntax in jasmine tests
 2015-02-07 23:43:48 +01:00
Jonne Haß
63363340f6 Merge pull request #5623 from AugierLe42e/fix-mobile-login-view 
[Mobile] Does not display the header on sing_in page
 2015-02-07 21:30:03 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +01:00
Steffen van Bergerem
8b33b9eb18 Merge pull request #5602 from Faldrian/more-shortcuts 
Add shortcuts for reshare, expand Post and open first link in a post

Conflicts:
	config/locales/diaspora/en.yml
 2015-02-07 14:41:56 +01:00
Steffen van Bergerem
5e98308b2c Fix aspect dropdown on people search page inserted after initial page load 2015-02-07 11:22:26 +01:00
Jason Robinson
28ff7fb557 Merge pull request #5601 from Faldrian/5591-correct-moderation-placement-reshare 
Fixed moderation-button-position when viewing reshare
 2015-02-05 22:25:28 +02:00
Augier
4be1e2b38e Does not display the header on sing_in page 2015-02-04 23:45:13 +01:00
Sam Radhakrishnan
9fcef5b101 Fixed Isssue #5618. The profile update page shows the correct message. 2015-02-03 14:39:08 +05:30
Faldrian
db6464ed61 Fixed moderation-button-position when viewing reshare 2015-02-03 00:24:26 +01:00
Sam Radhakrishnan
a12c0d83c0 Fixed Bug #5593. Added length validation to location in profile model with maximum length 255. 2015-02-02 19:42:53 +05:30
Steffen van Bergerem
b4ff1f97e7 Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled 
Hide sign up button when registration are disabled
 2015-02-02 00:44:35 +01:00
flaburgan
b8aaad6318 Hide sign up button when registration are disabled 2015-02-01 14:01:44 +01:00
Jason Robinson
512de9cfd9 Merge pull request #5597 from gdpelican/feature/json-exporter-post-fields 
Add created_at to json posts for #5585
 2015-02-01 13:18:48 +01:00
Augier
55d258c5ac Fix registrations displaying 2015-01-30 18:00:22 +01:00
Faldrian
099974ddef Add shortcuts for reshare, expand Post and open first link in a post 2015-01-28 16:19:18 +01:00
James Kiesel
43f48d0ae2 Add created_at to json posts for #5585 2015-01-28 10:21:16 +13:00
Augier
4ff5483025 Fix available services not correctly displayed 2015-01-26 20:45:03 +01:00
Flaburgan
69b881f34b Fix monthly and halfyear active users count 2015-01-26 10:03:37 +01:00
Marco Colli
eccab62e32 Allow user to enable / disable notifications for a post from stream #5350 2015-01-25 18:40:47 +01:00
Augier
f14ad5ce35 Fixes the header problem rendering statistics page 2015-01-25 13:24:19 +01:00
Faldrian
31c39a59d1 Added post moderation buttons in SPV 2015-01-25 05:11:59 +01:00
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
SansPseudoFix
7e9525740b fix #5568 - overflow json exporter 2015-01-21 17:54:59 +01:00
Jonne Haß
cd6475d572 Merge pull request #5562 from sjain1107/5560-Hide-community-spotlight 
5560 Hide community spotlight setting if not enabled
 2015-01-21 05:38:25 +01:00
Sakshi Jain
8b1f0453a1 5560 Hide community spotlight setting if not enabled 2015-01-20 10:31:31 +05:30
James Kiesel
7bbd9138de Fix bad email formatting 2015-01-20 16:51:08 +13:00
Jonne Haß
6502000429 Merge pull request #5574 from svbergerem/fix-linkify 
Fix markdown-it linkify blocking Firefox
 2015-01-19 15:02:00 +01:00
Steffen van Bergerem
b63d8fc679 Fix markdown-it linkify blocking Firefox 2015-01-19 02:09:10 +01:00
Marcelo Briones
63eca447d0 Strip EXIF data as user preference 2015-01-18 10:28:28 -03:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
Jason Robinson
5c810a8a2e Merge pull request #5489 from collimarco/solved5482 
Solved #5482
 2015-01-17 03:39:03 +02:00
Jason Robinson
6513053586 Merge pull request #5499 from gdpelican/feature/json-exporter-deux 
JSON Exporter, part deux
 2015-01-17 00:51:38 +02:00
James Kiesel
1c69dd7752 Add contacts/posts, and GZipping JSON exporter output 2015-01-15 00:20:19 +13:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins 
activate sanitizer, sub and sup
 2015-01-13 03:41:06 +01:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Dumitru Ursu
36b66624e2 Invert gradient 2015-01-09 17:13:35 +02:00
Dumitru Ursu
80b4cb90ef Use the standard syntax for gradient 2015-01-09 16:49:26 +02:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02:00
Jonne Haß
9c99ae357a Merge pull request #5493 from collimarco/solved5341 2015-01-06 14:43:58 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
d7a3559f4b Merge pull request #5472 from svbergerem/fix-typo-profile-header 
Fix typo in profile_header_view
 2015-01-06 14:37:34 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu 
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
 2015-01-06 14:35:37 +01:00
Jonne Haß
e94e9add1a Merge pull request #5452 from Flaburgan/allow-non-hosted-paypal-buttons 
Add currency setting to paypal donation and allow unhosted button setting

Conflicts:
	Changelog.md
 2015-01-06 14:32:57 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273) 2015-01-03 13:25:16 -05:00
Steffen van Bergerem
59e9597c77 Remove asyncSubHeader from app.pages.Profile 2015-01-03 15:20:33 +01:00
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Jonne Haß
45b385d694 Handle reshares of deleted posts in OpenGraph tags generation code 2014-12-27 15:07:16 +01:00
Marco Colli
8dea4b5fd9 Solve #5341 2014-12-24 11:52:12 +01:00
Jonne Haß
6c9f191696 Merge pull request #5491 from collimarco/solved5348 
Solve #5348
 2014-12-23 23:00:06 +01:00
Jason Robinson
30eaf82762 Merge pull request #5481 from svbergerem/remove-stream-template 
Remove unused stream template
 2014-12-22 23:30:55 +02:00
Marco Colli
76cc5e2d5c Add ActiveRecord::RecordNotFound catching. Add tests. 2014-12-22 12:36:09 +01:00
Marco Colli
d75071bac9 Solve #5348 2014-12-20 19:09:33 +01:00
Marco Colli
1ac2e728f4 Solved #5482 2014-12-20 11:05:12 +01:00
Dennis Schubert
7b0cff3250 Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint 
Set refresh_search async searchresults load to use bootstrap
Fix #5240
 2014-12-20 04:55:25 +01:00
Dennis Schubert
91c14c19e3 Merge pull request #5487 from Faldrian/5313-adding_contacts_racecondition_fix 
Fixed growing number on events on hovercard dropdown container
 2014-12-20 04:08:32 +01:00
Faldrian
43fd6e7ed6 Set refresh_search async searchresults load to use bootstrap 2014-12-20 03:58:20 +01:00
Faldrian
710d03b1c2 Fixed growing number on events on hovercard dropdown container 2014-12-20 02:44:48 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
3000d86d57 Merge pull request #5475 from svbergerem/tag-page-improve-wording 
Improve wording for tagged people on tag page
 2014-12-17 16:46:09 +01:00
Steffen van Bergerem
7612f5e939 Remove unused stream template 2014-12-17 16:45:51 +01:00
Jonne Haß
6806b2daf8 Merge pull request #5354 from gdpelican/feature/json-exporter 
Feature/json exporter
 2014-12-17 16:45:25 +01:00
margori
e6c605d92b Destroy conversation when all participants leave it 2014-12-17 11:33:23 -03:00
James Kiesel
e174514d69 Add JSON exporter for user profile download 2014-12-16 08:55:35 +13:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Steffen van Bergerem
e5895a1f1b Fix order of poll answers 2014-12-13 18:22:30 +01:00
Marcelo Briones
4e83e4c7ed BUG: new messages to person that is not sharing 
Conversation recipient validated

- Conversation foreign recipient not required to be validated.
- Added 'peter' as spec_helper user.
- New fixture, new statistic values.

- Clearer identifier names
 2014-12-10 17:02:20 -03:00
Dennis Schubert
cc0c19b482 Merge pull request #5462 from jhass/open_graph_reader 
Bye opengraph_parser, hi open_graph_reader
 2014-12-09 04:42:20 +01:00
Jonne Haß
6836af89ad Correctly implement OpenGraph tags 
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
 2014-12-08 02:25:09 +01:00
Jonne Haß
74a6f42501 Bye opengraph_parser, hi open_graph_reader 
opengraph_parser is basically unmainted, issues are ignored
or deliberately closed without fixing. It pollutes the global
namespace and has no verification of correctness.

The opengraph gem has basically the same issues, not really maintained,
unreleased patches on master since over a year, not really smart either.

So I created my own version and while at it, why not strive try to be
complete and robust, although it's still a work in progress.

This also improves general URL detection by parsing them
from the message after stripping markdown.

An additional dependency was added to support
fetching sites that require cookies to work at all.
For the same reason Faraday's default redirect limit was
bumped.
 2014-12-08 02:01:31 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile 
Fix code overflow spv and profile
 2014-12-02 22:44:08 +01:00
SansPseudoFix
6d681f8306 Fix code overflow 
new file:   app/assets/stylesheets/new_styles/_code.scss
 2014-12-02 16:51:50 +01:00
Steffen van Bergerem
d742f23cd5 Content shouldn't exceed the profile sidebar 2014-12-02 02:03:15 +01:00
Steffen van Bergerem
4cc1b40443 Only remove photos from view when destroyed on server 2014-12-01 00:36:56 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
taro-k
b01026f9b8 pre-fill tag page form with the tag #4234 2014-11-30 14:15:45 +01:00
Steffen van Bergerem
b275b2edbc Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden 
A temporary fix for mention modal #5329
 2014-11-30 13:48:24 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url 
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
 2014-11-29 23:46:45 +01:00
SansPseudoFix
90b9f227d8 A temporary fix for mention modal #5329 
A temporary fix for mention modal #5329

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss
 2014-11-29 17:36:46 +01:00
Faldrian
29f55f42b6 truncate long opengraph description to 250 chars in mobile and stream view 2014-11-29 17:18:01 +01:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Jonne Haß
544501a0e6 Merge pull request #5418 from svbergerem/publisher-counter-style-fix 
Fix character count placement for publisher
 2014-11-29 16:11:45 +01:00
Laurent PERON
9661d00ec8 issue #5430 : message added 2014-11-28 10:31:47 +01:00
Steffen van Bergerem
389edbe3aa Don't display undefined handle in search widget 2014-11-27 16:57:32 +01:00
Jonne Haß
49dfc27011 Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process 
Optimize jsxc login process and bump jsxc version
 2014-11-24 23:01:03 +01:00
Steffen van Bergerem
77b627dbe9 Merge pull request #5419 from SansPseudoFix/add-handle-search-terms 
Add handle search terms
 2014-11-24 18:09:02 +01:00
Lukas Matt
ef29de8176 Configure form element and move xmpp config 2014-11-24 17:19:57 +01:00
Lukas Matt
0d4da2fba8 Login function deprecated 
related to diaspora/jsxc#50
 2014-11-24 17:19:30 +01:00
Lukas Matt
44bc48ad5e Remove debug output on default 2014-11-24 17:19:09 +01:00
SansPseudoFix
322ca4dac0 display handle for search bar 
fix margin and color

hidden overflow for long handle and names

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss

add min width 300px

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss
 2014-11-24 13:17:57 +01:00
Steffen van Bergerem
8cb6e242bf Fix character count placement for publisher 2014-11-23 18:36:05 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
6a034f172b Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint 
fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error
 2014-11-22 19:00:55 +01:00
Jonne Haß
32c5508f3d Merge pull request #5408 from Zauberstuhl/show_roster_minimized 
Display chat box minimized on default
 2014-11-22 18:58:16 +01:00
Jonne Haß
9b49df80a5 Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster 
Chat: add extra padding for the roster
 2014-11-22 18:57:51 +01:00
Steffen van Bergerem
8f956383bd Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden 
Issue #5251: fix hidden overflow
 2014-11-22 16:38:16 +01:00
SansPseudoFix
66b76024ed Issue #5251: fix hidden overflow 
modified:   app/assets/stylesheets/getting-started.css.scss

	modified:   app/assets/stylesheets/getting-started.css.scss
 2014-11-22 15:01:20 +01:00
Steffen van Bergerem
472d65cb61 Chat: add extra padding for the roster 2014-11-21 23:29:06 +01:00
Lukas Matt
5fee67e5e7 Display chat box minimized on default 
Currently it slides in if you login. with time it is annoying
 2014-11-21 21:56:27 +01:00
Praveen Arimbrathodiyil
6378af5417 remove execution permissions from images and css 2014-11-20 23:38:36 +05:30
Faldrian
328a515dbe fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error 2014-11-16 18:19:32 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Lukas Matt
e40cf25177 Swap aspect chat privilege title 2014-11-13 14:38:23 +01:00
Lukas Matt
ea11133084 Include the chat front-end if chat is enabled 
* add jsxc helper file
 2014-11-13 11:34:21 +01:00
Lukas Matt
735b10cc63 Chat privilege checkbox 
* add to contacts header for later modification
* add to aspect creation box
 2014-11-13 11:30:12 +01:00
Lukas Matt
24e1732256 Implement token authentication 
* create a new token on a new session
* delete the current token on session exit
 2014-11-13 11:27:56 +01:00
Lukas Matt
ae582e4543 Add toggle_chat_privilege to aspect controller 2014-11-13 11:24:07 +01:00
Lukas Matt
38a238eb36 Set chat-flag for every aspect manually 
On default none is permitted to chat with you.
You have to set extra privilege for an aspect.
 2014-11-13 11:21:21 +01:00
Lukas Matt
50a7541d14 Include jsxc deps and initialize the client on login 2014-11-13 11:17:19 +01:00
Jonne Haß
e68704890e make sure to import perfect scrollbar plugin before our own mixins 
otherwise it overrides the border-radius mixin with an incompatible one
 2014-11-09 20:31:24 +01:00
Jonne Haß
30de98cf3e Merge pull request #5335 from svbergerem/paginate-contacts 
Paginate contacts
 2014-11-09 19:04:07 +01:00
Jonne Haß
404a286588 Merge pull request #5355 from Chocobozzz/header-logo-hover 
Replace the black header logo with the white logo on hover
 2014-11-09 18:55:59 +01:00
Jonne Haß
c7c57d40f5 Merge pull request #5380 from Faldrian/feature/3098-publisher-imageupload-layouterror-fix 
Feature/3098 publisher imageupload layouterror fix
 2014-11-09 18:52:13 +01:00
Dennis Schubert
4c98445f1c Fix presenters instead of modifying the getters 2014-11-09 07:47:40 -08:00
Dennis Schubert
6808150920 Method calling convention and doc improvements 
... and a stealth-commit of an already introduced bug prevention system.
;)
 2014-11-09 07:20:30 -08:00
Dennis Schubert
5bcd5087bf Add Camo for remote images 2014-11-09 02:17:43 +01:00
Dennis Schubert
db2560d7fc Add Camo for OpenGraph images 2014-11-09 01:36:16 +01:00