Commit graph

7436 commits

Author SHA1 Message Date
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
Jonne Haß
45b385d694 Handle reshares of deleted posts in OpenGraph tags generation code 2014-12-27 15:07:16 +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
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