ansuz
|
a794efe931
|
Merge branch 'staging' into oo
|
2018-03-21 11:32:59 +01:00 |
|
ansuz
|
f324d33723
|
Merge pull request #234 from sairim/patch-2
Fix broken FAQ link
|
2018-03-21 11:03:58 +01:00 |
|
sairim
|
faaff60f74
|
Fix broken FAQ link
Add a forward slash before faq.html... for the expiring pads FAQ link.
|
2018-03-20 18:16:29 +02:00 |
|
yflory
|
632e6c2e6c
|
Merge branch 'metadata' into staging
|
2018-03-20 15:36:25 +01:00 |
|
yflory
|
99712ec2f0
|
getMetadata RPC
|
2018-03-20 15:33:12 +01:00 |
|
yflory
|
01dd6953b9
|
Fix the previous fix...
|
2018-03-20 15:13:00 +01:00 |
|
yflory
|
f472bc9b6c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-20 15:09:41 +01:00 |
|
yflory
|
c3f7b74baf
|
Fix CkEditor's toolbar initial state
|
2018-03-20 15:07:20 +01:00 |
|
ansuz
|
8230c471cd
|
add npm dependency for sortify
|
2018-03-20 11:31:37 +01:00 |
|
ansuz
|
7c072aeccb
|
add remove-pins rpc
|
2018-03-20 11:16:18 +01:00 |
|
ansuz
|
ed8f9e4e3f
|
remove XXX after review
|
2018-03-20 11:15:44 +01:00 |
|
ansuz
|
bc3fe4f32c
|
update version in footer and package.json
|
2018-03-20 11:14:55 +01:00 |
|
yflory
|
28d13186af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-20 11:05:56 +01:00 |
|
yflory
|
44cd235f48
|
Fix CSS with Bootstrap 4
|
2018-03-20 11:05:43 +01:00 |
|
ansuz
|
11b0781717
|
delete unused code
|
2018-03-20 10:44:26 +01:00 |
|
yflory
|
2704ee1ed7
|
Account deletion translations
|
2018-03-19 18:14:00 +01:00 |
|
yflory
|
8970bae647
|
Center pad type in the creation screen
|
2018-03-19 17:30:01 +01:00 |
|
yflory
|
fa4b625f0d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-19 17:25:38 +01:00 |
|
yflory
|
67cdb6bd13
|
Fix initial values in the pad creation screen
|
2018-03-19 17:25:31 +01:00 |
|
ansuz
|
bd6b6dcb49
|
actually fix weird checkbox logic, and lint compliance
|
2018-03-19 17:13:44 +01:00 |
|
ansuz
|
dc783ce3e4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-19 16:56:15 +01:00 |
|
ansuz
|
96a63a3b7b
|
fix weird checkbox logic in share menu
|
2018-03-19 16:56:09 +01:00 |
|
yflory
|
bc26f67edb
|
Use stable bootstrap
|
2018-03-19 16:45:36 +01:00 |
|
yflory
|
91b3ef45f3
|
Fix mobile detection
|
2018-03-19 16:27:33 +01:00 |
|
yflory
|
4f2a91b82d
|
Pad creation screen UI improvements
|
2018-03-19 16:17:19 +01:00 |
|
yflory
|
07e361b88d
|
Account deletion button
|
2018-03-19 14:04:44 +01:00 |
|
yflory
|
c135893638
|
Improve UI for polls on mobiles
|
2018-03-16 18:14:21 +01:00 |
|
yflory
|
f1107ae6e5
|
Don't count other people's owned pads against your limit
|
2018-03-16 18:13:33 +01:00 |
|
ansuz
|
5b21911341
|
pass flow tests
|
2018-03-16 12:26:39 +01:00 |
|
yflory
|
ab8306f5d4
|
Merge branch 'soon' into staging
|
2018-03-14 17:17:00 +01:00 |
|
yflory
|
b3429c2d24
|
Merge branch 'creation' into soon
|
2018-03-14 17:08:54 +01:00 |
|
yflory
|
1dabc76bb9
|
Fix sframe-boot version
|
2018-03-14 17:03:50 +01:00 |
|
yflory
|
de97c5a3ff
|
Fix mobile detection when hiding the userlist
|
2018-03-14 17:02:41 +01:00 |
|
yflory
|
d6228a39bd
|
Fix userlist notifications missing for join events
|
2018-03-14 16:34:44 +01:00 |
|
yflory
|
ebef99e5cf
|
Owned drive
|
2018-03-14 16:32:17 +01:00 |
|
yflory
|
03bcd2f00d
|
Lint compliance
|
2018-03-14 12:12:24 +01:00 |
|
yflory
|
3eec812aff
|
Merge branch 'staging' into creation
|
2018-03-14 12:07:04 +01:00 |
|
yflory
|
e977b14c1b
|
Update French translation
|
2018-03-14 11:50:17 +01:00 |
|
yflory
|
b1d5beca6f
|
Translations + UI for pad creation screen v2
|
2018-03-14 11:37:49 +01:00 |
|
yflory
|
645e47bd72
|
Catch chainpad errors in polls
|
2018-03-13 15:10:33 +01:00 |
|
yflory
|
e56d762409
|
Catch chainpad errors and display it in the UI
|
2018-03-13 14:38:56 +01:00 |
|
yflory
|
c9ed6d6bf8
|
New pad creation screen
|
2018-03-13 11:31:08 +01:00 |
|
ansuz
|
b2df2ba341
|
prototype owned file upload
|
2018-03-12 17:50:47 +01:00 |
|
ansuz
|
7dc7d5d950
|
lint compliance
|
2018-03-09 12:12:47 +01:00 |
|
ansuz
|
7944bc1a82
|
merge staging branch
|
2018-03-09 12:08:18 +01:00 |
|
ansuz
|
64afcb7c0b
|
comment out busyloop workaround for tippyjs
|
2018-03-09 10:12:12 +01:00 |
|
ansuz
|
ca65e6e54a
|
Merge branch 'soon'
|
2018-03-09 10:07:38 +01:00 |
|
yflory
|
7c99397e60
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-09 10:05:39 +01:00 |
|
ansuz
|
03ae9d5714
|
Merge branch 'soon'
|
2018-03-08 16:38:16 +01:00 |
|
ansuz
|
5f08ad2ea1
|
fix mangled 404 translation
|
2018-03-08 16:27:41 +01:00 |