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

292 commits

Author SHA1 Message Date
Steffen van Bergerem
4d6c513b8e Refactor post content css, fix margin-bottom for lists in comments 2015-03-22 02:19:36 +01:00
Steffen van Bergerem
e7ec3d495f Refactor and improve sidebar css 2015-03-16 02:03:53 +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
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
d7d9891293 Merge pull request #5722 from AugierLe42e/add-notif-unsubscribe-single-post-view 
Add a notification subscribtion to the single post view
 2015-03-14 00:52:03 +01:00
Augier
0887137262 Add a notification subscribtion to the single post view 2015-03-13 23:27:49 +01:00
Jonne Haß
cc585805ad Merge pull request #5762 from svbergerem/entypo-controls 
Use entypo for control icons
 2015-03-12 19:29:40 +01:00
Steffen van Bergerem
af9d6ddab3 Use handlebars helpers wherever possible 2015-03-12 16:20:32 +01:00
Steffen van Bergerem
0715107735 Remove stream frame template 2015-03-12 14:43:20 +01:00
Marcelo Briones
7be56849d9 DRY on avatars 2015-03-12 09:52:36 -03:00
Steffen van Bergerem
cb30ffc368 Use entypo for post control icons 2015-03-12 13:08:23 +01:00
SansPseudoFix
26ad537a18 fix tag button overflow 
fix tag button overflow

	modified:   app/assets/stylesheets/tag.scss
	modified:   app/assets/templates/tag_following_action_tpl.jst.hbs
 2015-03-12 00:28:31 +01:00
Steffen van Bergerem
73d04b706e Use entypo icons for left navbar 2015-03-09 17:57:50 +01:00
Steffen van Bergerem
b083560266 Improve Bootstrap stream style 2015-03-06 21:59:36 +01:00
Pablo Cuadrado
122fde9093 colliding style removed 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cfff769152 comment button using bootstrap styles 2015-03-01 12:04:52 +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ß
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
Steffen van Bergerem
f37a018b0e Merge pull request #5521 from arlogn/profile-photos-as-thumbnails 
profile photos as thumbnails
 2015-02-14 02:55:57 +01:00
arlogn
43a2a5c336 profile photos as thumbnails 2015-02-14 02:27:32 +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
Faldrian
db6464ed61 Fixed moderation-button-position when viewing reshare 2015-02-03 00:24: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
9de6a26a22 Port contacts page to backbonejs 2015-01-04 17:13:18 +01:00
François Lamontagne
4c33a6adeb Replace %{third_party_tools} by the appropriate hyperlink in tags FAQ (issue #5273) 2015-01-03 13:25:16 -05:00
Steffen van Bergerem
7612f5e939 Remove unused stream template 2014-12-17 16:45:51 +01:00
Faldrian
db13811c2c added scrollbar to bookmark publisher, fixed mention layout bugs 2014-11-07 19:17:54 +01: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
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
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
Florian Staudacher
be86014540 rspec should now be running a green build 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
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