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

1171 commits

Author SHA1 Message Date
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
Florian Staudacher
d00d69814e port profile page to backbone.js 2014-09-15 01:37:23 +02:00
Jonne Haß
4e5fa6cc7e Merge branch 'release/0.4.1.0' into develop 2014-09-03 15:53:58 +02:00
Jonne Haß
2d9c6a945d Don't let the dropdown indicator flow into the user name in the user 
menu
 2014-09-03 15:53:01 +02:00
Jonne Haß
d4dc20f59c Merge branch 'release/0.4.1.0' into develop 2014-09-03 11:17:04 +02:00
Jonne Haß
12dc9cbc23 prevent user menu from moving 2014-09-02 01:17:18 +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
Jonne Haß
d4a2d5708c Hide welcome to diaspora after all popovers are closed 
As a side effect stabilizes signs up cuke
 2014-08-31 21:29:46 +02:00
Steffen van Bergerem
854dcf04db Display new conversation form on conversations/index 2014-08-31 18:02:37 +02:00
Jonne Haß
7c28921ec7 Merge pull request #5138 from svbergerem/bootstrap-tags-view 
Port tags page to Bootstrap
 2014-08-28 23:12:32 +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
3f3087c77f Port tags page to Bootstrap 2014-08-28 18:02:02 +02:00
flaburgan
1dbce6d84d Improve profile page design on mobile 2014-08-27 14:17:05 +02:00
Jonne Haß
f1ab434b18 Merge pull request #5153 from svbergerem/redesign-contacts-page 
Redesign contacts page
 2014-08-27 10:01:41 +02:00
Flaburgan
2151b4f791 Add jasmine tests 2014-08-27 00:03:49 +02:00
flaburgan
3d793679e0 Add visibilit icons in publisher dropdown aspect 2014-08-26 22:47:41 +02:00
Steffen van Bergerem
ff84ee0485 Small style changes, add tests 2014-08-26 22:45:43 +02:00
Steffen van Bergerem
f1408a7a09 Add contacts search and port aspect membership save/destroy to backbone 2014-08-26 21:41:11 +02:00
Steffen van Bergerem
9587961883 Display all contacts in the contact list 2014-08-26 21:41:02 +02:00
Steffen van Bergerem
6461135bfd Redesign contacts page 2014-08-26 19:18:32 +02:00
Jonne Haß
39379421dc Merge pull request #5165 from jaideng123/5106-scrolling_in_notifications 
Fixed notifications dropdown on bootstrap pages
 2014-08-26 17:00:56 +02:00
jaideng123
83e677401f Fixed bootstrap pages 2014-08-26 09:51:36 -05:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications 
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
 2014-08-26 02:06:55 +02:00
Jonne Haß
9e5ac86a36 Merge branch 'release/0.4.1.0' into develop 2014-08-26 01:50:58 +02:00
lyzellis
8c90fea1e1 changes hovercard background color to grey on hover 2014-08-26 01:50:36 +02:00
Jonne Haß
3b3a44b39b Merge pull request #5158 from khall/issue_5044 
Fix for issue 5044
 2014-08-26 01:18:39 +02:00
khall
1d0446fcab Adding tabindex='0' attributes to non-blueprint view elements since blueprint is so last week 2014-08-25 15:50:53 -07:00
jaideng123
b70f306ff5 Integrated Perfect Scrollbar into notifications dropdown 2014-08-25 15:33:25 -05:00
khall
049e504ad3 Fix for issue 5044: Adding tabindex attributes for add contact dropdown and contents, also binding keypress event to perform same action that click does. 2014-08-24 21:37:39 -07:00
khall
a9fd16db3e Fix for issue 5090: Changing error message wording and providing more information to user when status message is too long. 2014-08-24 13:28:57 -07:00
Jonne Haß
2619beb157 Merge pull request #4481 from diaspora/rails4 
Port to Rails 4
 2014-08-24 13:42:31 +02:00
Jonne Haß
52d5a1cd1a Merge pull request #5141 from svbergerem/mark-read-link-notifications 
Change mark read link on notifications page
 2014-08-24 13:32:32 +02:00
Jonne Haß
cf3d6293dc Merge pull request #5130 from wegotcoders/4948-add-linebreaks 
line breaks have been added to long headings
 2014-08-24 13:25:22 +02:00
Jonne Haß
2c6e9a9786 try working around precompilation bug by committing generated sprites, not nice but luckily they don't change often 2014-08-24 01:02:35 +02:00
Steffen van Bergerem
c18df1c32f Change mark read link on notifications page 2014-08-23 17:42:19 +02:00
Jonne Haß
5068be90e8 reduce cuke failures 
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
 2014-08-23 16:47:57 +02:00
Florian Staudacher
adf7aa98dd port router specs, don't test backbone - our own code is enough 2014-08-23 16:38:58 +02:00
Florian Staudacher
c81379d38f port some more JS specs to jasmine 2.0... still a lot to do 2014-08-23 16:38:57 +02:00
Jonne Haß
dfa0245f4b make assets:precompile work 2014-08-23 16:34:00 +02:00
Steffen van Bergerem
d682821f2d Refactor css 2014-08-23 15:45:45 +02:00
Jonne Haß
c4970b485f Merge pull request #5131 from wegotcoders/3801_delete_own_photos 
3801 delete own photos
 2014-08-23 10:52:29 +02:00
damzcodes
ab71205261 line breaks have been added in correct stylesheet 2014-08-19 14:51:42 +01:00
Daniel Sun
13419066d4 refactor authorIsCurrentUser to user model as isAuthorOf 
Dried up authorIsCurrentUser in views.js

removed authorIsCurrentUser, now called from views.js

remove authorIsCurrentUser from views.js
 2014-08-19 10:37:57 +01: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
Steffen van Bergerem
9e32eb370a Remove unused js code for login page 2014-08-19 09:25:48 +02:00
Jonne Haß
8654e1b3ad remove unused variable in i18n.js [ci skip] 2014-08-18 21:09:57 +02:00
Jonne Haß
b582e1f707 i18n.js: Add interface to retrieve entire sections 
And make use of that in HelpView
 2014-08-18 21:06:52 +02:00
damzcodes
c58a56c5fe line breaks have been added to long headings 2014-08-18 14:06:07 +01:00
Jonne Haß
ae24495c7d Merge pull request #5127 from Raven24/hpetru-2875-ignore-user-posts 
Remove ignored peoples posts without refresh (II)
 2014-08-18 11:35:56 +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
Florian Staudacher
4fd9bae056 refactor global event broker and user blocking from stream posts 2014-08-17 14:05:56 +02:00
Steffen van Bergerem
022bc1007d Remove unused code 2014-08-16 11:47:31 +02:00
Jonne Haß
92a6fc9eb5 Add fallback system to frontend I18n system 
Load the default locale and fall back to it on missing key
and interpolation errors
 2014-08-15 13:53:28 +02:00
Jonne Haß
0127852936 Merge pull request #5112 from svbergerem/login-redesign 
Redesign login page

Conflicts:
	Changelog.md
 2014-08-15 11:44:05 +02:00
Jonne Haß
691594e0fd Merge pull request #5119 from svbergerem/people-search-fix-aspect-membership 
Fix aspect membership dropdown on people search page
 2014-08-15 03:22:54 +02:00
Steffen van Bergerem
0d064cbefe Redesign login page 2014-08-15 00:46:20 +02:00
Steffen van Bergerem
ae3dec0167 Fix aspect membership dropdown on people search page 2014-08-15 00:16:11 +02:00
Błażej Pankowiak
7ff0776d59 Move color to it's real home 2014-08-14 21:54:24 +02:00
Błażej Pankowiak
ede042f6cd Make new aspect popup Bootstrap compatible 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
f085436160 Port aspect edit pane to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
2424301112 Port Community Spotlight to Bootstrap 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
19bcf103aa Style selected aspect 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
64537f8763 Center remove buttons vertically 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
d0cbde2394 Style aspect controls 2014-08-14 21:09:58 +02:00
Błażej Pankowiak
0ad658f98c Port main Contact page to Bootstrap 2014-08-14 21:09:57 +02:00
Pablo Cuadrado
a74a02929d max-width for profile avatar 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
83b1682750 removed border in tags, checkboxes centered inside the well classes 2014-08-14 04:53:20 -03:00
Pablo Cuadrado
9e34887712 profile edit page ported to bootstrap 2014-08-14 04:49:49 -03:00
Pablo Cuadrado
855597541a user account edit page fully ported to bootstrap 2014-08-14 04:49:49 -03: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
Florian Staudacher
163b76ae3d Merge branch '2875-ignore-user-posts' of https://github.com/hpetru/diaspora into hpetru-2875-ignore-user-posts 
Conflicts:
	Changelog.md
 2014-08-13 14:30:28 +02: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
9636f372a4 inserted line breaks and wrote a test for app.views.Content.smallPhotos 2014-08-03 17:17:12 +02:00
Faldrian
7a4dbc8b67 fixed ugly comment 2014-08-03 16:00:11 +02:00
Faldrian
a3811f767c style fixes for prev / next buttons 2014-08-03 15:53:38 +02:00
Faldrian
172bc80ec1 thumbnails scroll to currently selected image smoothly 2014-08-03 15:32:57 +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
9d02b0a586 remove first thumbnail; duplicate of big photo 2014-08-03 12:47:44 +02:00
Faldrian
a2a37742e4 added keyboard shortcut help topic 2014-08-01 22:13:55 +02:00
Jonne Haß
ddb80ad366 Merge pull request #5077 from svbergerem/bootstrap-people-search 
Port people search to Bootstrap

Conflicts:
	app/assets/stylesheets/application.css.sass
 2014-07-30 19:07:35 +02:00
Jonne Haß
6c6efd6e9a Merge pull request #5069 from TeamOmniaExtares/bugfix_remove_bootstrap_for_SPV_comments 
Bugfix remove bootstrap for spv comments Issue #4425
 2014-07-30 19:02:10 +02:00
Steffen van Bergerem
f615ad3115 Port people search to Bootstrap 2014-07-20 18:21:13 +02:00
lyzellis
bdc5c1f958 changes border color to dark grey and removes box shadow for textareas and text inputs on focus 2014-07-18 17:27:41 -07:00
Utah Kate Newman
a282a37a8c revised argument order and changed colors to color variables defined in colors.css.scss 2014-07-08 17:45:52 -07:00
Jonne Haß
fe1d1bd7a8 Merge pull request #5056 from arlogn/login-podname-size-flexible 
Flexible font-size for huge text in sign_in page
 2014-07-07 09:03:48 +02:00
arlogn
2394c3df39 flexible font-size for sign_in podname huge text 2014-07-06 19:18:21 +02:00
Błażej Pankowiak
a9b0412982 Remove text shadow from the button 2014-07-06 13:03:26 +02:00
Błażej Pankowiak
0d0ed4db28 Port Getting Started page to Bootstrap 2014-07-04 18:06:49 +02:00
Utah Kate Newman
7f2b3d3bf3 replaces blue comment box border and box shadow with gray border and no box shadow 2014-07-02 16:31:29 -07:00
Florian Staudacher
13b716a449 allow admins to close user accounts from the backend 
* thanks to @maxwell for the initial work on this

port admin pages to bootstrap
* improve user view on admin search page
* add 'close account' link to each user in the search results
* keep the same blue color for the admin menu

some refactoring of the routes and the admin code
* try to be more RESTful (possibly)
* use a 'UserSearch' model for search parameters and querying

add changelog entry
 2014-07-01 23:33:15 +02:00
Jonne Haß
5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix 
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
 2014-07-01 14:49:53 +02:00
Jonne Haß
12c507d6a2 Merge pull request #5048 from kpcyrd/fix-5031 
Fix self-xss issue in contact-group-rename
 2014-07-01 14:44:41 +02:00
Jonne Haß
f86b19efee Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix 
[4703] Minor style fix for user menu
 2014-07-01 14:17:04 +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
kpcyrd
6833ca46bb Fix broken aspect-edit sidebar update 2014-07-01 00:33:17 +02:00
kpcyrd
20ffa8fa13 Fix another self-xss issue 2014-07-01 00:12:26 +02:00
kpcyrd
fb4898c4fa Fix self-xss issue in contact-group-rename 2014-06-30 21:32:46 +02:00
Pablo Cuadrado
4232d830ee left padding added, unnecesary cursor pointer removed 2014-06-29 18:24:54 -03:00
Pablo Cuadrado
7aa1028cbe minor style fix for user menu 2014-06-29 15:12:30 -03:00
Hincu Petru
1d09978440 Fix hidding of poll publisher for close action 2014-06-25 10:54:00 +00:00
Hincu Petru
653612b74d Remove posts for ignored person 2014-06-25 08:56:12 +00:00
Jason Robinson
126ced4383 Fix broken bookmarklet if params have encoded linefeeds. 
Closes #4994
 2014-06-22 11:48:24 +03:00
Lukas Matt
c86b57fe8f Fixed overridden interactions by re-initializing 2014-06-18 13:03:07 -04: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
Jason Robinson
ad0982f35e Remove custom bookmarklet error message. 
Flash error is shown on bookmarklet post error. On error, return post_something message to form
 2014-06-01 15:37:54 +03:00
Jason Robinson
f130ab3842 Remove double setButtonsEnabled in publisher error 2014-06-01 15:17:16 +03:00
Jason Robinson
6cf484c9a3 Make sure publisher is totally hidden in bookmarklet after post success 2014-06-01 15:02:40 +03:00
Jason Robinson
8fead54ab6 Make publisher spinner also work in bootstrap publisher 2014-06-01 14:52:59 +03:00
Jason Robinson
128be9204c Refactor UI hint on status message submit. 
Now we close the publisher on submit and reopen it on error. The spinner is shown while submission is in progress. Fixes #4949
 2014-06-01 14:25:34 +03:00
Jason Robinson
6fd4894997 Add error flash message to publisher on error from server 2014-06-01 13:21:45 +03:00
Jason Robinson
b73e478e26 Add spinner to publisher when posting a message 
Fixes #4949
 2014-05-31 21:05:36 +03:00
flaburgan
db18d9810c Realign check icon in aspect dropdown 2014-05-27 00:03:20 +02:00
Erwan Guyader
24d2ac0ec2 4967 Use https to load the location form OSM 2014-05-26 11:34:01 +02:00
Jonne Haß
e6348aa705 Use toggle() to hide the poll creator 2014-05-24 21:40:48 +02: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
Jonne Haß
ecb1b80e24 Render flash message content with .text 
.html does not escape any html input in these, leading to XSS
attack vectors.

Thanks to A Kai (@sixhundredns) for reporting the related issues.
 2014-05-24 16:08:32 +02:00
Lukas Matt
6d6ebd297e Do not try to render posts/comments which are not present 
refs diaspora/diaspora#4959
 2014-05-16 09:48:14 -04:00
Lukas Matt
7ef802127e Added confirm-dialog to report-delete-button 
* changed button description
* replaced links with buttons
 2014-05-15 07:23:44 -04:00
Lukas Matt
693986bba0 Fixed report icon in single post view 2014-05-15 07:23:44 -04: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
218845d5b4 Changed and renamed database columns 
* changed user_id type to integer
* renamed post_id to item_id
* renamed post_type to item_type
 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
6f65ef8437 Using save for report model 
Instead of checking the status code I am using success and
error callbacks from model-save. In that case we have to return
json in the controller for signaling that the request was sucessfully.
 2014-05-15 07:23:43 -04:00
Lukas Matt
2e36f8d375 Diaspora review part 1 
* join the conditions of the inner ifs
* add a uniqueness constraint to the model
* differentiate between author is a local or a remote user
* simplify controller/mailer functions
 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
d23f4a66da Cleaned javascript report view 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
Jason Robinson
62b5fea526 Merge pull request #4932 from Raven24/fix-bookmarklet 
port bookmarklet to Backbone.js, use gon for params
 2014-05-01 13:29:36 +03:00
Florian Staudacher
9da3bc347b disable publisher after successfully posting in standalone mode 2014-04-25 19:51:45 +02:00
Florian Staudacher
0d51bba959 port bookmarklet to Backbone.js, use gon for params (fixes #4931) 2014-04-19 17:41:21 +02:00
flaburgan
b1f59a9b53 Switch back from Roboto to Helvetica on bootstrap pages 2014-04-18 18:34:25 +02:00
Steffen van Bergerem
232e4fa236 Improve set read/unread in notifications dropdown 2014-04-16 23:33:22 +02:00
Steffen van Bergerem
e1685c9a29 Remove auto 'mark as read' for notifications 2014-04-15 14:51:38 +02:00
flaburgan
a4886fa77b SPV: Improve padding and interaction counts 2014-04-13 11:27:12 +02:00
flaburgan
86e71cd1b6 fix registration test 2014-04-11 20:25:58 +02:00
flaburgan
438ebc839f Fix scroll in the drawer nav 2014-04-11 19:02:26 +02:00
flaburgan
a9b9420214 Fix header search bar in safari 2014-04-11 19:02:25 +02:00
flaburgan
e4244f01f5 Remove span12, main content now expand smoothly and the drawer become correctly displayed even in big resolution 2014-04-11 19:02:25 +02:00
flaburgan
c25ae02ff2 Remove mobile footer 2014-04-11 19:02:25 +02:00
flaburgan
53b1f9effd Fix search field in the header of the mobile version 2014-04-11 19:02:25 +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
Jonne Haß
79bc1a7800 Merge pull request #4906 from hpetru/4903-poll-crash-spv 
Fixed 4903 and not render vote form when user is not logged
 2014-04-05 19:17:31 +02: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
f356ae7216 Add poll in post preview 2014-04-04 11:45:33 +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
Hincu Petru
fed5ea8cda Refactored poll_view.js 2014-04-02 16:19:07 +00:00
Jonne Haß
211963d320 Merge pull request #4889 from hpetru/4874-malformed-url 
Catch error from decodeURI for prevent crash in posts parsing
 2014-04-01 00:49:27 +02:00
Hincu Petru
552310796c Catch error from decodeURI for prevent crash in posts parsing 2014-03-31 20:24:47 +00:00
Jannik Streek
4130592ca5 fixed bookmarklet 2014-03-31 18:30:01 +02:00
Jannik Streek
6f3844b73b fixed language files, added rails cache counter for poll answer, fixed bug with same poll input for form 2014-03-31 18:14:08 +02:00
Jannik Streek
4174b88987 percentage result round + minor language fix 2014-03-31 18:14:08 +02:00
Jannik Streek
2d0abbae23 added jasmine test for poll view 2014-03-31 18:14:07 +02:00
Jannik Streek
8f9736a741 fixed poll js bug 2014-03-31 18:14:07 +02:00
Jannik Streek
9c24365fde changed poll result + some minor text improvements 2014-03-31 18:14:07 +02:00
Jannik Streek
c484b2cd0c fixed poll icon issue, improved code, poll in bookmarklets now available 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
Jannik Streek
04199837b3 poll creation done 2014-03-31 18:14:07 +02:00
Jannik Streek
18a43295b7 poll form completed 2014-03-31 18:14:06 +02:00
Jannik Streek
c02414c36d fixed wrong indenting and broken messages tab for polls 2014-03-31 18:14:06 +02:00
Jannik Streek
fe67bdf2e7 added tests for poll federation and impl for the federation itself. Still in progess 2014-03-31 18:14:06 +02:00
Jannik Streek
dfbe17d046 Poll input fields and data model now available 
question field of poll now in db

fixed merge issues
 2014-03-31 18:14:06 +02:00
Jonne Haß
b207077405 Merge pull request #4859 from hpetru/4848-aspect-memberships-in-notification-dropdown 
Fixed jQuery evenets in notifications-badge
 2014-03-31 13:58:11 +02:00
Hincu Petru
b43e56485d Fixed jquery event listener from notifications-badge.js 2014-03-31 09:52:07 +00: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
Jonne Haß
07aec2a630 Merge branch 'hpetru-4864-ui-bug-when-tag-is-long' into develop 2014-03-30 13:39:32 +02:00
Hincu Petru
699f327762 Long tags are no longer cut off in the post streams 
Fixed in streams
 2014-03-30 13:37: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
Jonne Haß
ab15bad53f Merge pull request #4858 from hincupetru/4514-clicking-show-more-comments-empties-textarea 
Save textarea value before rendering comments when clicked 'show more....'
 2014-03-24 14:56:45 +01:00
Steffen van Bergerem
cd241ee94d Hovercards! Everywhere! 2014-03-23 01:15:26 +01:00
Steffen van Bergerem
d9857a3a10 Add separator between days, don't display grey zero 2014-03-20 00:23:38 +01:00
Steffen van Bergerem
4fc9c6416e Port notifications to Bootstrap 2014-03-19 18:45:52 +01:00
Steffen van Bergerem
eabdc7390c Port aspect membership dropdown and hovercards 2014-03-19 17:54:22 +01:00
Hincu Petru
1cef3e42ce I save textarea value before rendering comments when clicked 'show more..' 2014-03-19 12:36:04 +00:00
Jonne Haß
835608f06f Merge pull request #4856 from hincupetru/3692-hashtags-inside-markdown-link 
Check if the hashtag is a link in function .hashtagify
 2014-03-16 14:39:20 +01:00
Hincu Petru
694dc7d80b Check if the hashtag is a link in function .hashtagify 2014-03-16 11:59:49 +00:00
Jonne Haß
cfca0e88f1 Revert "Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link" 
This reverts commit 06ab498620, reversing
changes made to 3c4d8d95d3.

Conflicts:
	Changelog.md
 2014-03-15 21:08:54 +01:00
Jonne Haß
f2fedea3db Merge pull request #4853 from hincupetru/4693-notifications-hovercard-avatars-misaligned 
Fixed "hovercard avatars misaligned in notifications drop-down"
 2014-03-15 19:15:08 +01:00
Jonne Haß
06ab498620 Merge pull request #4847 from hincupetru/3692-hashtags-inside-markdown-link 
Solved problem with hashtags inside markdown links
 2014-03-15 19:12:37 +01:00
Hincu Petru
638744b914 Fixed #4693 2014-03-15 15:25:18 +00:00
Hincu Petru
7c4d783d51 Check if the hashtag is a link in function .hashtagify 2014-03-14 15:49:41 +00:00
flaburgan
027650e856 Add handle indication on search page, improve design 2014-03-13 23:01:42 +01:00
Steffen van Bergerem
0241d9c7db use fixture 2014-03-10 17:21:54 +01:00
Steffen van Bergerem
1b85d9d032 Use a button instead of input to submit, use smaller photos 2014-03-10 15:15:40 +01:00