Commit graph

4443 commits

Author SHA1 Message Date
yflory
daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +01:00
yflory
e377d606be Fix spinner style in the new settings category 2018-01-11 17:15:39 +01:00
yflory
02d1f10231 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 16:09:41 +01:00
yflory
c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +01:00
Caleb James DeLisle
2c9e21b2de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 16:07:10 +01:00
Caleb James DeLisle
a8e0cf2ed0 We should remove datastore between tests 2018-01-11 16:06:58 +01:00
yflory
bd9c44dbb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 16:02:18 +01:00
yflory
ef480fea79 Add a settings category for the pad creation screen 2018-01-11 16:02:05 +01:00
Caleb James DeLisle
dc376fdb1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 15:58:16 +01:00
Caleb James DeLisle
4808c8b374 Fixed poll which was not working with automated testing 2018-01-11 15:57:09 +01:00
ansuz
05ad38cfe1 add more config parameters to share menu extension 2018-01-11 15:55:57 +01:00
ansuz
c31b5aa6c0 make extension point cover share menu for files 2018-01-11 15:55:57 +01:00
yflory
13b704d9f6 Fix undefined webchannel when uploading a file 2018-01-11 15:55:57 +01:00
ansuz
ca3697ae3a implement extension point for share menu 2018-01-11 15:55:57 +01:00
ansuz
5346afe51f step towards customizable login functionality 2018-01-11 15:55:57 +01:00
ansuz
1fba82540a remove example code from todo app 2018-01-11 15:55:57 +01:00
ansuz
ae2517fcc6 remove dead code from home page 2018-01-11 15:55:56 +01:00
Caleb James DeLisle
151d33db18 Added testing of /poll/ :D 2018-01-11 15:45:12 +01:00
yflory
8c9490868b improve owned pads management in the drive 2018-01-10 17:57:40 +01:00
yflory
cd7c5abc3e Fix a missing callback in closeChannel 2018-01-10 16:46:46 +01:00
ansuz
3075840e6c add more config parameters to share menu extension 2018-01-10 12:52:18 +01:00
ansuz
480ba32d78 make extension point cover share menu for files 2018-01-10 11:59:06 +01:00
ansuz
18ed463a85 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:49:23 +01:00
ansuz
1ab1f71871 implement extension point for share menu 2018-01-10 11:49:16 +01:00
yflory
d74c2a0395 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:47:59 +01:00
yflory
e5b9f089fb Fix undefined webchannel when uploading a file 2018-01-10 11:47:52 +01:00
Caleb James DeLisle
864e24b2ce Fixed typo in test 2018-01-10 11:42:48 +01:00
ansuz
65a1decd73 step towards customizable login functionality 2018-01-10 10:14:49 +01:00
ansuz
a91124e21c remove example code from todo app 2018-01-10 10:00:11 +01:00
ansuz
7ced4baf07 remove dead code from home page 2018-01-10 09:54:10 +01:00
yflory
73126ed597 Display the owner and expiration time of a pad in the properties modal 2018-01-09 18:19:24 +01:00
yflory
ecd8ef6418 improve thumbnails creation performances in code 2018-01-09 15:25:11 +01:00
yflory
77dcc1c705 Fix a race condition when switching language in the code app 2018-01-09 12:44:25 +01:00
yflory
65ccfe39ef Add a 'properties' button in pads to display pad data 2018-01-09 12:02:56 +01:00
yflory
071d385850 Remove an unnecessary websocket connection 2018-01-09 12:02:22 +01:00
ansuz
e06cb29c4f bump version 2018-01-08 18:40:51 +01:00
yflory
7defde3c59 lint compliance 2018-01-08 17:41:10 +01:00
yflory
0cea5f4596 Create an owned pad and view owned pads in the drive 2018-01-08 17:36:44 +01:00
yflory
1ec41f4e09 Ability to pick a background image in slides 2018-01-04 17:22:01 +01:00
yflory
8469119cb1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-04 10:36:11 +01:00
yflory
59c4df3d9b Fix 'NaN' txid for RPC when using IE 2018-01-03 17:14:35 +01:00
yflory
0f02d76b56 Fix missing callback when uploading files to the drive 2018-01-03 15:08:26 +01:00
ansuz
63899c94f3 bump bower again 2018-01-03 11:56:58 +01:00
ansuz
33e3c6a0c0 update dependency versions 2018-01-03 11:53:14 +01:00
yflory
d2845b95b6 Fix multiple file upload prompt 2018-01-03 11:42:23 +01:00
ansuz
875035a41a Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-01-02 12:15:08 +01:00
ansuz
65e66dea08 resolve bad merge 2018-01-02 12:13:43 +01:00
ansuz
e3c7e96d71 Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek 2018-01-02 12:11:07 +01:00
ansuz
7ff02fdf03
Merge pull request #213 from Falgn0n/patch-1
Update example.nginx.conf
2018-01-02 12:09:14 +01:00
ansuz
e460d9c36c bump version 2018-01-02 10:38:49 +01:00