JC Brand
|
5a7ce787c3
|
Renaming of template
|
2018-01-09 14:02:01 +00:00 |
|
Weblate
|
f431bce2dc
|
Merge remote-tracking branch 'origin/master'
|
2018-01-09 14:52:48 +01:00 |
|
JC Brand
|
d7a113e081
|
Fix transcripts code.
|
2018-01-09 13:52:27 +00:00 |
|
Weblate
|
fc2dfa8fd1
|
Merge remote-tracking branch 'origin/master'
|
2018-01-09 14:40:47 +01:00 |
|
JC Brand
|
da1f103532
|
Bugfix. Don't include .chat-events, to avoid null reference
|
2018-01-09 13:40:32 +00:00 |
|
JC Brand
|
2c7a942fbc
|
Remove unused declaration
|
2018-01-09 13:40:32 +00:00 |
|
Weblate
|
1006678571
|
Merge remote-tracking branch 'origin/master'
|
2018-01-06 22:33:01 +01:00 |
|
happy-dev
|
787a2a71f9
|
Typos ? (#981)
|
2018-01-06 21:32:57 +00:00 |
|
Weblate
|
0d2b5bf1c2
|
Merge remote-tracking branch 'origin/master'
|
2018-01-06 21:49:40 +01:00 |
|
JC Brand
|
96742a6684
|
Also make the open rooms list an OrderedListView
|
2018-01-06 20:42:46 +00:00 |
|
JC Brand
|
a91e9216e6
|
No need to manually remove. Gets done in the OrderedListView
|
2018-01-06 20:42:46 +00:00 |
|
JC Brand
|
fc631e7f8c
|
Minor refactoring
|
2018-01-06 19:02:50 +00:00 |
|
Weblate
|
4effc662c3
|
Merge remote-tracking branch 'origin/master'
|
2018-01-05 17:57:36 +01:00 |
|
JC Brand
|
27c59cfe6c
|
Update plugin docs prose a bit
|
2018-01-05 16:57:28 +00:00 |
|
Weblate
|
303265e8e9
|
Merge remote-tracking branch 'origin/master'
|
2018-01-05 12:57:20 +01:00 |
|
JC Brand
|
00b7c4adf4
|
Remove greenkeeper
|
2018-01-05 11:57:20 +00:00 |
|
Weblate
|
dea8c09042
|
Merge remote-tracking branch 'origin/master'
|
2018-01-05 12:48:07 +01:00 |
|
JC Brand
|
b47ecb7ccf
|
Fix to work with Jed 1.1
|
2018-01-05 11:47:50 +00:00 |
|
Weblate
|
a1d7cc739f
|
Merge remote-tracking branch 'origin/master'
|
2018-01-05 12:24:24 +01:00 |
|
greenkeeper[bot]
|
247148648e
|
Update dependencies to enable Greenkeeper 🌴 (#877)
* chore(package): update dependencies
* docs(readme): add Greenkeeper badge
|
2018-01-05 11:24:20 +00:00 |
|
Weblate
|
ef9d8b4663
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 22:51:58 +01:00 |
|
JC Brand
|
5ea1b07b6b
|
Use an OrderedListView to render the bookmarks list
|
2018-01-04 21:51:42 +00:00 |
|
Weblate
|
63b306ae8e
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 18:17:29 +01:00 |
|
JC Brand
|
1d2bc11840
|
Fix build scripts
|
2018-01-04 17:17:17 +00:00 |
|
JC Brand
|
71bdf08c25
|
Fix the no-dependencies demo
|
2018-01-04 17:02:29 +00:00 |
|
Weblate
|
beab9094ea
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 17:28:33 +01:00 |
|
JC Brand
|
6739b508c3
|
Small css and text fixes
|
2018-01-04 16:27:56 +00:00 |
|
Weblate
|
7831be8f5e
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 17:12:17 +01:00 |
|
JC Brand
|
f7cf1fb70d
|
Fix broken tests
|
2018-01-04 16:12:09 +00:00 |
|
Weblate
|
29386dd289
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 14:22:01 +01:00 |
|
JC Brand
|
16b8946dd9
|
Updates #978: Use moment and generate date in correct format
|
2018-01-04 13:11:51 +00:00 |
|
JC Brand
|
ee751ec58e
|
Update jquery and sizzle and fix/improve some tests
Fixes #825
|
2018-01-04 13:11:50 +00:00 |
|
Weblate
|
8179543674
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 13:11:13 +01:00 |
|
JC Brand
|
cdfd1e2d42
|
Add units (webkit fix)
|
2018-01-04 12:11:03 +00:00 |
|
JC Brand
|
199e2e7e27
|
The refreshWebkit hack appears to no longer be necessary
|
2018-01-04 12:11:03 +00:00 |
|
JC Brand
|
4652385bb4
|
Remove jQuery from non-tests config
|
2018-01-04 12:11:03 +00:00 |
|
Weblate
|
78b9bf2138
|
Merge remote-tracking branch 'origin/master'
|
2018-01-04 12:31:13 +01:00 |
|
JC Brand
|
7cf9c9ef8f
|
Fix linting error
|
2018-01-04 11:31:04 +00:00 |
|
Weblate
|
3f39418a67
|
Merge remote-tracking branch 'origin/master'
|
2018-01-03 21:41:31 +01:00 |
|
JC Brand
|
671691353a
|
Use Backbone.NativeView instead of Backbone.View
|
2018-01-03 20:41:03 +00:00 |
|
Weblate
|
566a388197
|
Merge remote-tracking branch 'origin/master'
|
2018-01-03 17:53:17 +01:00 |
|
JC Brand
|
ccb97eb7fd
|
Remove jquery from converse-controlbox
|
2018-01-03 16:49:08 +00:00 |
|
Weblate
|
7985b92d87
|
Merge remote-tracking branch 'origin/master'
|
2018-01-03 17:10:17 +01:00 |
|
JC Brand
|
29b5c3e3c3
|
Remove jquery from converse-dragresize
|
2018-01-03 16:08:45 +00:00 |
|
JC Brand
|
f1820e5fcd
|
Set dependencies for chatview and muc
|
2018-01-03 16:08:30 +00:00 |
|
Weblate
|
95ac01b860
|
Merge remote-tracking branch 'origin/master'
|
2018-01-03 16:50:39 +01:00 |
|
JC Brand
|
8bdaa410db
|
Also take delayed messages into account when checking if new
|
2018-01-03 15:50:02 +00:00 |
|
JC Brand
|
3a6f7ed109
|
Remove jquery from converse-minimize
|
2018-01-03 14:20:10 +00:00 |
|
Weblate
|
3a0dac3ada
|
Merge remote-tracking branch 'origin/master'
|
2018-01-03 14:37:36 +01:00 |
|
JC Brand
|
da3670d9f0
|
MUC Join/Leave messages now also show a new day indicator
|
2018-01-03 13:37:25 +00:00 |
|