Commit graph

141 commits

Author SHA1 Message Date
ansuz
8150abddbe remove dead code from pages.js 2017-11-21 15:52:37 +01:00
ansuz
4ffb59dce9 bump to version 1.21.0 2017-11-21 15:47:06 +01:00
ansuz
78e972201a bump CryptPad version 2017-11-20 14:16:55 +01:00
yflory
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
ansuz
402fae442d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-06 15:14:21 +01:00
ansuz
c5f6491c37 bump footer and package.json to latest version 2017-11-06 15:14:02 +01:00
yflory
4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
yflory
74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz
aaef30f489 bump cryptpad version 2017-10-23 14:05:49 +02:00
yflory
2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
yflory
50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory
ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
yflory
c985aa60aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 17:30:14 +02:00
yflory
f4189f883e Add missing french translation keys 2017-10-09 17:28:56 +02:00
ansuz
128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20:23 +02:00
CatalinScr
21f1a48380 changed the login in button 2017-10-09 17:17:33 +03:00
ansuz
f751554f82 update footer and package.json for upcoming version 2017-10-09 15:15:04 +02:00
yflory
dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
yflory
5e7bf0cfb8 Embed an image in whiteboard 2017-10-09 10:32:24 +02:00
yflory
1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
yflory
26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory
846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory
68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
yflory
5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
yflory
66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
yflory
767027b237 Lint 2017-09-27 10:16:24 +02:00
yflory
0df9e5ace0 Fix toolbar in polls 2017-09-27 10:09:47 +02:00
ansuz
95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
yflory
35a313d6ee Make palette realtime 2017-09-19 11:20:20 +02:00
yflory
3023e8c855 Fix templates in whiteboard 2017-09-19 11:04:52 +02:00
yflory
732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
yflory
ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
ansuz
ad591fba50 bump version 2017-09-12 14:04:30 +02:00
ansuz
a6eb1444df add loading screen markup to register and login 2017-09-07 16:39:42 +02:00
ansuz
352d504944 avoid loading unnecessary files 2017-09-07 16:39:20 +02:00
ansuz
77bbb3add4 bump footer and package.json version string 2017-09-05 15:29:28 +02:00
CatalinScr
0ceb4cbbcb Updated the contact page with the new design 2017-08-31 16:26:20 +03:00
CatalinScr
83be769bb3 Merge branch 'master' into staging
updated with new version
2017-08-31 11:36:39 +03:00
CatalinScr
ee325c1813 Repaired the errors from lint 2017-08-31 10:20:10 +03:00
CatalinScr
f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03:00
ansuz
a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz
570ff75a6c update footer for latest version 2017-08-29 11:12:08 +02:00
ansuz
54eefd3d94 replace contacts with contacts2 2017-08-25 16:07:53 +02:00
ansuz
57d0c6c973 Merge branch 'new-messaging' into staging 2017-08-25 14:42:34 +02:00
Caleb James DeLisle
35e7341f4d Merge branch 'ui-integration' into staging2 2017-08-24 13:54:55 +02:00
ansuz
89a13d4b21 work on contacts2 until feature parity is reached 2017-08-22 15:55:49 +02:00
CatalinScr
49f7e0d63b Changed the Social Media links to Pierre 2017-08-18 16:01:50 +03:00
CatalinScr
744fb407ae Updated the what is page 2017-08-16 15:53:10 +03:00
ansuz
46e47b454d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-16 11:34:54 +02:00
Caleb James DeLisle
3df20760c4 Yann does not have a twitter account. 2017-08-16 11:36:14 +02:00