Dennis Schubert
|
2549f44b7c
|
Merge branch 'stable' into develop
|
2015-05-19 03:00:56 +02:00 |
|
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
|
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 |
|
Dennis Schubert
|
5477c7df96
|
Merge branch 'stable' into develop
|
2015-05-10 01:59:21 +02:00 |
|
Steffen van Bergerem
|
59e57c013b
|
Update jasmine-ajax
closes #5937
|
2015-05-10 01:59:17 +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 |
|
Steffen van Bergerem
|
0cffa00004
|
Add syntax highlighting for markdown content
|
2015-05-04 04:04:34 +02:00 |
|
Steffen van Bergerem
|
a22127bfb1
|
Add ctrl+enter shortcut for conversations
|
2015-05-04 03:38:42 +02:00 |
|
Steffen van Bergerem
|
8e2103e69b
|
Merge branch 'release/0.5.0.0-RC' into develop
|
2015-04-21 22:26:22 +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 |
|
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ß
|
61461db913
|
fix jasmine spec for correct reshare behavior
|
2015-03-24 17:20:33 +01:00 |
|
Steffen van Bergerem
|
a161e4d3a7
|
Uncomment jasmine tests
|
2015-03-18 00:01:22 +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
|
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 |
|
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 |
|
Augier
|
168adae009
|
Adding help section for chat
|
2015-02-26 18:06:39 +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 |
|
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
|
d09e8a3758
|
Bump markdown-it-sanitizer
|
2015-02-13 02:58:31 +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 |
|