Commit graph

5840 commits

Author SHA1 Message Date
yflory
7bbf6951f2 Disable cursors in pad 2018-12-11 14:16:15 +01:00
yflory
bfd94c7f2b Merge branch 'cursor' into staging 2018-12-11 13:36:49 +01:00
yflory
95a0bc9fc1 Merge branch 'rochat' into staging 2018-12-11 13:36:41 +01:00
yflory
489a99c5c4 Don't delete the old chat for now 2018-12-11 13:35:00 +01:00
yflory
cc6ffcc788 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-12-11 12:04:29 +01:00
yflory
0197f583f2 Translations for the cursor position settings 2018-12-11 12:04:11 +01:00
ansuz
8960c8fcbd bump to latest version and codename 2018-12-11 11:11:17 +01:00
yflory
13da052325 Update translation key 2018-12-11 11:09:34 +01:00
yflory
fb5ad34299 Fix typo... 2018-12-11 10:57:43 +01:00
yflory
a121df2600 Delete validateKey in the messenger memory when we leave the channel 2018-12-11 10:52:11 +01:00
ansuz
8affe4053c Merge branch 'staging' of github.com:joldie/cryptpad into print-code 2018-12-11 10:41:17 +01:00
yflory
d88dee9a83 Restrict sending messages in a pad chat to editors only 2018-12-10 17:47:47 +01:00
yflory
32fc941141 Merge branch 'staging' into cursor 2018-12-10 13:46:27 +01:00
yflory
a2e28e6e25 Fix missing avatar in cursor tooltip 2018-12-10 13:46:21 +01:00
joldie
b2c20682df Removed unnecessary media query. 2018-12-10 13:23:56 +01:00
yflory
186e4b14fe Add missing file 2018-12-10 11:58:34 +01:00
yflory
c6f63d4d54 Cursor position in pad 2018-12-10 11:57:39 +01:00
joldie
35c39fae5d Added print button to code pad page. 2018-12-06 16:43:48 +01:00
yflory
600c984576 Only show the user colors in the userlist if the app supports it 2018-12-06 13:59:56 +01:00
yflory
081fc01694 Add a settings category about the cursor 2018-12-06 13:48:14 +01:00
yflory
c81b4d77e8 lint compliance 2018-12-06 11:55:40 +01:00
yflory
690cba2b8f Add cursor in slide 2018-12-06 11:54:49 +01:00
yflory
f157f852b1 Fix and improve cursor 2018-12-06 11:54:34 +01:00
yflory
1ba80a344b See other users' cursor position 2018-12-04 17:18:42 +01:00
ansuz
60e7011adc update changelog 2018-11-27 17:35:36 +01:00
ansuz
44419fc929 bump version 2018-11-27 17:04:58 +01:00
yflory
008b5a3e9f Fix an ownership issue in friend channels 2018-11-27 16:57:55 +01:00
yflory
ca45ff31d1 Refactor messenger to use commands from UI to store 2018-11-27 16:55:56 +01:00
yflory
cc3e6f3924 Fix scrollbar position in ckeditor #296 2018-11-27 14:07:17 +01:00
yflory
f5965716b6 Minor update because of flow... 2018-11-27 13:58:33 +01:00
yflory
2a46b8f855 Fix an issue with last known hash in the messenger 2018-11-27 13:42:11 +01:00
yflory
dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory
518c1e0d3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-22 14:55:34 +01:00
yflory
13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
yflory
015449832c Fix missing characters caused by concurrent editing 2018-11-22 14:44:46 +01:00
ansuz
56feaff72d Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-21 12:07:16 +01:00
ansuz
c71b1c013b add changelog 2018-11-21 12:07:01 +01:00
yflory
331197197a Fix new icons cache 2018-11-20 15:11:19 +01:00
yflory
0e6057ee3c Merge branch 'soon' 2018-11-20 15:02:12 +01:00
yflory
3e45cff7c0 Merge branch 'staging' into soon 2018-11-20 15:01:48 +01:00
yflory
56267f4ee1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-20 15:01:17 +01:00
yflory
aa3f6cb7d7 Update some icons in the drive 2018-11-20 15:01:12 +01:00
ansuz
1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz
d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00
ansuz
04d96d5d0e remove outdated comments 2018-11-20 11:23:31 +01:00
ansuz
8bbd4e2086 bump version and release codename 2018-11-20 11:14:26 +01:00
ansuz
fcce48f2dd Merge branch 'soon' into staging 2018-11-20 11:12:41 +01:00
yflory
8522c3723d Translations for the NGI logo 2018-11-19 17:08:20 +01:00
yflory
8fbd9d3f2a Add link to the NGI award blog post 2018-11-19 15:48:33 +01:00
yflory
3d712d9008 Merge branch 'cursor' into staging 2018-11-19 15:22:35 +01:00