Commit graph

265 commits

Author SHA1 Message Date
Jonne Haß
e70ffebc49 Merge pull request #6805 from cmrd-senya/mention-name-fixup
Fix up the meaning of the name parameter in mention
2016-08-11 13:28:02 +02:00
cmrd Senya
d200e92aeb Fix up the meaning of the name parameter in mentions
The desktop frontend now treats the "name" parameter of mention as
a string to display unconditionally. But the Diaspora::Mentionable
renders mentions the different way: "name" is treated as a fallback
string which is rendered only if the person's name is unavailable.
This reflects on the mobile version ATM. This patch makes it behave
the same way as the current desktop version does.
2016-08-11 13:19:48 +03:00
cmrd Senya
4ae26e1ded Upgrade devise to 4.2 2016-08-11 12:25:36 +03:00
Steffen van Bergerem
79117d1a46
Merge pull request #6944 from AugierLe42e/bump-jquery-2
Bump to jQuery 2
2016-08-09 13:00:39 +02:00
cmrd Senya
a3f208c380
Notifications and search page backend updates
Updates introduce support for preloading contacts to Gon in order
to support client-side rendering of aspect membership dropdown box.
2016-08-08 17:21:38 +03:00
Augier
2e175c4be5 Bump to jQuery 2 2016-08-07 16:14:52 +02:00
Benjamin Neff
5aa52b36af better error message if we webfinger a person with invalid guid
this happens if a remote person changed the diaspora-id manually (renamed
domain or something) in their database.
2016-07-31 23:05:53 +02:00
Steffen van Bergerem
e0226f9322
Raise on missing translations 2016-07-03 20:15:57 +02:00
Benjamin Neff
03123f1c4d remove more unused code and cleanup 2016-06-26 06:21:01 +02:00
Benjamin Neff
4fb34139b0 cleanup notifications and fix tests 2016-06-26 06:20:59 +02:00
Benjamin Neff
30ea6ef72f fix spec for ApplicationHelper#changelog_url 2016-06-18 23:12:29 +02:00
Dennis Schubert
a414fb2381 Merge pull request #6747 from cmrd-senya/rspec-fixup
Fix usage of hard-coded pod URI in rspec testsuite
2016-04-05 17:52:50 +02:00
Steffen van Bergerem
c8a8110cf1 Merge branch 'stable' into develop 2016-03-30 11:13:47 +02:00
Dennis Schubert
4617629098 Add spec for PeopleHelper#birthday_format
closes #6738
2016-03-30 11:13:35 +02:00
cmrd Senya
0f04414a4f Fix usage of hard-coded pod URI in rspec testsuite 2016-03-22 15:06:30 +03:00
Dennis Schubert
446201b584 Merge branch 'stable' into develop 2016-03-18 07:24:44 +01:00
Benjamin Neff
6ea8cd546e don't change AppConfig.environment.url in jsxc_helper_spec
closes #6748
2016-03-18 07:24:40 +01: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
6bf47c7ff0 Fix spec files and report model
* Adopt pronto suggestions
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
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
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +02:00
Benjamin Neff
e4ca9f01e2 fix jsxc_helper_spec and use new url_to in jsxc_helper
closes #6151
2015-07-13 23:52:13 +02:00
Benjamin Neff
f875be8d5b use federation-gem for webfinger/hcard generation
remove old webfinger/hcard generation code

this fixes #5143
2015-07-14 05:50:26 +02:00
Benjamin Neff
0ffe513b40 fix jsxc_helper_spec and use new url_to in jsxc_helper 2015-07-11 11:19:42 +02:00
Benjamin Neff
46a22fefe9 use federation-gem for webfinger/hcard generation
remove old webfinger/hcard generation code

this fixes #5143
2015-07-10 01:46:48 +02:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
dimana
31d760867c Issue #4297: Updated color themes and testing 2015-06-07 19:57:37 +03:00
Benjamin Neff
84c3814b94 fix notification mails for limited posts 2015-04-22 19:59:08 +02:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
flaburgan
46223a2dfc Don't truncate notification emails anymore, close #4342 2015-01-10 22:10:11 +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
Marcelo Briones
fe6052865c Remove limited content from email notifications 2014-12-28 22:15:47 -03:00
flaburgan
3ff298606f Add menu mobile and drawer navigation tests 2014-12-28 18:49:03 +01:00
Jonne Haß
45b385d694 Handle reshares of deleted posts in OpenGraph tags generation code 2014-12-27 15:07:16 +01:00
Lukas Matt
32dcf8cabb Test jsxc helper spec; should respond with correct url 2014-11-13 11:43:56 +01:00
Augier
2ce98b49d7 Fix issue #4416
Conflicts:
	spec/helpers/notifier_helper_spec.rb
2014-10-16 23:27:48 +02:00
Jonne Haß
7313bafe86 update notifier helper spec expecatations to redcarpet 3.2 2014-10-15 01:00:27 +02:00
flaburgan
20d2b8fc5e Add a link to a reported comment in the admin panel 2014-10-13 14:11:51 +02:00
Florian Staudacher
4f87a47d0a Merge pull request #4657 from svbergerem/bootstrap-people-view
Redesign profile page and port to Bootstrap
2014-10-06 15:09:08 +02:00
Jonne Haß
eac3f042a4 Reset dynamic configuration after each example in the testsuite 2014-10-04 00:59:03 +02:00
Steffen van Bergerem
976ff0fcda Redesign profile page and port to Bootstrap 2014-10-01 12:28:56 +02:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
Erwan Guyader
3ebc0f0387 Test returned path for Show More on mobile
- Added test when the currant page is Aspects Stream
  - Modified test for the Stream page to account for the new possibility
    (i.e current page is Aspects Stream)
2014-06-17 21:36:38 +02:00
Jason Robinson
356096a7eb Merge pull request #4836 from MrZYX/message_renderer
Introduce message renderer
2014-04-13 15:00:46 +03:00
Steffen van Bergerem
f217a5bc11 Add filters to notifications controller 2014-03-19 17:54:22 +01:00
Jonne Haß
8280556a47 Introduce message renderer
This new class replaces all existing server side message
rendering helpers and is the new global entry point for such
needs. All models with relevant fields now expose an instance
of MessageRenderer for those. MessageRenderer acts as
gateway between the existing processing solutions for markdown,
mentions and tags and provides a very flexible interface for
all output needs. This makes the API to obtain a message
in a certain format clear. As a result of centralizing the
processing a lot of duplication is eliminated. Centralizing
the message processing also makes it clear where to change
its behaviour, add new representations and what options
are already available.
2014-03-15 17:16:17 +01:00