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
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
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
Lukas Matt
ea11133084
Include the chat front-end if chat is enabled
...
* add jsxc helper file
2014-11-13 11:34:21 +01:00
JesseWeinstein
fb51e9aa43
Only include the quote markdown if needed
...
Intentionally do a converting-comparison against the empty string, to see if text is selected.
2014-11-10 23:41:34 -08:00
JesseWeinstein
ea33ef9e0b
Add Markdown to generated post
...
Switch to using content parameter, which doesn't alter its value, unlike the other ones.
Use a H2 header for the document.title, quote the selected text, and put the URL at the bottom, in a separate paragraph.
2014-11-10 23:24:23 -08:00
JesseWeinstein
9585a1877b
Split bookmarklet_url literal string into lines
...
To improve the readabilit of diffs that modify it, per https://github.com/diaspora/diaspora/pull/5384#issuecomment-62443426
2014-11-10 23:16:31 -08:00
Faldrian
db13811c2c
added scrollbar to bookmark publisher, fixed mention layout bugs
2014-11-07 19:17:54 +01:00
flaburgan
20d2b8fc5e
Add a link to a reported comment in the admin panel
2014-10-13 14:11:51 +02:00
Steffen van Bergerem
976ff0fcda
Redesign profile page and port to Bootstrap
2014-10-01 12:28:56 +02:00
Florian Staudacher
be86014540
rspec should now be running a green build
2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc
first round of specs and code cleanups/fixes
2014-09-15 01:37:23 +02:00
Florian Staudacher
fba3092c61
* cleanup people_controller#show, add people_controller#stream for json
...
* introduce new presenters and extend the functionality of the BasePresenter
* add a handlebars template for the profile sidebar, render it everytime we need to update
* introduce a 'aspect_membership:update' global event
2014-09-15 01:37:23 +02:00
Steffen van Bergerem
854dcf04db
Display new conversation form on conversations/index
2014-08-31 18:02:37 +02:00
Jonne Haß
462198799b
Dynamic asset paths everywhere
...
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
2014-08-28 21:04:29 +02:00
Steffen van Bergerem
ff84ee0485
Small style changes, add tests
2014-08-26 22:45:43 +02:00
