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

754 commits

Author SHA1 Message Date
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
Steffen van Bergerem
6b0a5823e3 Add JSHint javascript linter 2015-02-08 23:41:31 +01:00
Faldrian
5d3145bf8f added avatar error correction on core view rendering 2015-02-08 19:32:50 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00
Steffen van Bergerem
7e5f5964e9 Remove photo export from settings 2015-02-07 14:59:18 +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
Steffen van Bergerem
5e98308b2c Fix aspect dropdown on people search page inserted after initial page load 2015-02-07 11:22: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
b63d8fc679 Fix markdown-it linkify blocking Firefox 2015-01-19 02:09:10 +01:00
Jason Robinson
9282a4ea8f Refactor mobile javascript to get rid of console errors. 
Fixes also mobile bookmarklet services.
 2015-01-17 15:50:06 +02:00
Jason Robinson
5c810a8a2e Merge pull request #5489 from collimarco/solved5482 
Solved #5482
 2015-01-17 03:39:03 +02:00
Steffen van Bergerem
61c17c7896 Add more markdown-it plugins 
activate sanitizer, sub and sup
 2015-01-13 03:41:06 +01:00
Steffen van Bergerem
026773194a Replace pagedown by markdown-it 2015-01-10 18:56:20 +01:00
Jonne Haß
f20020f06b Merge pull request #5473 from svbergerem/contacts-backbonejs 
Port contacts page to backbonejs
 2015-01-06 14:38:55 +01:00
Jonne Haß
d7a3559f4b Merge pull request #5472 from svbergerem/fix-typo-profile-header 
Fix typo in profile_header_view
 2015-01-06 14:37:34 +01:00
Jonne Haß
3f49bc52f4 Merge pull request #5468 from Flaburgan/add-followed-tags-to-mobile-menu 
Add followed tags to the mobile menu

Conflicts:
	Changelog.md
 2015-01-06 14:35:37 +01:00
Steffen van Bergerem
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00