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

972 commits

Author SHA1 Message Date
Steffen van Bergerem
7c777ca904 Merge branch 'stable' into develop 2015-10-02 23:42:36 +02:00
augier
22882aa24d Infinite scroll triggered relative to last element top rather than window bottom 
closes #6451
 2015-10-02 23:42:26 +02:00
Steffen van Bergerem
a5ca78bc87 Fix post preview with location 2015-09-27 03:03:28 +02:00
Steffen van Bergerem
9d6ce5b110 Merge pull request #6336 from AugierLe42e/clean-publisher 
Cleaning publisher
 2015-09-26 00:49:34 +02:00
augier
c3ddd4c086 Cleaning publisher a bit + responsive styling 2015-09-24 08:54:19 +02:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm 
5813 show geolocation on osm
 2015-09-23 01:43:49 +02:00
augier
f00f3965ff Styling main stream 2015-09-18 19:13:49 +02:00
Steffen van Bergerem
953b03d086 Fix adding the first comment in the mobile view 2015-09-12 14:52:18 +02:00
Steffen van Bergerem
7bcccde9f4 Merge pull request #6383 from AugierLe42e/improve-mobile-conversations-design 
[Quickfix] Improve mobile conversations design
 2015-09-12 12:20:59 +02:00
augier
44d71c3905 Improve mobile conversations design 2015-09-11 23:17:02 +02:00
realtin
1cdcc50c63 fix all the pronto remarks finally 
- fix map controls in stream
 2015-09-11 10:24:39 +02:00
Praveen Arimbrathodiyil
927480956f switch back to jquery-colorbox 
they provide the same assets and name change was not intentional
 2015-09-10 22:42:18 +05:30
realtin
52fac5740e fix indentation & jshint predefines 
according to svbergerem's annotations
 2015-09-10 14:48:25 +02:00
zaziemo
263dc6f119 refactor code that choses the tile server based on podmin's choice 
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
 2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University 
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
 2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer 
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
 2015-09-09 12:26:47 +02:00
zaziemo
e5cc8dff0e outsource map credentials 
and allow podmin to enable and disable the feature
(#5813)
 2015-09-09 12:25:45 +02:00
realtin
6716b4c175 rename location_view to locator 
because it is confusing with the other location files
 2015-09-09 12:25:45 +02:00
zaziemo
dc25c01bcd add a different map representation to the SPV 
so a small map is rendered in the SPV and a location is provided
via toggling the map gets bigger

(#5813)
 2015-09-09 12:25:19 +02:00
Julia
c0f909d228 add map to header 
and add toggle map function
to show and load map only when user is clicking on address

(#5813)
 2015-09-09 12:23:38 +02:00
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ß
f9a452265d Merge branch 'stable' into develop 2015-09-07 13:35:56 +02:00
Lukas Matt
e57bdeed19 Set onlineHelp link in jsxc options 
related to diaspora/jsxc#125

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>

closes #6388
 2015-09-07 13:35:51 +02:00
Lukas Matt
a40a34ee8c autoLang default value is true 
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-09-07 13:35:49 +02:00
Steffen van Bergerem
426f55e685 Merge branch 'stable' into develop 2015-09-05 16:12:00 +02:00
sjain1107
928576bc88 6306-add-spinner-on-initial-stream-load 
closes #6384
 2015-09-05 16:11:09 +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
Dennis Schubert
4f2f3cca59 Merge branch 'stable' into develop 2015-08-29 21:44:31 +02:00
Steffen van Bergerem
1874c37706 Fix back-to-top backbone view 
closes #6360
 2015-08-29 21:44:24 +02:00
Jonne Haß
bf92a7441e Bump selenium-webdriver, implement aspect sorting cucumber step with selenium API 2015-08-29 15:58:08 +02:00
Steffen van Bergerem
696eebbe5d Add mobile comment box only once 2015-08-29 15:21:44 +02:00
Steffen van Bergerem
cd602c19fd Fix i18n spec 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
3bc5b673c6 Refactor mobile comment js code and add tests 2015-08-29 14:46:20 +02:00
Steffen van Bergerem
5b918606fa Display mobile reaction box only once 2015-08-29 14:33:42 +02:00
augier
3a5406a6e1 Styling of mobile header compilant with desktop version 2015-08-28 20:30:07 +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
Jonne Haß
a30ba5697e Merge pull request #6290 from Raven24/pod_test 
test pods for connectivity
 2015-08-27 11:38:18 +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
Steffen van Bergerem
0df0926739 Convert BackToTop to a backbone view 2015-08-25 04:17:24 +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
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
Steffen van Bergerem
40ef382a6e Merge branch 'stable' into develop 2015-08-22 01:35:32 +02:00
Anton Tkachov
ef6c8a5448 Issue #6180: Update stream faces block if somebody was blocked 
closes #6320
 2015-08-22 01:35:23 +02:00
Lukas Matt
dbc57d9371 Load bower dependencies on jsxc initialization 
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-08-21 12:43:50 +02:00
Jonne Haß
b4923cc17c Merge pull request #6276 from Zauberstuhl/fix_broken_jsxc 
bump diaspora_jsxc to v0.1.2
 2015-08-19 10:18:22 +02:00
augier
281d1a9161 Rebasing and fixing tests 2015-08-11 18:12:02 +02:00
Steffen van Bergerem
e8acaa08ad Remove browser detection 2015-08-10 22:55:05 +02:00
Steffen van Bergerem
8bc86eb98b Replace jquery.autocomplete with typeahead.js 2015-08-10 22:55:05 +02:00
Steffen van Bergerem
0aa453e437 Merge pull request #6291 from AugierLe42e/change-actions-icons-mobile 
Use entypo icons on mobile posts
 2015-08-06 18:00:03 +02:00
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +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
Lukas Matt
524a0bdaf0 Obsolete with diaspora/jsxc#113 
Using the logout element caused some trouble in the past

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-30 22:41:47 +02:00
Lukas Matt
9a96836594 Load bower dependencies on jsxc initialization 
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
 2015-07-30 22:40:19 +02:00
Steffen van Bergerem
e402bbdd3d Merge pull request #6245 from AugierLe42e/fix-nsfw-author 
Fix nsfw author
 2015-07-30 00:28:15 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
fla
4aef8de571 Improve mobile drawer 2015-07-29 14:22:19 +02:00
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts 
closes #6266
 2015-07-29 12:08:35 +02:00
Jonne Haß
4abc0c5988 Merge branch 'stable' into develop 2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465 Update backbone.js 
closes #6262
 2015-07-29 10:04:18 +02:00
Steffen van Bergerem
a2349052f4 Use autosize for mobile publisher 2015-07-28 20:15:11 +02:00
Steffen van Bergerem
1c11b374bf Remove mbp-helper 2015-07-28 19:50:17 +02:00
Jonne Haß
d62c4387f3 Merge branch 'stable' into develop 2015-07-28 18:24:19 +02:00
cmrd Senya
fa411c73a7 Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js (#5939). 
closes #6257
 2015-07-28 18:24:10 +02:00
Jonne Haß
6ee3843449 Merge branch 'stable' into develop 2015-07-26 13:11:49 +02:00
theworldbright
d724397168 Refactor posts controller 2015-07-26 12:58:42 +02:00
Steffen van Bergerem
04191996a5 Add updates for 'only sharing' and 'all contacts' 2015-07-24 14:18:43 +02:00
Steffen van Bergerem
4a178e20e5 Update number of contacts on contact page when adding/removing contacts 2015-07-24 02:38:49 +02:00
Jonne Haß
2cede713b1 Merge pull request #6228 from svbergerem/refactor-publisher-js 
Refactor publisher_view.js
 2015-07-22 20:59:35 +02:00
Steffen van Bergerem
3d6918646e Add js for aria-labelledby in conversations 2015-07-22 18:37:02 +02:00
Steffen van Bergerem
44c370513e Refactor publisher_view.js 2015-07-22 17:36:25 +02:00
Steffen van Bergerem
484e70a68f Add dashboard to admin page 2015-07-21 14:36:41 +02:00
Dennis Schubert
b4bc7d8198 Merge branch 'stable' into develop 2015-07-20 03:56:59 +02:00
Steffen van Bergerem
cf4143f4a1 Remove jquery-idletimer 2015-07-20 03:51:03 +02:00
Steffen van Bergerem
295c8533a1 Fix profile visibility icon 2015-07-17 14:37:22 +02:00
Jonne Haß
397845161f Merge pull request #6162 from cmrd-senya/5684-public-additional-profile 
Allow additional profile fields (previously private profile) to be set public (new updated version)
 2015-07-11 10:19:19 +02:00
cmrd Senya
7a5a0a909a Allow extended profile fields (previously private profile) to be set public (#5684). 
This adds a new boolean field "public_details" to person model.
By default it is false and represents old behaviour. When it is
set to true, extended profile (bio,location,gender,birthday)
get available to people who didn't log into diaspora and to
people you don't share with (i.e. it is made public).

In UI, a bootstrap-switch added on the profile-edit page in order to
change the setting.

This also changes wording from public/private profile to basic/extended.
The latter could be public and limited.
 2015-07-11 04:36:45 +03:00
Dennis Schubert
aa86003cf9 Keep the hacky scope workaround in comments.js 
because we still are supporting browsers without .bind() and I do not
want to break the patterns here.

Follow up to #6171 - I wanted to avoid feedback loop delays for that
little change.
 2015-07-09 03:24:15 +02:00
Spanti Nicola (RyDroid)
df440ed8d8 Very minor changes of some JS files 2015-07-08 19:09:08 +02:00
Jonne Haß
69974bdc13 Merge pull request #6161 from svbergerem/fix-conversation-modal 
Fix two modal issues
 2015-07-03 20:26:31 +02:00
Steffen van Bergerem
61edda0fca Aspect creation modal now creates an aspect when pressing enter 2015-07-03 18:20:32 +02:00
Steffen van Bergerem
db00bd1b03 Fix conversation modal on contacts page 2015-07-03 17:44:12 +02:00
Steffen van Bergerem
aeda8e37e3 Remove aspects-dropdown.js 2015-07-03 16:56:25 +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
Jonne Haß
a2d894cb39 Improve stability for manages_aspects.feature:79 
page.execute_scripts looks to be asynchronous, .synced is already set
by default, so the previous expectation would be fulfilled before
the script got to run, running into the page reload in the next step
which then aborts or hasen't seen the to be triggered request yet.

The fix is to use Capybaras drag_to instead
 2015-06-24 04:01:15 +02:00
Steffen van Bergerem
df12878371 Fix overflow with perfect scrollbar 2015-06-22 00:44:42 +02:00
Steffen van Bergerem
049c8eb384 Bootstrap header rewrite 2015-06-20 00:38:40 +02:00
theworldbright
5fa4519e93 Fix #5757 (+2 squashed commits) 
Squashed commits:
[e10acde] Open reactions after commenting
[aceea75] Fix hound remarks and reactions tests
The ".comment_action" should be active when the
user clicks on "a.show comments"

[d1deae5] Fix hound remarks
[f5db5dd] Keep current instead of scrolling to first comment
[be63092] Remove unused evt parameter
 2015-06-17 22:23:25 +09: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
Jonne Haß
50dbe0db80 Merge pull request #6102 from svbergerem/close-account-regression 
Fix Bootstrap 3 regression: close account
 2015-06-14 22:21:11 +02:00
Steffen van Bergerem
92a3dd53f0 Replace jquery.autoresize with autosize 2015-06-14 20:03:15 +02:00
Steffen van Bergerem
4534ba5de8 Fix Bootstrap3 regression: close account 2015-06-14 13:22:39 +02:00
Steffen van Bergerem
18a8211cc3 Add img-responsive to image class 2015-06-12 00:01:56 +02:00
Jonne Haß
72bb85eeba Merge branch 'stable' into develop 2015-06-08 16:59:31 +02:00
Steffen van Bergerem
5516926b74 Update perfect-scrollbar 
closes #6085
 2015-06-08 16:59:27 +02:00
Steffen van Bergerem
6c32fa7845 Fix Bootstrap 3 regression: add email visibility icon to settings page 2015-06-07 22:31:58 +02:00
Steffen van Bergerem
a7446dd5cd Fix progress bar in publisher when uploading images 2015-06-07 03:43:57 +02:00
Steffen van Bergerem
700df9af23 Fix jasmine tests 
Fix notifications jasmine tests
 2015-06-04 18:05:44 +02:00
Steffen van Bergerem
f64eb9ff41 Fix hound remarks 2015-06-04 18:05:44 +02: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
Steffen van Bergerem
46abdbdd1f Style fixes for left navbar in notification view 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ß
146f7eea52 Merge branch 'stable' into develop 2015-05-29 11:42:03 +02:00
Sandip Trivedi
b026a2afe8 Replaces facebox vendored asset with rails gem #5194 
closes #6005
 2015-05-29 11:41:57 +02:00
Dennis Schubert
ba9b947173 Merge branch 'stable' into develop 2015-05-23 01:24:14 +02:00
Benjamin Neff
68f7208ff5 use id from preloaded gon.post to fix broken liking with guid 
closes #5978
 2015-05-23 01:24:09 +02:00
Dennis Schubert
2549f44b7c Merge branch 'stable' into develop 2015-05-19 03:00:56 +02:00
Benjamin Neff
289753e068 add "original post deleted" message on single post view 
closes #5968
 2015-05-19 03:00:51 +02:00
Dennis Schubert
3446cb2f3f Merge branch 'stable' into develop 2015-05-18 03:31:17 +02:00
Benjamin Neff
a396a246ee remove unused hasPhotos and hasText functions 
- added in a836b06d3e
- removed in 49ea8c8563

closes #5969
 2015-05-18 03:31:11 +02:00
Dennis Schubert
3ae370780c Merge branch 'stable' into develop 2015-05-16 03:42:18 +02:00
Steffen van Bergerem
716952dc0d Put 'email not visible' text into popover/tooltip 
closes #5956
 2015-05-16 03:42:14 +02:00
Dennis Schubert
aac0a2582e Merge branch 'stable' into develop 2015-05-12 04:00:12 +02:00
Steffen van Bergerem
40bb44eb96 Mobile: manage followed tags 
closes #5945
 2015-05-12 04:00:07 +02:00
Dennis Schubert
3f3148af2c Merge branch 'stable' into develop 2015-05-10 02:00:41 +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
Steffen van Bergerem
1428369849 Mobile: Add button to follow/unfollow tags 2015-05-10 01:59:50 +02:00
Florian Staudacher
5c012e7871 limit the parameter length for the GET request to the bookmarklet to ~2000 chars 2015-05-05 18:25:01 +02:00
Jonne Haß
2570d88cc3 Merge pull request #5904 from Raven24/JesseWeinstein-patch-1 
prefill bookmarklet with markdown-formatted content
 2015-05-04 04:10:03 +02:00
Steffen van Bergerem
0cffa00004 Add syntax highlighting for markdown content 2015-05-04 04:04:34 +02:00
Steffen van Bergerem
dd2e1ea29e Use rails-assets for jquery.elastic.js 2015-05-04 03:51:20 +02:00
Steffen van Bergerem
a22127bfb1 Add ctrl+enter shortcut for conversations 2015-05-04 03:38:42 +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
Benjamin Neff
28c9cfdfd4 write cucumber test and add order_id on create 2015-04-28 02:38:28 +02:00
Benjamin Neff
3c09756417 refactoring javascript and controller 
- move to contacts.js
- use json
- move to aspects_controller
- add route
- rewrite test
- fix css in chrome
 2015-04-28 01:57:43 +02:00
Simon Wörner
cee4f1c3cd fixed aspect sorting, added minimal jquery ui, added test 2015-04-26 01:57:00 +02:00
Simon Wörner
4c13fd2b42 Revert "remove aspect sorting logic" 
This reverts commit 8d8d3c649a.

Conflicts:
	app/assets/javascripts/main.js
 2015-04-25 02:16:54 +02:00
Steffen van Bergerem
8e2103e69b Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:26:22 +02:00
Steffen van Bergerem
7648b58c15 Merge pull request #5875 from SuperTux88/add-mumble-protocol 
add mumble protocol to linkify
 2015-04-21 22:17:43 +02:00
Jonne Haß
61c890f274 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 22:02:28 +02:00
Steffen van Bergerem
6bb5e0a29b Only render hovercard if the mouse is still on the username 2015-04-21 22:02:18 +02:00
Benjamin Neff
6cbb959700 add mumble protocol to linkify 
also use double-quotes in the whole file
 2015-04-21 21:16:55 +02:00
Jonne Haß
c8f990359d Merge branch 'release/0.5.0.0-RC' into develop 2015-04-21 20:50:27 +02:00
Steffen van Bergerem
a14713b985 Update markdown-it, disable fuzzy links 2015-04-21 20:50:16 +02:00
Jonne Haß
37ec00f80b Merge pull request #5854 from svbergerem/remove-managing-services-standalone 
Remove 'manage services' link in standalone mode
 2015-04-20 22:36:11 +02:00
Steffen van Bergerem
b885b8583d Remove 'manage services' link in standalone mode 2015-04-08 12:49:05 +02:00
Steffen van Bergerem
75ef9f47d0 Use Bootstrap modal for new aspect form 2015-04-07 10:45:09 +02:00
Jonne Haß
bec2508545 Merge branch 'release/0.5.0.0-RC' into develop 2015-04-03 02:21:59 +02:00
Steffen van Bergerem
3e5eb350ae Notification dropdown: 'mark all as read' link scroll fix 2015-04-03 02:21:06 +02:00
Jonne Haß
0155d8972a Merge pull request #5839 from svbergerem/use-test-instead-of-match 
Use test instead of match wherever possible
 2015-04-01 23:54:42 +02:00
Steffen van Bergerem
f8707e0e1a Use test instead of match wherever possible 2015-04-01 18:35:20 +02:00
Steffen van Bergerem
1701bc30d0 Don't add mentions and reshares to all streams 2015-04-01 16:51:08 +02:00
Steffen van Bergerem
adf9bcf8e8 Update markdown-it 2015-03-26 00:07:25 +01:00
Jonne Haß
73b6c75278 On reshare insert the reshare built from the response 
Also make sure comments_count and the like is always set in the
response.
 2015-03-23 23:02:23 +01:00
Augier
571685d590 Fix the broken searchbar (#5787) 2015-03-16 22:07:51 +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
f4534ec412 Refactor notification badge view (again) 2015-03-15 11:48:06 +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
caf7470e8e Various style fixes 2015-03-15 01:58:29 +01:00
Lisa Passing
a11322fd5d make css nicer 
update Changelog

remove weird merge thing

think of the padding and margin
 2015-03-14 17:00:14 +01:00
Christophe
e2a591249a Replace JQuery slide with transition 
Conflicts:
	app/assets/javascripts/inbox.js
	app/assets/stylesheets/conversations.css.scss
 2015-03-14 14:30:59 +01:00
Augier
0887137262 Add a notification subscribtion to the single post view 2015-03-13 23:27:49 +01:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
Steffen van Bergerem
52c2a73d83 Merge pull request #5707 from AugierLe42e/port-notifications-backbone 
[WIP] Port of notifications.js and notification-badge.js to Backbone part.1
 2015-03-11 17:05:14 +01:00
Steffen van Bergerem
f5bf53a004 Refactor vendor javascript 2015-03-11 15:51:08 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Steffen van Bergerem
1b2b10877a Fix services char counter 2015-03-09 21:18:10 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
3298373a7f Add missing http:// to urls 2015-03-09 01:42:40 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Selman Ercan
35fe6bda68 Issue #5631. Made top and left coordinates of hovercards match those of their parents. 
Added line to changelog for bug fix of issue #5631.

Processing the 'mouseleave' event only if we've left both the parent and the hovercard.

Fixed indentation.

Replaced issue id with pull request id and fixed indentation.
 2015-03-02 09:41:29 +01:00
Steffen van Bergerem
e188782a9a Remove blueprint code 2015-03-02 00:04:57 +01:00
Steffen van Bergerem
c838389b67 Fix invitations and tests 2015-03-02 00:04:56 +01:00
Pablo Cuadrado
b23c0f7ae4 ensuring that the oembed element has the same size of the thumb 2015-03-01 12:04:53 +01:00
flaburgan
741a24bc08 Add tooltip style on post report icon 2015-02-28 16:57:41 +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ß
205f82bfd0 Merge pull request #5648 from Zauberstuhl/jsxc_use_ajax_login 
Adjust jsxc initialization for ajax login
 2015-02-27 15:52:30 +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
Lukas Matt
e484ebc85f Using dot notation for accessing token 2015-02-25 00:11:01 +01:00
Lukas Matt
30685b2709 Adjust jsxc initialization for ajax login 
related to diaspora/jsxc#81
 2015-02-25 00:09:23 +01:00
PIOTR KLOSINSKI
b8be76be3c changed reshare function, so it adds the object to the stream 
tests for reshares

Changelog.md update

fixing a style issue

removed unnecessary semicolon
 2015-02-23 15:44:31 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Faldrian
8f3c03edfa Added dropdown to add/remove people from/to aspects in mobile view 2015-02-15 22:08:15 +01:00
Steffen van Bergerem
9373d5bd20 Fix jasmine tests for new help routes 2015-02-14 19:38:00 +01:00
Augier
aa62266376 Added routing system to open a section in help 2015-02-14 18:05:40 +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
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Steffen van Bergerem
2ec093a54c JSHint boss, evil, loopfunc and scripturl 2015-02-08 23:41:33 +01:00
Steffen van Bergerem
ab6732cac1 JSHint eqeqeq 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
5fa6b8253e JSHint unused and undefined variables 2015-02-08 23:41:32 +01:00
Steffen van Bergerem
a9a480da0a JSHint semicolon errors 2015-02-08 23:41:31 +01:00