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

1141 commits

Author SHA1 Message Date
Steffen van Bergerem
4cc1b40443 Only remove photos from view when destroyed on server 2014-12-01 00:36:56 +01:00
Steffen van Bergerem
f6fbbbb5f6 Move tag prefill to Backbone, add tests 2014-11-30 17:14:05 +01:00
taro-k
b01026f9b8 pre-fill tag page form with the tag #4234 2014-11-30 14:15:45 +01:00
Steffen van Bergerem
b275b2edbc Merge pull request #5435 from SansPseudoFix/5329-fix-mention-popup-hidden 
A temporary fix for mention modal #5329
 2014-11-30 13:48:24 +01:00
SansPseudoFix
90b9f227d8 A temporary fix for mention modal #5329 
A temporary fix for mention modal #5329

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss

	modified:   app/assets/stylesheets/bootstrap-fix.css.scss
 2014-11-29 17:36:46 +01:00
Faldrian
29f55f42b6 truncate long opengraph description to 250 chars in mobile and stream view 2014-11-29 17:18:01 +01:00
Jonne Haß
544501a0e6 Merge pull request #5418 from svbergerem/publisher-counter-style-fix 
Fix character count placement for publisher
 2014-11-29 16:11:45 +01:00
Steffen van Bergerem
389edbe3aa Don't display undefined handle in search widget 2014-11-27 16:57:32 +01:00
Jonne Haß
49dfc27011 Merge pull request #5421 from Zauberstuhl/optimize_jsxc_login_process 
Optimize jsxc login process and bump jsxc version
 2014-11-24 23:01:03 +01:00
Steffen van Bergerem
77b627dbe9 Merge pull request #5419 from SansPseudoFix/add-handle-search-terms 
Add handle search terms
 2014-11-24 18:09:02 +01:00
Lukas Matt
ef29de8176 Configure form element and move xmpp config 2014-11-24 17:19:57 +01:00
Lukas Matt
0d4da2fba8 Login function deprecated 
related to diaspora/jsxc#50
 2014-11-24 17:19:30 +01:00
Lukas Matt
44bc48ad5e Remove debug output on default 2014-11-24 17:19:09 +01:00
SansPseudoFix
322ca4dac0 display handle for search bar 
fix margin and color

hidden overflow for long handle and names

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss

add min width 300px

	modified:   app/assets/javascripts/widgets/search.js
	modified:   app/assets/stylesheets/autocomplete.css.scss
 2014-11-24 13:17:57 +01:00
Steffen van Bergerem
8cb6e242bf Fix character count placement for publisher 2014-11-23 18:36:05 +01:00
Jonne Haß
137e60ca51 Merge pull request #5400 from Faldrian/5003-fix-more-button-mobile 
Fix for "more" link on mobile view
 2014-11-22 19:06:31 +01:00
Jonne Haß
6a034f172b Merge pull request #5401 from Faldrian/4721-adjust-bootstrap-headerbar-like-blueprint 
fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error
 2014-11-22 19:00:55 +01:00
Jonne Haß
32c5508f3d Merge pull request #5408 from Zauberstuhl/show_roster_minimized 
Display chat box minimized on default
 2014-11-22 18:58:16 +01:00
Jonne Haß
9b49df80a5 Merge pull request #5409 from svbergerem/chat-extra-padding-for-roster 
Chat: add extra padding for the roster
 2014-11-22 18:57:51 +01:00
Steffen van Bergerem
8f956383bd Merge pull request #5407 from SansPseudoFix/5251-add-contact-dropdown-hidden 
Issue #5251: fix hidden overflow
 2014-11-22 16:38:16 +01:00
SansPseudoFix
66b76024ed Issue #5251: fix hidden overflow 
modified:   app/assets/stylesheets/getting-started.css.scss

	modified:   app/assets/stylesheets/getting-started.css.scss
 2014-11-22 15:01:20 +01:00
Steffen van Bergerem
472d65cb61 Chat: add extra padding for the roster 2014-11-21 23:29:06 +01:00
Lukas Matt
5fee67e5e7 Display chat box minimized on default 
Currently it slides in if you login. with time it is annoying
 2014-11-21 21:56:27 +01:00
Praveen Arimbrathodiyil
6378af5417 remove execution permissions from images and css 2014-11-20 23:38:36 +05:30
Faldrian
328a515dbe fixed margins and fonts in headerbar. fixed bootstrap2 placeholder error 2014-11-16 18:19:32 +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
Lukas Matt
e40cf25177 Swap aspect chat privilege title 2014-11-13 14:38:23 +01:00
Lukas Matt
38a238eb36 Set chat-flag for every aspect manually 
On default none is permitted to chat with you.
You have to set extra privilege for an aspect.
 2014-11-13 11:21:21 +01:00
Lukas Matt
50a7541d14 Include jsxc deps and initialize the client on login 2014-11-13 11:17:19 +01:00
Jonne Haß
e68704890e make sure to import perfect scrollbar plugin before our own mixins 
otherwise it overrides the border-radius mixin with an incompatible one
 2014-11-09 20:31:24 +01:00
Jonne Haß
404a286588 Merge pull request #5355 from Chocobozzz/header-logo-hover 
Replace the black header logo with the white logo on hover
 2014-11-09 18:55:59 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01:00
Faldrian
d928c69e36 Fix: displaying more than one row of image attachments broke publisher 2014-11-07 16:37:52 +01:00
Steffen van Bergerem
25e4e558c5 Ask for confirmation when leaving a submittable publisher 2014-11-02 01:49:33 +01:00
Chocobozzz
e411a344f4 Commit the new branding sprite 2014-10-21 17:14:25 +02:00
Paul Hill
ac4607d75c LibreJS should work with most of the site 2014-10-21 02:48:18 +01:00
Chocobozzz
1aff0d8c2c Add header logo when hoovered (white logo) 2014-10-18 22:24:05 +02:00
Jonne Haß
ef71c57190 Merge pull request #5342 from AugierLe42e/sass-to-scss 
Refactor application.css and bootstrap-headerfix.css
 2014-10-14 19:42:31 +02:00
Augier
cdf4fc05df Refactored the two last sass files in scss. #3796 2014-10-14 17:47:52 +02:00
Jonne Haß
4e6eacbeb1 Update _.template calls to undscore.js 1.7 2014-10-14 15:04:01 +02:00
Jonne Haß
1c0cf98958 Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown 
Notifications Dropdown infinite scrolling
 2014-10-14 13:37:55 +02:00
Jonne Haß
e5b20106c6 Merge pull request #5279 from svbergerem/overflow-long-names-tag-page 
Hidden overflow for long names on tag pages

Conflicts:
	Changelog.md
 2014-10-14 13:30:22 +02: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
flaburgan
476f694bca Remove one border-bottom on the photo page 2014-10-08 19:40:06 +02:00
Sandip Trivedi
215fc1c96b Replaced jquery.idle-timer.js vendored asset with a bower package #5194 2014-10-08 00:00:14 -04:00
Jonne Haß
518186a538 Merge pull request #5299 from strivedi183/5194-replace_jqueryplaceholderjs_vendored_asset_with_bower_package 
Replaced jquery.placeholder.js vendored asset with bower package and updated to latest version #5194
 2014-10-07 14:40:47 +02:00
Steffen van Bergerem
d04cf7046b Fix pagination for people/guid/contacts 2014-10-07 10:55:58 +02:00
Sandip Trivedi
2af32220a5 Replaced jquery.placeholder.js vendored asset with a bower package #5194 2014-10-07 00:46:24 -04:00
Jonne Haß
803c257ecf Merge pull request #5297 from strivedi183/5194-replace_jquerytextchangejs_vendored_asset_with_bower_package 
Replaced jquery.textchange.js vendored asset with a bower package #5194
 2014-10-07 02:43:06 +02:00
Sandip Trivedi
d7e8e2ce2c Replaced jquery.textchange.js vendored asset with a bower package #5194 2014-10-06 18:54:50 -04:00
jaideng123
bd24d6bebe Added cucumber test for notifications dropdown 2014-10-06 13:55:46 -05:00
flaburgan
82a8673a36 Add margin to reshare 2014-10-06 20:00:07 +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
Steffen van Bergerem
65e9e1c744 Hidden overflow for long names on tag pages 2014-10-04 22:58:57 +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
jaideng123
2b6ac9261b Notifications Dropdown now infinite scrolls 2014-09-29 16:30:36 -05:00
Florian Staudacher
926556c145 fix profile badge too much margin [ci skip] 2014-09-18 22:30:57 +02:00
jaideng123
b448f92c61 Fixed deformation of getting started popovers 2014-09-17 21:13:22 -05:00
Florian Staudacher
fe0f8df9c9 add a 'css mutex' for cuke failures 2014-09-17 14:36:04 +02:00
Florian Staudacher
300496090b add the publisher back to ones own profile, fix some cukes 2014-09-16 02:16:14 +02:00
Florian Staudacher
a5da2ca48c small fixes and more jasmine specs 2014-09-15 01:37:24 +02:00
Florian Staudacher
10609c3692 fix jasmine and add some specs for direction detection 2014-09-15 01:37:23 +02:00
Florian Staudacher
be86014540 rspec should now be running a green build 2014-09-15 01:37:23 +02:00
Florian Staudacher
89d468cdcc first round of specs and code cleanups/fixes 2014-09-15 01:37:23 +02:00
Florian Staudacher
e4ee28885a make photos page work with backbone 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
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