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
Faldrian
f9215ce7dd
images are shown in a single row and can be scrolled using buttons on sides
2014-08-03 14:41:12 +02:00
Faldrian
a2a37742e4
added keyboard shortcut help topic
2014-08-01 22:13:55 +02:00
Pablo Cuadrado
45d04a44ea
added title_header key for the Help header, only for EN lang so far
2014-07-01 06:19:29 -03:00
Pablo Cuadrado
14fbd7b205
help page ported to bootstrap
2014-07-01 05:56:49 -03:00
Lukas Matt
10117b81b3
Hide report icon on SPV if author is current user
2014-06-17 12:23:54 -04:00
Lukas Matt
dec7ef667e
Hide SPV controls unless authenticated
...
* cleaned and removed dead code
refs diaspora/diaspora#4711
2014-06-17 11:31:16 -04:00
Jonne Haß
f650808828
Merge pull request #4758 from bronislav/feature/4724-remove-own-hovercard-popup-in-reshares
...
[WIP] Fix hovercard in reshares
2014-05-24 17:56:33 +02:00
Jonne Haß
9537c45d2a
Merge pull request #4916 from hpetru/validate-poll-answer
...
I added the validation to poll question and poll answer
Conflicts:
app/assets/javascripts/app/views/publisher_view.js
2014-05-24 17:42:18 +02:00
Lukas Matt
6ff2141503
If you're able to remove the comment you shouldn't be able to report it
2014-05-15 07:23:44 -04:00
Lukas Matt
23d0890bdc
Fixed and cleaned comment template/stylesheet
...
fixed:
* comment-report-icon will not be displayed when post author is current user
* if you hover a comment all report icons will be displayed
2014-05-15 07:23:44 -04:00
Lukas Matt
9d3af93c7d
Removed unicode from entypo css file
2014-05-15 07:23:43 -04:00
Lukas Matt
ed96ddac98
Display status when the user send a report
2014-05-15 07:23:43 -04:00
Lukas Matt
1748d3b940
It is now possible to report comments
...
* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec
refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517
2014-05-15 07:23:43 -04:00
Steffen van Bergerem
232e4fa236
Improve set read/unread in notifications dropdown
2014-04-16 23:33:22 +02:00
flaburgan
a4886fa77b
SPV: Improve padding and interaction counts
2014-04-13 11:27:12 +02:00
Hincu Petru
57de031f6b
I added the validation for blank to poll question and poll answer
2014-04-07 17:17:41 +00:00
Jonne Haß
682a49605e
Merge pull request #4910 from hpetru/rewrite-poll-creator
...
Rewrite poll creation inputs
2014-04-06 22:27:01 +02:00
Hincu Petru
2d3933ccd8
Rewrite poll creation inputs
2014-04-06 15:01:18 +00:00
Hincu Petru
2ae4d41db3
Fixed 4903 and not render vote form when user is not logged
2014-04-05 14:29:07 +00:00
Hincu Petru
6c00db23cd
I update design for poll in post stream
2014-04-03 20:57:14 +00:00
Hincu Petru
cee90e737c
Make poll to be compatible with bootstrap
2014-04-03 09:03:54 +00:00
Jannik Streek
9c24365fde
changed poll result + some minor text improvements
2014-03-31 18:14:07 +02:00
Jannik Streek
12fabe2fb9
finalized voting design + some design fixes + improved code
2014-03-31 18:14:07 +02:00
Jannik Streek
d0a77ce6b3
design for poll participation implemented, saving works as well
2014-03-31 18:14:07 +02:00
Jonne Haß
24a3a42e90
Merge pull request #4880 from svbergerem/hovercard-bootstrap-style-fixes
...
Improve hovercard style on Bootstrap pages
2014-03-30 22:34:31 +02:00
goobertron
57d796be1d
Fix indentation
2014-03-28 15:21:22 +00:00
Steffen van Bergerem
1fc38278bb
Improve hovercard style on Bootstrap pages
2014-03-28 14:00:16 +01:00
goobertron
1dfde65556
Alter link behaviour of OG previews
2014-03-26 19:24:06 +00:00
Steffen van Bergerem
0cc3b10b1f
port publisher and bookmarklet to bootstrap
2014-03-10 15:15:40 +01:00
Anton Ilin
88f502236a
Fix arguments for hevercardable helper
...
We should pass person object to the hovecrardable helper. In the
current case `this` is the status message, not the status
author. So, let's pass `author` instead of `this`.
2014-03-07 11:20:45 +02:00
Richard
55efa82756
made a help view spec and cleaned up the views a bit.
2014-02-09 16:00:15 +01:00
Richard
da6b037f24
highlighting menu items when clicked. collapsing questions and answers on the static content help sections.
...
removed unused help haml templates.
put locales back to how they were and wrote a small js parser to swap in links to help views which have generated links in them.
using locales text for help section headers.
2014-02-09 16:00:15 +01:00
Richard
afec5977e9
Started converting the help section into a backbone view. Things missing are: some urls which were calculated and inserted into the yml, all the pre-existing erb templates are still there, it's still at /faq/faq, nothing has been tested, some of the questions don't collapse and expand.
...
changed the locales to have the hard coded urls in them because they can no longer be calculated server side. this is pretty crap because i'm going to have to change it for all the languages now so i might change my mind about this later.
deleted some unused views.
2014-02-09 16:00:15 +01:00
Jonne Haß
41a4326993
Merge pull request #4770 from svbergerem/fix-spv-4754
...
Fix bugs introduced by #4754
2014-02-09 15:57:27 +01:00
Steffen van Bergerem
6c7dde1733
Fix bugs introduced by #4754
2014-02-09 15:54:22 +01:00
goobertron
7bcea07b99
Standardise - code refs to 'messages' to 'conversations'
2014-02-09 15:44:12 +01:00
Steffen van Bergerem
97f1c286f4
improve reshared posts
2014-01-31 22:48:40 +01:00
Steffen van Bergerem
318d190404
SPV small improvements
2014-01-30 22:12:51 +01:00
Steffen van Bergerem
0f156cd9a4
Remove unused beta code
2014-01-24 09:01:30 +01:00
Jonne Haß
0b15e66d06
Merge pull request #4577 from svbergerem/2302-permalink-comments
...
[Ready to review & merge] Add permalinks for comments
Conflicts:
app/assets/stylesheets/application.css.sass
2014-01-22 11:24:42 +01:00
Jonne Haß
9ea6e9c166
Merge pull request #4517 from Zauberstuhl/report_post_feature
...
Added post reporter feature
Conflicts:
Changelog.md
app/assets/stylesheets/application.css.sass
db/schema.rb
2014-01-20 10:03:45 +01:00
