Commit graph

15358 commits

Author SHA1 Message Date
Jonne Haß
0af6fabfc7 Merge pull request #5650 from svbergerem/improve-hovercards-cuke
Make the hovercards cuke more reliable
2015-02-15 15:58:47 +01:00
Jonne Haß
f326b58d31 Merge pull request #5664 from svbergerem/remove-people-last_post
Remove last_post from PeopleController
2015-02-15 15:58:02 +01:00
Jonne Haß
e05ae411eb Merge pull request #5667 from svbergerem/help-section-routing
Add routes for help sections
2015-02-14 22:19:37 +01:00
Steffen van Bergerem
c5468f072f JSHint: Add spyOn as a global variable 2015-02-14 19:44:00 +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ß
f980eba0a3 add a missing translation 2015-02-14 12:43:48 +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
d96229fddc Disable SCSS linter 2015-02-13 20:37:41 +01:00
Jonne Haß
84cfaa1cfb Merge pull request #5659 from Zauberstuhl/link_to_remote_profile
Add the ability to link remote user profiles
2015-02-13 20:35:14 +01:00
Lukas Matt
a475d5fb62 Add the ability to link to remote user profile
related to diaspora/jsxc#77
2015-02-13 19:23:26 +01:00
Jonne Haß
b910adc52b Merge pull request #5663 from svbergerem/pending-specs
Green pending specs for evil query spec tag stream
2015-02-13 13:46:08 +01:00
Jonne Haß
8a0f9352a2 Merge pull request #5661 from svbergerem/bump-markdownit-sanitizer
Bump markdown-it-sanitizer
2015-02-13 13:45:16 +01:00
Steffen van Bergerem
55cb2dd30a Green pending specs for evil query spec tag stream 2015-02-13 12:30:53 +01:00
Steffen van Bergerem
2193ff2b58 Remove last_post from PeopleController 2015-02-13 12:25:50 +01:00
Steffen van Bergerem
d09e8a3758 Bump markdown-it-sanitizer 2015-02-13 02:58:31 +01:00
Jonne Haß
e9179e33ea bump spring 2015-02-13 00:32:50 +01:00
Jonne Haß
a5d9d779ff Merge pull request #5653 from goobertron/changelog_typo
Fix typo in Changelog
2015-02-11 21:39:33 +01:00
goobertron
5cad9b3c6c Ahem! 2015-02-11 20:30:09 +00: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
Jonne Haß
97a5e24edc update changelog for #5652 [ci skip] 2015-02-11 14:12:02 +01:00
Jonne Haß
ac75b476d0 Merge pull request #5652 from svbergerem/add-hovercards-to-mentions
Add hovercards for mentions
2015-02-11 14:10:00 +01:00
Steffen van Bergerem
7112cb112b Add hovercards for mentions 2015-02-11 00:46:00 +01:00
Jonne Haß
1c202db3ce Merge pull request #5649 from svbergerem/update-jasmine
Update jasmine
2015-02-10 21:10:42 +01:00
Steffen van Bergerem
3db305264e Make the hovercards cuke more reliable 2015-02-10 20:48:51 +01:00
Steffen van Bergerem
5f4f32f2cf Update jasmine 2015-02-10 19:28:52 +01:00
Steffen van Bergerem
8962d75eb7 Conversations: fix badge count and automatic scrolling 2015-02-10 19:11:20 +01:00
Jonne Haß
cb6502016c Merge pull request #5647 from svbergerem/fix-typo-aspectglobalhelper
Fix typo in AspectGlobalHelper
2015-02-10 17:11:46 +01:00
Steffen van Bergerem
17c7771a6b Fix typo in AspectGlobalHelper 2015-02-10 16:43:14 +01:00
Jonne Haß
dece3cf6b0 Merge pull request #5417 from svbergerem/notifications-fix-timeago
Fix timeago for notifications, add 'no notifications yet' message
2015-02-10 12:20:09 +01:00
Steffen van Bergerem
f27b9dbf79 JSHint disable maxlen and quotmark [ci skip] 2015-02-10 00:43:06 +01:00
Steffen van Bergerem
3312f97981 Fix timeago for notifications, add 'no notifications yet' message 2015-02-09 03:56:37 +01:00
Jonne Haß
ab2e4781f8 Merge pull request #5639 from aka001/5373_technical_limitation
Technical limitations of how old one can be on D* #5373
2015-02-09 02:28:15 +01:00
Jonne Haß
8bb99fd7c6 disable ruby linter for now [ci skip] 2015-02-09 01:50:31 +01:00
Akash Agrawall
6b105274af Technical limitation of how old one can be on D* 5373 2015-02-09 06:19:09 +05:30
Jonne Haß
dce1e3c6f5 Merge pull request #5637 from svbergerem/add-js-linter
Add JSHint javascript linter
2015-02-09 00:36:42 +01:00
Steffen van Bergerem
c9e46a09d8 Add files for houndci, stricter rules for JSHint 2015-02-09 00:03:51 +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
Jason Robinson
e6d38db365 Merge pull request #5638 from Faldrian/5604-better-avatar-error-handling
5604 better avatar error handling
2015-02-08 23:36:45 +02: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
Jonne Haß
b991ffe455 Merge pull request #5624 from dimaursu/emoji
Add collation and config check
2015-02-08 00:04:46 +01:00
Jonne Haß
3114b04a08 Merge pull request #5635 from svbergerem/remove-unused-files
Remove unused files, fix syntax in jasmine tests
2015-02-07 23:43:48 +01:00
Jonne Haß
63363340f6 Merge pull request #5623 from AugierLe42e/fix-mobile-login-view
[Mobile] Does not display the header on sing_in page
2015-02-07 21:30:03 +01:00
Steffen van Bergerem
c1d714d2c7 Remove unused files, fix syntax in jasmine tests 2015-02-07 21:17:51 +01:00