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
Jonne Haß
1e4224813e
Merge branch 'stable' into develop
2015-07-05 20:50:42 +02:00
Benjamin Neff
f45e053316
remove unused publics_helper
...
the Subscriber stuff was removed in 2010:
f97218c005
2015-07-05 20:44:24 +02:00
Benjamin Neff
2294e59ee3
change public_url to atom_url and profile_url
2015-07-05 20:44:24 +02:00
Steffen van Bergerem
db00bd1b03
Fix conversation modal on contacts page
2015-07-03 17:44:12 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
efstrian
69c3a4100d
Issue #4297 : Color themes can override bootstrap variables
2015-06-07 19:58:54 +03:00
efstrian
d64ea15891
Issue #4297 : Style fixes - Default theme is configurable
2015-06-07 19:58:14 +03:00
efstrian
57d766346c
Issue #4297 : Enable color theme setup
2015-06-07 19:57:16 +03:00
theworldbright
98f11b944a
Fix styleguide violations
...
Fix hound remark 12
Remove unnecessary explicit div tag
Rename el_**** to ****El (hound remark 2 and 3)
Only find and replace operations were done with
this commit
Fix hound remark 4 and 8
Fix hound remark 6
Fix hound remark 7
Fix hound remark 9
Fix hound remark 10 and 11
Fix hound remark 13
Fix hound remark 1
Change single quotes to double quotes
Change single quotes to double in publisher view
Fix camelCase and missing {} in publisher view
Change single quotes to double in bookmarklet view
Use dot notation for serializedForm in publisher
Change single quotes to double in bookmarklet spec
Change single quotes to double in publisher spec
Fix missing {} in publisher views
Use ruby 1.9 hash syntax in invite_link
Fix indentation in publisher view
2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f5bb4a4557
Refactor button colors
2015-06-04 18:05:44 +02:00
Augier
0cbf581176
Better settings display
2015-06-04 18:05:43 +02:00
Augier
207b6c6153
Port to Bootstrap 3
...
correcting images display on stream sidebar
Corrections on profile page
2015-06-04 18:05:43 +02:00
Jonne Haß
3850118e4e
Merge branch 'stable' into develop
2015-06-02 12:14:42 +02:00
Steffen van Bergerem
1b77258d0e
Set default for post title truncation to 70 characters
...
closes #6022
2015-06-02 12:14:35 +02:00
Jonne Haß
6581c580f8
Merge branch 'stable' into develop
2015-05-29 11:39:36 +02:00
Benjamin Neff
604ffb445a
optimized sprites
...
- move mobile icons to mobile-folder, so they aren't included in the
icons-sprite
- move logos to branding/logos, and create a logos-sprite without the
big other branding-images
- delete duplicate images
closes #6004
2015-05-29 11:39:30 +02:00
Dennis Schubert
944c57f874
Merge branch 'stable' into develop
2015-05-18 03:23:43 +02:00
Benjamin Neff
494c03a3fd
re add user atom feed on profile-page
2015-05-18 03:23:15 +02:00
Florian Staudacher
0bb316e893
update bookmarklet
...
* snippet now in a separate JS file - compiled and uglified with the other assets
* popup gets centered in opening browser window
* publisher gets pre-filled with markdown-styled content
2015-05-01 20:20:46 +02:00
Florian Staudacher
9479be6360
Merge branch 'patch-1' of git://github.com/JesseWeinstein/diaspora into JesseWeinstein-patch-1
2015-05-01 13:18:46 +02:00
Benjamin Neff
84c3814b94
fix notification mails for limited posts
2015-04-22 19:59:08 +02:00
Jonne Haß
ec2a209b68
Lazily initialize Contact proxy in service helper
...
This prevents connecting to the database on rake assets:precompile,
which fails in certain build environments.
Running git blame on this and figuring out what in gods name this
is for, is for another time.
2015-04-10 19:19:16 +02:00
Steffen van Bergerem
7870f3b127
Contacts page: remove broken title from 'Start a conversation' button
2015-04-01 00:47:31 +02:00
Steffen van Bergerem
caf7470e8e
Various style fixes
2015-03-15 01:58:29 +01:00
Martha
985141c0e8
display specific error messages for password change (issue #5549 )
2015-03-13 11:35:21 -07:00
Steffen van Bergerem
d3c0259026
Remove unused aspect files
2015-03-09 17:57:50 +01:00
Steffen van Bergerem
e188782a9a
Remove blueprint code
2015-03-02 00:04:57 +01:00
Steffen van Bergerem
9c22ed6aef
Add year to notifications page
2015-02-16 18:02:50 +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
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
Akash Agrawall
6b105274af
Technical limitation of how old one can be on D* 5373
2015-02-09 06:19:09 +05:30
Augier
55d258c5ac
Fix registrations displaying
2015-01-30 18:00:22 +01:00
Augier
4ff5483025
Fix available services not correctly displayed
2015-01-26 20:45:03 +01:00
SansPseudoFix
dc44485230
Feature : Statistics design
2015-01-24 22:34:41 +01:00
flaburgan
46223a2dfc
Don't truncate notification emails anymore, close #4342
2015-01-10 22:10:11 +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ß
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
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
Marcelo Briones
fe6052865c
Remove limited content from email notifications
2014-12-28 22:15:47 -03: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
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
