Commit graph

15358 commits

Author SHA1 Message Date
Steffen van Bergerem
731adffa78 Merge pull request #5497 from jhass/og_reshare_fix
Handle reshares of deleted posts in OpenGraph tags generation code
2014-12-27 15:44:02 +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
Marco Colli
f775d74cfd Add failing test 2014-12-24 11:49:35 +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
Steffen van Bergerem
1efed0ea61 Merge pull request #5477 from margori/Leave_conversation_tooltip
Changed delete conversation button tooltip
2014-12-20 00:59:46 +01:00
margori
27a1886834 Changes delete conversation button tooltip to 'hide' or 'delete' 2014-12-19 18:26:43 -03:00
Jonne Haß
5d44fa771a Correct ordering in Gemfile.lock 2014-12-18 19:10:32 +01:00
Jonne Haß
8c09dc1916 Make tests:generate_fixtures rake task depend on spec:prepare 2014-12-18 19:09:29 +01: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
Jonne Haß
edc1a23f50 Merge pull request #5478 from margori/Purge_orphan_conversation
Destroy conversation when all participants leave it
2014-12-17 16:44:03 +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
Jonne Haß
e25a48cc1c Bump open_graph_reader 2014-12-14 16:55:30 +01:00
Jonne Haß
98cb1bbb1f fix some typos in the changelog [ci skip] 2014-12-13 22:23:58 +01:00
Jonne Haß
691061c68b Merge pull request #5471 from svbergerem/fix-poll-answer-order
Fix order of poll answers
2014-12-13 22:10:03 +01:00
Steffen van Bergerem
e5895a1f1b Fix order of poll answers 2014-12-13 18:22:30 +01:00
Jonne Haß
120b46931d Disable spring while generating secret token
That causes a cyclic dependency on spring being
loaded otherwise.
2014-12-11 20:10:20 +01:00
Jonne Haß
88e150e4a0 Merge pull request #5449 from margori/3016_block_messages_to_not_sharing_user
BUG: new messages to person that is not sharing
2014-12-10 21:42:16 +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
Jonne Haß
f4c756cd34 use URI.join in the specs too 2014-12-09 17:27:27 +01:00
Jonne Haß
6d682d6c39 Use URI.join to assemble the URL to fetch a single post
That normalizes any extra / on the base URL.
2014-12-09 16:21:04 +01:00
Jonne Haß
ed0005c44d Add migration to drop invalid OpenGraphCaches, closes #5465
URI.extract recognized http:// as an URL, causing invalid
associations. #5347 already fixed the parsing, this just
cleans up the caches to get rid of the false associations.
2014-12-09 05:32:04 +01: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
Dennis Schubert
c1770a2ca1 Merge pull request #5461 from jhass/open_graph
Correctly implement OpenGraph tags
2014-12-09 04:23:09 +01:00
Dennis Schubert
907f71c7b6 Merge pull request #5463 from jhass/deferred_gc
Drop deferred GC and cleanup features/support
2014-12-09 04:07:11 +01:00
Jonne Haß
c7047fbe8f cleanup features/support 2014-12-08 04:55:56 +01:00
Jonne Haß
3a92efbfaf drop deferred garbage collection 2014-12-08 04:51:06 +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
Jonne Haß
60a5d2a5ba Merge pull request #5459 from svbergerem/aspect-chat-control-disabled-chat
Only show aspect chat control if chat is enabled
2014-12-05 14:41:11 +01:00
Steffen van Bergerem
8a50db76b1 Only show aspect chat control if chat is enabled 2014-12-05 13:07:17 +01:00
Dennis Schubert
e77a401d90 Merge pull request #5458 from jhass/stabilize_cukes
Stabilize cukes
2014-12-05 04:03:43 +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ß
1c7e5b7026 Improve apend_to_publisher
- Use custom matcher that polls #value of the element
- Wait for the text field to become visible before entering text
2014-12-04 22:16:47 +01:00
Jonne Haß
7e4504edf2 Give the browser time to actually load the page before expecting to be
on it
2014-12-04 18:13:56 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Jonne Haß
50a3f03bfc Rails is a module 2014-12-04 14:52:14 +01:00
Dennis Schubert
339111867e Merge pull request #5443 from jhass/spring
Replace spork with spring, update & use binstubs
2014-12-04 00:38:30 +01:00