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
|
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 |
|
Jonne Haß
|
604d2b7a39
|
Merge pull request #5634 from svbergerem/remove-photo-export
Remove photo export from settings
|
2015-02-07 21:10:33 +01:00 |
|
Jonne Haß
|
02071fcf51
|
updated 95 locale files [ci skip]
|
2015-02-07 20:33:43 +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 |
|
Jonne Haß
|
ee06185244
|
Merge pull request #5632 from svbergerem/fix-aspect-dropdown-people-search
Fix aspect dropdown on people search page inserted after initial page load
|
2015-02-07 13:26:11 +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 |
|
Dumitru Ursu
|
0829e6f394
|
Add collation and config check
|
2015-02-06 00:49:07 +02:00 |
|
Jason Robinson
|
28ff7fb557
|
Merge pull request #5601 from Faldrian/5591-correct-moderation-placement-reshare
Fixed moderation-button-position when viewing reshare
|
2015-02-05 22:25:28 +02:00 |
|
Augier
|
4be1e2b38e
|
Does not display the header on sing_in page
|
2015-02-04 23:45:13 +01:00 |
|
Jonne Haß
|
73e30776e2
|
Merge pull request #5619 from sam09/change_msg
Fixed Isssue #5618. The profile update page shows the correct message.
|
2015-02-03 12:25:44 +01:00 |
|
Sam Radhakrishnan
|
9fcef5b101
|
Fixed Isssue #5618. The profile update page shows the correct message.
|
2015-02-03 14:39:08 +05:30 |
|
Faldrian
|
db6464ed61
|
Fixed moderation-button-position when viewing reshare
|
2015-02-03 00:24:26 +01:00 |
|
Jonne Haß
|
c61a4a91a5
|
update changelog [ci skip]
|
2015-02-02 15:46:31 +01:00 |
|
Jonne Haß
|
c9db65ae76
|
Merge pull request #5614 from sam09/develop
Fixed Bug #5593.
|
2015-02-02 15:25:54 +01:00 |
|
Sam Radhakrishnan
|
a12c0d83c0
|
Fixed Bug #5593. Added length validation to location in profile model with maximum length 255.
|
2015-02-02 19:42:53 +05:30 |
|
Steffen van Bergerem
|
b4ff1f97e7
|
Merge pull request #5612 from Flaburgan/hide-signup-button-when-registration-are-disabled
Hide sign up button when registration are disabled
|
2015-02-02 00:44:35 +01:00 |
|
Jonne Haß
|
3747fd728c
|
Merge pull request #5588 from goobertron/text_edits
Standardise capitalisation throughout UI
|
2015-02-01 16:03:22 +01:00 |
|