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

801 commits

Author SHA1 Message Date
Steffen van Bergerem
bf6b0e4616 Fix remaining BS3 regressions 2015-09-25 00:31:16 +02:00
Dennis Schubert
6b863defa3 Merge branch 'stable' into develop 2015-08-27 05:25:51 +02:00
Steffen van Bergerem
3c370ea56e Remove unused js code (stream widget and dropdowns) 
closes #6279
 2015-08-25 04:26:17 +02:00
Pablo Cuadrado
754d8107a8 reasonable max-width for right sidebar 2015-08-11 18:08:12 +02:00
Pablo Cuadrado
c8ba4f061e polishing of the right sidebar 2015-08-11 18:08:12 +02:00
Steffen van Bergerem
8e99a240c9 Use css spinner instead of gif 2015-08-01 13:00:48 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
Steffen van Bergerem
6fafa731e6 Display locations on mobile devices 2015-07-23 16:06:28 +02:00
Jonne Haß
9229f1dfd2 Merge branch 'stable' into develop 2015-07-14 09:58:59 +02:00
Alex Chvatal
634aa7b09a capitalize Wiki in the links sidebar. closes #6188 
closes #6193
 2015-07-14 09:58:43 +02:00
Jonne Haß
1e4224813e Merge branch 'stable' into develop 2015-07-05 20:50:42 +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
9c4f80346b Use entypo-rails mappings 2015-07-03 15:31:29 +02:00
Dennis Schubert
8b773c89e1 Merge pull request #6066 from theworldbright/5483-fix-mobile-stream-comments 
Fix for #5483 and #5757 (mobile stream comments)
 2015-06-27 04:43:50 +02:00
Steffen van Bergerem
e890ffa698 Merge branch 'stable' into develop 2015-06-19 22:20:57 +02:00
Faldrian
0fa571d5e4 Fixed more-button wording when there are <15 posts 2015-06-19 22:17:21 +02:00
Steffen van Bergerem
078e7a722f Merge branch 'stable' into develop 2015-06-19 21:30:15 +02:00
SansPseudoFix
cce5a98537 Add link to pod statistics in right navigation 
closes #6117
 2015-06-19 21:29:25 +02:00
fla
264f41a09d Add Services and Privacy settings page to mobile 2015-06-18 17:26:31 +02:00
theworldbright
7dc70c7311 Fix #5483 
Please see https://github.com/diaspora/diaspora/issues/5483#issuecomment-109277476 (+5 squashed commits)
Squashed commits:
[62f38a6] Wrap all handlers with document.ready()

Also add the copyright at the top of the file.
[e861587] Split up show_comments handling

Currently there are two classes that have the
class show_comments. I renamed one to
"back_to_stream_element_top" as it is responsible
for scrolling the user all the way up to the top
when clicked. The other which toggles the
reactions will remain as "show_comments".
[a8dbc4e] Remove unused "cancel new comment" action
[db575cc] Move comment related js to mobile_comments.js
[de44f81] Move add comment container to new comment partial
 2015-06-17 22:23:25 +09:00
Steffen van Bergerem
b3a5e92eca Remove all faceboxes 2015-06-15 14:09:24 +02:00
Steffen van Bergerem
20c63b20ba Remove inline css, use font-size-small 2015-06-04 18:05:45 +02:00
Steffen van Bergerem
cc58c66e3d Use media objects for mobile posts/comments/notifications 2015-06-04 18:05:44 +02:00
Jonne Haß
e3bff1f20b Fix syntax error in shared/_modal.haml 
Also can't use quoted keys there yet because of Ruby 2.1
 2015-06-04 18:05:44 +02:00
theworldbright
ed5f7837b5 Fix styleguide violations 
Fix hash syntax 3

Fix hash syntax 1 and 2
 2015-06-04 18:05:43 +02:00
Augier
0cbf581176 Better settings display 2015-06-04 18:05:43 +02:00
Steffen van Bergerem
8a004ee02a Overwrite Bootstrap variables and fix publisher 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ß
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
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services 
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
 2015-05-25 04:18:38 +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
Steffen van Bergerem
895d38de21 Refactor available services settings 2015-04-08 18:43:35 +02:00
Steffen van Bergerem
6b024dcd45 Fix missing button styles in donate and admin sections 2015-04-01 13:34:56 +02:00
Sayed
e21afc6636 order-of-comments-on-the-mobile-version-is-reversed #5804 2015-03-21 15:20:57 +02:00
Sayed
bf3d903c11 refactor mobile stream post_stats 2015-03-17 20:37:16 +02:00
Sayed
99f42cb643 fix missing reshares count on mobile stream 2015-03-17 01:14:22 +02:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +01:00
Steffen van Bergerem
d3c0259026 Remove unused aspect files 2015-03-09 17:57:50 +01:00
Pablo Cuadrado
56a79828bc using circled help icon 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +01:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Faldrian
4dbf42d970 added different behaviour depending on existence of posts 2014-11-16 15:06:08 +01:00
Faldrian
21806a2c9b mobile more-link only if there may be a next page; added message for end of stream 2014-11-16 01:43:55 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01:00
Steffen van Bergerem
6461135bfd Redesign contacts page 2014-08-26 19:18:32 +02:00
Jason Robinson
e58f0b2ad4 Terms of service and privacy policy feature. 
If enabled, terms of service link will be shown in sign up page.
 2014-08-17 17:44:44 +03:00