nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17428 commits 4 branches 0 tags 121 MiB
Commit graph

903 commits

Author SHA1 Message Date
fla
5f446330e2 collapse the sidebars to the side of the screen even on big screens 
Drop right side bar, move content to left side bar

Move user avatar and name from the left nav bar to the left of the publisher
 2016-03-22 13:00:50 +01:00
Dennis Schubert
446201b584 Merge branch 'stable' into develop 2016-03-18 07:24:44 +01:00
Benjamin Neff
67fbd02ae0 use AppConfig.url_to for generated urls for oembed 
_url doesn't with generate https if the pod uses https
 2016-03-18 07:24:25 +01:00
Steffen van Bergerem
9cc40af69c Fix 500 for mobile like without javascript 2016-02-08 03:11:55 +01:00
Augier
a5198e9a01 Fix no reaction case 2016-02-03 16:06:24 +01:00
augier
054971c7de Big refactor on mobile comments 2016-01-15 15:54:34 +01:00
augier
7b2be0d3c6 Support displaying TOS and policy 2016-01-04 16:49:56 +09:00
augier
2c7d102019 Design for authorization page when client_name not providen + XSS spec 2016-01-04 16:49:55 +09:00
augier
aefd7273d9 Drop ID 2015-10-10 12:34:59 +02:00
augier
c62927bf00 Use backbone for flash messages 2015-10-10 12:15:41 +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
Lukas Matt
d1e3e568b9 Report tab; bootstrap3 compatible, add user detail btn 
The reported_user_details button will redirect you
to admin user_search. This can be useful if the podmin
wants to lock, unlock or delete the account which is
responsible for the reported post

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-10-03 10:58:01 +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
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