ansuz
|
8a7fda6341
|
Merge branch 'soon' into login
|
2016-12-16 18:10:35 +01:00 |
|
ansuz
|
d09983ac92
|
s/kenntnisfreier/zero knowledge
|
2016-12-16 17:54:50 +01:00 |
|
ansuz
|
2ee2ffcfac
|
resolve conflicts in german PR
|
2016-12-16 17:38:53 +01:00 |
|
ansuz
|
a220742f68
|
fix reversed color settings
|
2016-12-16 15:31:22 +01:00 |
|
ansuz
|
af2d9cb5b1
|
Merge branch 'merge-polish' into soon
|
2016-12-16 15:29:24 +01:00 |
|
ansuz
|
308db7fa79
|
fix uncolored /pad/ content in IE
|
2016-12-16 15:25:06 +01:00 |
|
ansuz
|
2ee5ef2289
|
add english translations for login
|
2016-12-16 15:21:37 +01:00 |
|
ansuz
|
f13eb28252
|
add support for translating placeholders
|
2016-12-16 15:20:01 +01:00 |
|
ansuz
|
67baf30d65
|
basic outline of logins
|
2016-12-16 15:19:17 +01:00 |
|
ansuz
|
2968488278
|
convert uint8 arrays to hex
|
2016-12-16 15:18:06 +01:00 |
|
Michael Achmann
|
1f82a44f95
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
German Translation Added.
|
2016-12-13 20:18:18 +01:00 |
|
Michael Achmann
|
3ee7f4e96b
|
Added German translation
|
2016-12-13 20:14:22 +01:00 |
|
ansuz
|
c0d96fb10d
|
Merge branch 'login' into test-filemanager
|
2016-12-13 11:21:18 +01:00 |
|
ansuz
|
5d335ba796
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-12 18:25:07 +01:00 |
|
yflory
|
8e6830d080
|
Fix file manager with a chosen hash
|
2016-12-12 18:24:45 +01:00 |
|
ansuz
|
f36d15d0db
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
2016-12-12 18:03:00 +01:00 |
|
yflory
|
b7f2ef97c7
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
|
2016-12-12 12:05:31 +01:00 |
|
yflory
|
91833f72a1
|
Merge branch 'fileManagerMerge' into fileManager
|
2016-12-12 12:04:05 +01:00 |
|
yflory
|
fdb5c2ddb5
|
Fix UI issues with rename and delete actions
|
2016-12-12 12:03:54 +01:00 |
|
yflory
|
319ce5d8c8
|
Fix the code app
|
2016-12-12 10:35:28 +01:00 |
|
yflory
|
ee56f5608f
|
Fix the infinite spinner bug with the file manager store
|
2016-12-08 18:52:36 +01:00 |
|
yflory
|
43ccd11adc
|
Merge branch 'infiniteSpinner' into fileManagerMerge
|
2016-12-08 16:03:18 +01:00 |
|
yflory
|
407152f061
|
Merge branch 'infiniteSpinner' into fileManager
|
2016-12-08 16:01:59 +01:00 |
|
yflory
|
05fd6c1563
|
Fix the infinite spinner problem
|
2016-12-08 16:01:46 +01:00 |
|
yflory
|
5cd7d8ec84
|
Fix undefined userid in new poll
|
2016-12-08 10:19:23 +01:00 |
|
yflory
|
cb43eb9ca1
|
Merge branch 'newpoll' into fileManagerMerge
|
2016-12-07 16:59:43 +01:00 |
|
yflory
|
9b3719e0ae
|
Merge branch 'soon' into fileManagerMerge
|
2016-12-07 16:59:32 +01:00 |
|
yflory
|
b7b4a034a3
|
Merge branch 'soon' into newpoll
|
2016-12-07 16:58:28 +01:00 |
|
ansuz
|
ab5a4007ba
|
Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish
|
2016-12-07 12:23:26 +01:00 |
|
yflory
|
ddc99cecb1
|
Fix lint errors
|
2016-12-07 12:22:27 +01:00 |
|
pojebunny
|
5979b03794
|
Shortened translation for Create New buttons
|
2016-12-07 12:20:31 +01:00 |
|
ansuz
|
7a13993e9a
|
Merge branch 'master' of github.com:pojebunny/cryptpad into merge-polish
|
2016-12-07 12:00:42 +01:00 |
|
yflory
|
f26cdb1a21
|
Fix UI issues, unclickable user column, add confirm dialog
|
2016-12-07 11:44:09 +01:00 |
|
yflory
|
6feb8548b3
|
Prevent the proxy handlers from being called on the parents
|
2016-12-07 11:12:35 +01:00 |
|
yflory
|
740b6e955e
|
Improve UI, fix issues with the table
|
2016-12-06 18:55:10 +01:00 |
|
pojebunny
|
f6f1bc09bb
|
Added options to choose Polish language
|
2016-12-06 18:02:43 +01:00 |
|
pojebunny
|
0b459890fd
|
Added polish translation
|
2016-12-06 18:01:41 +01:00 |
|
ansuz
|
94fbc2dca4
|
prototype cryptographic login
|
2016-12-06 17:34:24 +01:00 |
|
ansuz
|
a23b3d3517
|
use new ot in code too
|
2016-12-06 16:22:58 +01:00 |
|
ansuz
|
de0863e232
|
use new ot
|
2016-12-06 16:22:42 +01:00 |
|
ansuz
|
4cd9bd5534
|
strip listeners
|
2016-12-06 16:21:11 +01:00 |
|
ansuz
|
b79618c94a
|
don't allow listeners in /slide/
|
2016-12-06 16:00:38 +01:00 |
|
ansuz
|
ebff304602
|
turn off some unwanted behaviour
|
2016-12-06 15:16:43 +01:00 |
|
yflory
|
6dff82ede2
|
Improve UI, scrollbar in the table, publish/admin buttons
|
2016-12-05 18:54:46 +01:00 |
|
yflory
|
90804ed9e0
|
Add usernames/userlist in the toolbar and fix publish button
|
2016-12-01 18:40:09 +01:00 |
|
yflory
|
3632834500
|
Lock inputs when the user is not editing them
|
2016-11-30 18:39:19 +01:00 |
|
yflory
|
eaeaf4df40
|
Improve UI, add title input and forget button
|
2016-11-29 18:57:31 +01:00 |
|
yflory
|
bca746bbb5
|
Fix uncommitted column, add toolbar
|
2016-11-28 18:38:06 +01:00 |
|
yflory
|
ffedcb63f7
|
Display own column at the beginning, add uncommitted column
|
2016-11-25 18:17:03 +01:00 |
|
ansuz
|
bdb8a2ec59
|
additional styles for newpoll
|
2016-11-25 12:04:22 +01:00 |
|