zaziemo
f92a2ee0dd
merge address & coordinates in one location object
...
to provide a clear arrangement of all location data
- add 'L' to predefs for pronto because it is part of the leaflet library
- fix: show address template only with an address present
with merging the location objects into one, only the objects within
the location object can be empty
(#5813 )
2015-09-09 12:22:48 +02:00
zaziemo
298e195a8f
add a map subview
...
- add coordinates in post_presenter
- add map to the SPV if location is provided
- add leaflet.js to render map and marker of position
- make coordinates available in frontend
- add map scss
- make stream post location clickable and redirect to the SPV
- prevent render map if no location data is provided
- add tests for coordinates
- use the leaflet gem instead of the JS assets
(#5813 )
2015-09-09 12:19:38 +02:00
Jonne Haß
176b32c815
Merge branch 'stable' into develop
2015-09-07 12:41:36 +02:00
realtin
0b420d0308
adapt templates to allow moderator to view reports
...
(#5324 )
2015-09-07 12:29:46 +02:00
Florian Staudacher
738413c65f
fix some issues with pod-checking
...
add tooltips in the frontend
fix a JS problem with empty hostname
use `find_in_batches` correctly
add a migration to clean up the pods table + unique index on hostname
2015-08-30 18:50:34 +02:00
Steffen van Bergerem
9446a3ae21
Merge pull request #6301 from AugierLe42e/image-gallery
...
Using Blueimp image gallery
2015-08-27 23:59:46 +02:00
augier
63bfcb7c98
Using Blueimp image gallery
2015-08-27 23:50:20 +02:00
Steffen van Bergerem
7e9a88573b
Merge pull request #6325 from AugierLe42e/add-toggle-mobile-menu
...
Add 'Toggle mobile' item to menu + minor styling
2015-08-27 22:58:00 +02:00
augier
4364a80330
Keeping badges on the header
2015-08-27 22:00:43 +02:00
Florian Staudacher
ea397ffdfb
Add connection test for pods in the network
...
* add a class for checking pod connectivity
* extend pod model to handle new functionality
* add an admin frontend to list pods and re-trigger checks manually
* add a daily worker to run through all the pods
* add unit tests for most of the new code
2015-08-24 22:04:53 +02:00
augier
a7bd029526
Add 'toggle mobile' item to menu + minor styling
2015-08-23 13:53:05 +02:00
Steffen van Bergerem
eaf012c82c
Fix style regressions and code style for sidebar polishing PR
2015-08-23 13:15:01 +02:00
Steffen van Bergerem
eddfa7cb5c
Merge pull request #6309 from AugierLe42e/left-navbar-polishing
...
Left and right navbar polishing
2015-08-23 11:29:51 +02:00
augier
450bf4f4ba
Refactor and minor styling
2015-08-23 09:59:12 +02:00
augier
281d1a9161
Rebasing and fixing tests
2015-08-11 18:12:02 +02:00
Pablo Cuadrado
37e3a2749f
- left background to the far left of the screen
...
- large screen breakpoints from BS3
- hover color is the same of link color (variable $blue)
2015-08-11 18:08:26 +02:00
Steffen van Bergerem
8bc86eb98b
Replace jquery.autocomplete with typeahead.js
2015-08-10 22:55:05 +02:00
Steffen van Bergerem
633d65fe27
Merge branch 'stable' into develop
2015-08-06 14:42:28 +02:00
Anton Tkachov
f1d6e9440b
Issue #6281 : add url to hovercard avatar
...
closes #6297
2015-08-06 14:42:14 +02:00
Steffen van Bergerem
8e99a240c9
Use css spinner instead of gif
2015-08-01 13:00:48 +02:00
Jonne Haß
4442616b0d
Merge branch 'stable' into develop
2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7
Move nsfw-shield to status-message
...
closes #6270
2015-07-30 12:00:48 +02:00
Steffen van Bergerem
853dc093cd
Fix poll design (show result)
2015-07-23 12:59:29 +02:00
Steffen van Bergerem
484e70a68f
Add dashboard to admin page
2015-07-21 14:36:41 +02:00
Steffen van Bergerem
9c4f80346b
Use entypo-rails mappings
2015-07-03 15:31:29 +02:00
Jonne Haß
79c5202a5b
Merge pull request #6109 from svbergerem/bootstrap-header-rewrite
...
Bootstrap header rewrite
2015-06-21 19:46:07 +02:00
Steffen van Bergerem
8d5794a2a4
Fix autoresize default height for comment box
2015-06-21 04:40:56 +02:00
Steffen van Bergerem
049c8eb384
Bootstrap header rewrite
2015-06-20 00:38:40 +02:00
Jonne Haß
93281d283f
Merge branch 'stable' into develop
2015-06-17 12:40:27 +02:00
Pablo Cuadrado
c050c606c2
this was causing an empty element to be created
...
closes #6111
2015-06-17 12:40:22 +02:00
Steffen van Bergerem
06a1a1c978
Fix Bootstrap3 regression: reshares in SPV
2015-06-07 12:01:13 +02:00
Augier
0d0d5d6aa1
Fixing infinite scroll and notif dropodown loaders
2015-06-07 10:28:22 +02:00
Steffen van Bergerem
f5bb4a4557
Refactor button colors
2015-06-04 18:05:44 +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
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
Benjamin Neff
9cc0faa4e6
fixes reshares with no text but with photo
...
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92
closes #5976
2015-05-21 00:46:50 +02:00
Benjamin Neff
289753e068
add "original post deleted" message on single post view
...
closes #5968
2015-05-19 03:00:51 +02:00
Benjamin Neff
cde9b24476
fix margin/padding for "original post deleted"-message
2015-05-19 02:59:31 +02:00
Steffen van Bergerem
0c5443d543
Make js-routes use compact and camelcase function names
...
closes #5941
2015-05-10 02:00:30 +02:00
Jonne Haß
d959dd725b
Merge pull request #5850 from svbergerem/modal-for-new-aspect
...
Use Bootstrap modal for new aspect form
2015-04-20 22:34:51 +02:00
goobertron
a75ec75ec7
Update aspect edits text, reorder posting section
...
First iteration to update Help section
Changes from Fla
2015-04-19 15:57:21 +02:00
Steffen van Bergerem
75ef9f47d0
Use Bootstrap modal for new aspect form
2015-04-07 10:45:09 +02:00
Steffen van Bergerem
4d6c513b8e
Refactor post content css, fix margin-bottom for lists in comments
2015-03-22 02:19:36 +01:00
Steffen van Bergerem
e7ec3d495f
Refactor and improve sidebar css
2015-03-16 02:03:53 +01:00
Steffen van Bergerem
81cd1753e4
Improve link to original post in reshared polls
2015-03-15 17:07:16 +01:00
Hincu Petru
9589cb2e0f
disable poll voting for reshared post
2015-03-15 16:46:48 +01:00
Augier
322ee30005
Tests with Jasmine
2015-03-15 14:52:49 +01:00
Augier
673661b798
Ported searchbar
2015-03-15 11:48:06 +01:00
Augier
2a9fddf7a0
Port notifications to backbone part. 2
2015-03-15 11:48:06 +01:00
Steffen van Bergerem
d7d9891293
Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view
...
Add a notification subscribtion to the single post view
2015-03-14 00:52:03 +01:00
Augier
0887137262
Add a notification subscribtion to the single post view
2015-03-13 23:27:49 +01:00
Jonne Haß
cc585805ad
Merge pull request #5762 from svbergerem/entypo-controls
...
Use entypo for control icons
2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3
Use handlebars helpers wherever possible
2015-03-12 16:20:32 +01:00
Steffen van Bergerem
0715107735
Remove stream frame template
2015-03-12 14:43:20 +01:00
Marcelo Briones
7be56849d9
DRY on avatars
2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368
Use entypo for post control icons
2015-03-12 13:08:23 +01:00
SansPseudoFix
26ad537a18
fix tag button overflow
...
fix tag button overflow
modified: app/assets/stylesheets/tag.scss
modified: app/assets/templates/tag_following_action_tpl.jst.hbs
2015-03-12 00:28:31 +01:00
Steffen van Bergerem
73d04b706e
Use entypo icons for left navbar
2015-03-09 17:57:50 +01:00
Steffen van Bergerem
b083560266
Improve Bootstrap stream style
2015-03-06 21:59:36 +01:00
Pablo Cuadrado
122fde9093
colliding style removed
2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cfff769152
comment button using bootstrap styles
2015-03-01 12:04:52 +01:00
Jonne Haß
e46a77ba19
Merge pull request #5706 from aka001/help_section
...
Update the help section #5698
2015-02-27 15:57:12 +01:00
Jonne Haß
be1ab6c6a3
Merge branch 'collimarco-issue5350' into develop
2015-02-27 15:33:55 +01:00
Jonne Haß
073e99992e
Some fixes to participation controls
...
* prevent default event in JS handlers to prevent jumping back to the
top.
* Use js-routes
* Use sprite for icons
* Reply with 200 instead of 204 when destroying a participation,
to prevent errors in the browser console.
2015-02-27 15:31:30 +01:00
Akash Agrawall
e85cb7b373
Help_section_update_keyboard_shortcut
2015-02-27 16:36:11 +05:30
Augier
168adae009
Adding help section for chat
2015-02-26 18:06:39 +01:00
Steffen van Bergerem
f37a018b0e
Merge pull request #5521 from arlogn/profile-photos-as-thumbnails
...
profile photos as thumbnails
2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336
profile photos as thumbnails
2015-02-14 02:27:32 +01:00
Steffen van Bergerem
8b33b9eb18
Merge pull request #5602 from Faldrian/more-shortcuts
...
Add shortcuts for reshare, expand Post and open first link in a post
Conflicts:
config/locales/diaspora/en.yml
2015-02-07 14:41:56 +01:00
Faldrian
db6464ed61
Fixed moderation-button-position when viewing reshare
2015-02-03 00:24:26 +01:00
Faldrian
099974ddef
Add shortcuts for reshare, expand Post and open first link in a post
2015-01-28 16:19:18 +01:00
Marco Colli
eccab62e32
Allow user to enable / disable notifications for a post from stream #5350
2015-01-25 18:40:47 +01:00
Faldrian
31c39a59d1
Added post moderation buttons in SPV
2015-01-25 05:11:59 +01:00
Steffen van Bergerem
9de6a26a22
Port contacts page to backbonejs
2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb
Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273 )
2015-01-03 13:25:16 -05:00
Steffen van Bergerem
7612f5e939
Remove unused stream template
2014-12-17 16:45:51 +01:00
Faldrian
db13811c2c
added scrollbar to bookmark publisher, fixed mention layout bugs
2014-11-07 19:17:54 +01:00
Jonne Haß
0419174570
Merge pull request #5334 from svbergerem/fix-bootstrap-poll
...
Fix poll for Bootstrap publisher
2014-10-14 13:03:19 +02:00
Steffen van Bergerem
42a3e702e6
Fix poll for Bootstrap publisher
2014-10-11 19:18:13 +02:00
Steffen van Bergerem
715f451ed4
only collapse empty comment box
2014-10-10 20:05:28 +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ß
1959f0d939
Merge branch 'hotfix/0.4.1.1' into develop
...
Conflicts:
Changelog.md
config/defaults.yml
2014-10-03 17:14:55 +02:00
Jonne Haß
a5ca738e91
Fix XSS issue in poll questions
...
closes #5274
2014-10-03 17:12:11 +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
1f724dd123
* add a (hash)tag helper for handlebars
...
* re-add stream on profile page
* more controller refactoring
2014-09-15 01:37:23 +02:00
Florian Staudacher
2572fb77fc
* refactored text direction detector into helper (also for handlebars)
...
* added handlebars helper for markdown formatting
* finished port of profile sidebar view to handlebars template
* people_controller refactoring
2014-09-15 01:37:23 +02:00
Florian Staudacher
9a16560d8d
* rename profile header view to make name more accurate
...
* include 'js-routes' for rails routes in javascript
(TODO: config options?)
* add handlebars helper for rails routes
2014-09-15 01:37:23 +02:00
Florian Staudacher
0092c9c483
* create a handlebars view for the profile header
...
* unblock the user via ajax
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
Jonne Haß
291a2f31df
Merge branch 'release/0.4.1.0' into develop
2014-09-01 19:40:40 +02:00
Florian Staudacher
36e92b322f
fix hovercard aspect selectio z-index by moving it out of the stream element
...
- create handlebars template for hovercards
- fix notifications-dropdown (workaround) to remain open when aspect
selector is clicked
2014-09-01 19:39:23 +02:00
Jonne Haß
5da86def06
bump handlebars_assets
2014-09-01 11:44:34 +02:00
Steffen van Bergerem
3f3087c77f
Port tags page to Bootstrap
2014-08-28 18:02:02 +02:00
op48
844fe9d6b9
Allow users to delete own photos from gallery
...
Added delete label to photos in gallery
added an event to delete photos of current user
Added css for hiding/revealing the delete label
Included the photo stylesheet
Added cucumber test for deleting your own photos
Removed wip
2014-08-19 10:11:06 +01:00
op48
66fcfcfcbc
Ignoring validation for last poll answer input
...
last input field is only deleted if there are more than three input fields and the last one is empty
poll is validated only if the last input is empty, and the first three have been filled
Removed duplicate remove last answer.
Dont need to check that the last value is populated as we are ignoring last value
Fixing poll step
Placeholder text edited
Fixed translations for poll answer placeholder text
Removed numbers on publisher option
Removed numbers in placeholder for poll answers
2014-08-13 13:40:14 +01:00
op48
aa11f7c261
Poll answers are added dynamically on keypress
...
Removed add option button
poll option can be added dynamically & last option removed if empty upon submission
Poll answer can be added dynamically by losing focus
poll option can be added dynamically & last option removed if empty upon submission
refractored to avoid repetition of publisher:sync event
poll option can be added dynamically & last option removed if empty upon submission
Added a missing semicolon
2014-08-11 10:42:11 +01:00
Błażej Pankowiak
255b8c02a2
Set top margin only on the body element
2014-08-07 00:15:17 +02:00
Jonne Haß
0421d9336a
Merge pull request #5100 from Faldrian/feature/add_help_keyboard_shortcuts
...
added keyboard shortcut help topic
2014-08-03 20:12:15 +02:00
