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

1375 commits

Author SHA1 Message Date
Augier
0887137262 Add a notification subscribtion to the single post view 2015-03-13 23:27:49 +01:00
Jonne Haß
2c2b47eae2 Merge pull request #5769 from svbergerem/remove-unused-css 
Remove unused css and reduce blockquote font-size
 2015-03-13 10:44:44 +01:00
Steffen van Bergerem
6dc18ac317 Reduce blockquote font-size 2015-03-13 01:41:14 +01:00
Steffen van Bergerem
84a5992a42 Refactor css code, remove unused code 2015-03-13 01:41:14 +01:00
SansPseudoFix
8dd8daf37e Change overflow-x to overflow for long tag button 2015-03-12 23:46:15 +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
goobertron
b04a2638a5 Add box shadow and radius to 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
Steffen van Bergerem
e99fe86ca0 Merge pull request #5752 from SansPseudoFix/fix-tag-button-overflow 
fix tag button overflow
 2015-03-12 10:43:56 +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
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
Steffen van Bergerem
be175e969e Fix mobile sign up with invitation 2015-03-11 10:52:42 +01:00
Augier
95f4675ddf Port of notifications to Backbone 2015-03-11 02:11:05 +01:00
Jonne Haß
add6dd3c50 Merge pull request #5749 from svbergerem/char-counter-fix 
Publisher: fix services char counter
 2015-03-10 17:43:32 +01:00
SansPseudoFix
6cf509454c fix overflow blockquote stream 
change word-break to wrap-wrap

	modified:   app/assets/stylesheets/stream_element.scss

remove useless word-wrap

global prevent for overflow

global overflow fix

Remove useless word-wrap

	modified:   app/assets/stylesheets/conversations.scss
	modified:   app/assets/stylesheets/new_styles/_base.scss
	modified:   app/assets/stylesheets/new_styles/_code.scss
	modified:   app/assets/stylesheets/single-post-view.scss
	modified:   app/assets/stylesheets/stream_element.scss

indent
 2015-03-09 23:59:52 +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
9d6fc0a671 Merge pull request #5744 from Flaburgan/conversation-design 
Fix conversaton publisher trailing border
 2015-03-08 22:49:44 +01:00
flaburgan
ab4467954b Fix conversaton publisher border 2015-03-08 21:59:23 +01:00
Steffen van Bergerem
49894ec05d Merge pull request #5740 from jhass/publisher_margin 
Reduce gap between publisher and stream
 2015-03-08 16:08:51 +01:00
Jonne Haß
e6444cea67 Reduce gap between publisher and stream [ci skip] 2015-03-08 14:27:07 +01:00
Jonne Haß
00817c8583 Merge pull request #5728 from SansPseudoFix/5716-focus-link-color-bootstrap-header 
Fix #5716 focus header link color
 2015-03-06 23:44:03 +01:00
Jonne Haß
2dafe8554c Merge pull request #5735 from svbergerem/improve-bootstrap-stream-style 
Improve Bootstrap stream style
 2015-03-06 23:40:24 +01:00
Steffen van Bergerem
b083560266 Improve Bootstrap stream style 2015-03-06 21:59:36 +01:00
Steffen van Bergerem
2a52f65160 Bump markdown-it 2015-03-06 20:40:06 +01:00
Steffen van Bergerem
96fcae3532 Remove unused (vendor) css 2015-03-06 07:58:13 +01:00
Steffen van Bergerem
0f9ba4885c Import chat.scss and change container to container-fluid 2015-03-06 01:18:37 +01:00
SansPseudoFix
53ac63cafa refactoring - grey link with dark grey dots for focus 2015-03-04 23:46:52 +01:00
SansPseudoFix
f8b69ae7d7 grey link with black grey dots border 2015-03-04 18:35:59 +01:00
SansPseudoFix
2b29bfe403 focus link grey with grey dots 2015-03-04 15:00:39 +01:00
SansPseudoFix
330ae471f1 Fix #5716 focus header link color 2015-03-04 11:03:44 +01:00
Augier
5be2fbafab Changed color border on active text" 2015-03-03 21:18:53 +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
0c7d319fdc Remove unused css files 2015-03-02 00:04:58 +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
3721861c94 border on the left of the stream and profile header 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
b0a8ecf8be margin 0 was messing up the left bar 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
c402c65f56 unprefixing opacity 2015-03-01 12:04:55 +01:00
Pablo Cuadrado
52fef10bea lame BR removed 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
75480c5454 using entypo on the right section, better alignment and styles 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
84739a86d1 invite code box fix 2015-03-01 12:04:54 +01:00
Pablo Cuadrado
9cbc09316d text shadow made the buttons look blurry 2015-03-01 12:04:53 +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
Pablo Cuadrado
24fdf8fb84 rightbar invitations ported to bootstrap 2015-03-01 12:04:53 +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
Pablo Cuadrado
bb18803665 welcome to diaspora styles ported 2015-03-01 12:04:52 +01:00
Pablo Cuadrado
cb99ad9e68 left bar styles adjusted 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
e48679affe removing a missing mixing, using row instead of row-fluid 2015-03-01 12:04:51 +01:00
Pablo Cuadrado
c4fda4b563 main_stream ported, no further styling applied 2015-03-01 12:04:51 +01:00
flaburgan
741a24bc08 Add tooltip style on post report icon 2015-02-28 16:57:41 +01:00
Dennis Schubert
ab4e04e8c4 Don't specify file extensions in SCSS imports 2015-02-28 05:04:39 +01:00
Jonne Haß
c96834bdf2 Remove .css extension from SCSS files 
sass-rails 5.0 deprecated those
 2015-02-28 03:37:46 +01:00
Jonne Haß
1b0cf2d11f bump compass & sass 2015-02-28 02:36:14 +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ß
e8440bb25f Merge pull request #5683 from svbergerem/mobile-fix-style-more 
Mobile: fix style of 'more' button
 2015-02-27 15:53:36 +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
flaburgan
2b19b4bfc9 Remove #sign-up-text, change placeholder text to lower-case, fix tests 2015-02-19 00:07:41 +01:00
Steffen van Bergerem
b3558d0db1 Fix captcha and box-shadow 2015-02-18 22:45:46 +01:00
flaburgan
1c231f3171 refactoring of the public pages design 2015-02-18 22:45:46 +01:00
flaburgan
44649e9167 Unify not connected pages 2015-02-18 22:45:46 +01:00
Steffen van Bergerem
06ab4d0514 Mobile: fix style of 'more' button 2015-02-18 20:41:01 +01:00
Steffen van Bergerem
7d485ce6a6 Add opacity transition for post controls 2015-02-18 18:16:10 +01:00
SansPseudoFix
0c49219ca7 Global prevent for overflow in mobile view 2015-02-17 13:00:39 +01:00
Steffen van Bergerem
eb7e2eac9d Update jasmine-ajax 2015-02-17 04:03:42 +01:00
Steffen van Bergerem
d1dfd7c1cd Style improvements for the year on the notifications page 2015-02-16 21:45:39 +01:00
Steffen van Bergerem
9c22ed6aef Add year to notifications page 2015-02-16 18:02:50 +01:00
Steffen van Bergerem
4da6b075ad Bootstrap stream: fix interaction buttons 2015-02-16 06:23:34 +01:00
Steffen van Bergerem
f1836580db Bootstrap stream: add spinner and improve comment box 2015-02-16 04:56:35 +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
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
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
Faldrian
32ca5cc16d removed css-spill on reshare link in stream 2015-02-08 17:24:16 +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
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
Jonne Haß
9eaa92068f Merge pull request #5464 from SansPseudoFix/statistics_design 
[Feature] Statistics page
 2015-01-24 23:57:40 +01:00
SansPseudoFix
dc44485230 Feature : Statistics design 2015-01-24 22:34:41 +01:00
SansPseudoFix
7e9525740b fix #5568 - overflow json exporter 2015-01-21 17:54: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
Dumitru Ursu
36b66624e2 Invert gradient 2015-01-09 17:13:35 +02:00
Dumitru Ursu
80b4cb90ef Use the standard syntax for gradient 2015-01-09 16:49:26 +02:00
Dumitru Ursu
3e1b944121 Remove prefixed CSS properties 2015-01-09 13:50:29 +02: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
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
59e9597c77 Remove asyncSubHeader from app.pages.Profile 2015-01-03 15:20:33 +01:00
Flaburgan
f9e9a0521d Add followed tags to the mobile menu 2014-12-28 13:48:48 +01:00
Jason Robinson
30eaf82762 Merge pull request #5481 from svbergerem/remove-stream-template 
Remove unused stream template
 2014-12-22 23:30:55 +02:00
Marco Colli
1ac2e728f4 Solved #5482 2014-12-20 11:05:12 +01:00
Faldrian
710d03b1c2 Fixed growing number on events on hovercard dropdown container 2014-12-20 02:44:48 +01:00
Steffen van Bergerem
7612f5e939 Remove unused stream template 2014-12-17 16:45:51 +01:00
Steffen van Bergerem
a5068259bb Improve wording for tagged people on tag page 2014-12-15 18:08:53 +01:00
Jonne Haß
63e9d7b73f Update aspect list checkmarks only after the stream was fetched 2014-12-05 03:18:30 +01:00
Jonne Haß
9d5e1f604d Make app.helpers.truncate tolerant to null and undefined 2014-12-04 16:45:00 +01:00
Steffen van Bergerem
7c775208b1 Merge pull request #5422 from SansPseudoFix/fix-code-overflow-spv-and-profile 
Fix code overflow spv and profile
 2014-12-02 22:44:08 +01:00
SansPseudoFix
6d681f8306 Fix code overflow 
new file:   app/assets/stylesheets/new_styles/_code.scss
 2014-12-02 16:51:50 +01:00
Steffen van Bergerem
d742f23cd5 Content shouldn't exceed the profile sidebar 2014-12-02 02:03:15 +01:00
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