Commit graph

1579 commits

Author SHA1 Message Date
yflory
d4dfbddaa6 Add icons in the user menu 2018-03-22 15:19:14 +01:00
yflory
9e711e4cd4 Remove Bootstrap's JS in static pages 2018-03-22 10:49:20 +01:00
yflory
4288f536f1 Use requireCSS to load FontAwesome 2018-03-21 18:31:53 +01:00
yflory
a718603b36 Automatic account deletion 2018-03-21 18:27:20 +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
4f2a91b82d Pad creation screen UI improvements 2018-03-19 16:17:19 +01:00
yflory
ab8306f5d4 Merge branch 'soon' into staging 2018-03-14 17:17:00 +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
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
7dc7d5d950 lint compliance 2018-03-09 12:12:47 +01:00
yflory
7c99397e60 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-09 10:05:39 +01:00
ansuz
5f08ad2ea1 fix mangled 404 translation 2018-03-08 16:27:41 +01:00
yflory
643fcc4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:15:39 +01:00
yflory
2f262b12c6 Fix help box issues 2018-03-08 16:15:26 +01:00
ansuz
34d5c04eb4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 16:08:33 +01:00
ansuz
7091dfb669 standardize naming for the drawer, and reorder poll description 2018-03-08 16:05:47 +01:00
yflory
442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
ansuz
82329dbe70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-08 15:06:30 +01:00
ansuz
ec19b82609 add new help text 2018-03-08 15:06:22 +01:00
yflory
b1b9683141 Add links to FAQ and Privacy in static pages 2018-03-08 12:17:19 +01:00
yflory
2bcf28bb34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 18:24:09 +01:00
yflory
eac10321ba Reduce toolbar height on mobiles 2018-03-07 18:24:01 +01:00
ansuz
71f519f982 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 17:49:57 +01:00
ansuz
4262c8e6e4 correct french grammar 2018-03-07 17:49:38 +01:00
ansuz
c7e4db7f38 transcribe english faq 2018-03-07 17:48:44 +01:00
yflory
f45023ed1f Remove connection lost popup when websocket connection is lost 2018-03-07 16:48:49 +01:00
yflory
6a7c86aee7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-07 15:08:17 +01:00
yflory
8cdad27ec4 French FAQ 2018-03-07 15:07:39 +01:00
ansuz
1452d65bd4 fix missing section in privacy policy 2018-03-07 12:08:02 +01:00
yflory
3fcdbcdbc5 Faq questions 2018-03-06 16:49:13 +01:00
yflory
b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +01:00
yflory
12bfcbe701 Add fixed order for rightside icons in the toolbar 2018-03-01 14:32:14 +01:00
yflory
2c90cb5907 Move help button in drawer and fix drawer style 2018-02-28 17:59:27 +01:00
yflory
753b7550ca Save button in the pad creation screen 2018-02-28 17:02:35 +01:00
yflory
a4a6385e86 Add keyboard shortcuts for the Ctrl+E or Cmd+E modal 2018-02-28 16:38:28 +01:00
yflory
f0bc1cfe99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-27 17:39:27 +01:00
yflory
60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
ansuz
66d83dc045 update version 2018-02-27 15:13:39 +01:00
yflory
5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
yflory
22f130d948 Remove lag when displaying loading screen in login and register 2018-02-26 10:41:37 +01:00
yflory
5d584625e4 FAQ pages 2018-02-19 12:11:45 +01:00
yflory
299a2f4c08 FAQ placeholder 2018-02-19 12:09:57 +01:00
ansuz
91437c558e fix weird messages 2018-02-16 17:06:11 +01:00
ansuz
11fabea327 update footer and package.json version 2018-02-16 16:13:01 +01:00
yflory
70e014cdfc Hide infinite spinner and disconnect modals when pad is deleted 2018-02-15 11:34:44 +01:00
yflory
e83e589cf0 Kick from pad when an owned channel is deleted + whiteboard and poll 2018-02-14 19:41:07 +01:00
yflory
728a6a868d Manage expired channels 2018-02-13 18:20:13 +01:00
yflory
223ed73ae1 French translation for the pad creation screen 2018-02-09 15:47:52 +01:00
yflory
0b022af5db Fix style issues in IE and mobiles 2018-02-09 15:45:47 +01:00
yflory
ea7a3c75fa Fix hidden content in the pad creation screen with smaller screen or zoom 2018-02-08 14:06:40 +01:00
yflory
81ea3b14d7 Fix usage bar position in the settings app 2018-02-08 12:29:00 +01:00
yflory
f18917f0ac Fix race condition at registration 2018-02-08 12:24:34 +01:00
yflory
b5bb83b700 lint compliance 2018-02-08 12:24:19 +01:00
yflory
c210f097c0 Refactor login part two 2018-02-07 17:14:15 +01:00
yflory
ff151869de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-07 13:08:12 +01:00
yflory
7ebfa43408 Improve assert translations to detect issues in objects (tips, type, etc.) 2018-02-07 13:08:03 +01:00
ansuz
d676a5e7db Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords 2018-02-07 11:14:19 +01:00
ansuz
a0ff3370a2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-07 10:27:24 +01:00
ansuz
218b1fb328 set messages.el.js to non-executable 2018-02-07 10:24:40 +01:00
ansuz
a1f05e4bf1 update pad creation screen text 2018-02-07 10:24:04 +01:00
yflory
5bba9b6c39 Refactor login to remove duplicate code 2018-02-06 18:45:12 +01:00
yflory
4df4c48fbd Improve UI for pad creation screen 2018-02-06 17:36:37 +01:00
ansuz
a281869bba make things actually work 2018-02-01 11:43:29 +01:00
ansuz
0672c2f41a implement a running diff 2018-02-01 11:09:24 +01:00
yflory
f6926699bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 19:04:14 +01:00
yflory
ad2cde4705 Add warning about anonymous drive in localStorage 2018-01-29 19:04:00 +01:00
yflory
e80e8339c2 Typo in translation 2018-01-29 16:16:50 +01:00
ansuz
de838a3184 fix usage bar styles 2018-01-29 16:12:35 +01:00
yflory
8294686f80 Fix assert translations for deprecated keys 2018-01-29 15:37:23 +01:00
yflory
8a1c04ff58 Missing french translation keys 2018-01-29 15:33:34 +01:00
yflory
bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory
a1d9f44bbd Delete owned pads from server when removed from the owner's drive 2018-01-29 12:45:38 +01:00
yflory
5089f1206d Pad creation screen translations and link to settings 2018-01-29 10:38:00 +01:00
yflory
462c229b17 Add links to features table 2018-01-26 12:52:25 +01:00
yflory
86144eda22 Display a message about pads deleted from the server 2018-01-26 12:26:58 +01:00
yflory
4d0312115a Add a link to the account server for subscribers in settings 2018-01-25 12:09:20 +01:00
yflory
166a9e71cf Add a features comparison page 2018-01-23 19:03:31 +01:00
yflory
2995782079 Different colors for ok and cancel in alertify 2018-01-23 17:02:32 +01:00
yflory
8628f2831e Fix 404 page inside iframe 2018-01-23 15:53:00 +01:00
yflory
30c6ab4717 Add meta description tag 2018-01-23 15:17:06 +01:00
yflory
c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
ansuz
02dbe9e458 enforce maxUploadSize 2018-01-18 12:19:58 +01:00
ansuz
fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:32:27 +01:00
ansuz
04b862352f update style for usage bar 2018-01-18 10:31:56 +01:00
yflory
08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-17 18:40:09 +01:00
yflory
c5ebbe1a56 New share menu 2018-01-17 18:39:45 +01:00
ansuz
4f42e8a282 bump to version 1.25.0 2018-01-17 14:28:20 +01:00
ansuz
3858aa976a better warning in case of errors in /file/ 2018-01-16 16:52:06 +01:00
ansuz
4fc1079d67 translate some stuff 2018-01-15 17:43:58 +01:00
yflory
f3d8fd3590 Ability to import local pads on login 2018-01-12 18:17:32 +01:00
yflory
a5b75e0164 Fix default config for anynymous drive 2018-01-12 18:15:15 +01:00
yflory
8ced81d8d7 lint compliance 2018-01-12 17:45:52 +01:00
ansuz
b630fb95e2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 17:39:43 +01:00
ansuz
a018b7db9e only show availablePadTypes on the home page 2018-01-12 17:39:36 +01:00
yflory
dffa117f4d lint compliance 2018-01-12 17:09:33 +01:00
yflory
d59bc4612d Ability to disable the drive for anonymous users 2018-01-12 15:54:36 +01:00
yflory
db0d2e161c Hide pad creation screen features if it is disabled in app config 2018-01-12 14:50:39 +01:00
yflory
daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +01:00
yflory
c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +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
ansuz
5346afe51f step towards customizable login functionality 2018-01-11 15:55:57 +01:00
ansuz
ae2517fcc6 remove dead code from home page 2018-01-11 15:55:56 +01:00
yflory
8c9490868b improve owned pads management in the drive 2018-01-10 17:57:40 +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
65ccfe39ef Add a 'properties' button in pads to display pad data 2018-01-09 12:02:56 +01:00
ansuz
e06cb29c4f bump version 2018-01-08 18:40:51 +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
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
e460d9c36c bump version 2018-01-02 10:38:49 +01:00
yflory
f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
Christos Koulaxizis
7f3a08f0c2 Greek translation 2017-12-22 14:58:51 +02:00
yflory
888739e333 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:21:14 +01:00
yflory
fa6106a6bb Use CSS to remove the loading screen 2017-12-21 18:21:10 +01:00
ansuz
c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +01:00
yflory
158ef58c6c Enable print plugin in ckeditor 2017-12-21 17:07:06 +01:00
ansuz
c448c9035e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-19 11:03:43 +01:00
ansuz
127f30df72 bump CryptPad version 2017-12-19 10:56:22 +01:00
yflory
e48f143842 Allow numbers in _getKey parameters 2017-12-19 10:51:30 +01:00
yflory
d666e9e7ee Remove tag and filepicker buttons for anon users 2017-12-15 18:16:01 +01:00
yflory
b06b2dbafc less lint compliance 2017-12-12 10:47:45 +01:00
yflory
b1f1aa2340 Disable pad creation screen 2017-12-11 17:54:34 +01:00
yflory
34315b4500 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 17:17:24 +01:00
yflory
c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
ansuz
16388a839c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 15:46:38 +01:00
ansuz
230f9524be new less linter rules and compliance 2017-12-11 15:05:58 +01:00
yflory
4e46d0daa5 Fix the 'New' button icon in the toolbar 2017-12-11 14:51:36 +01:00
yflory
dcfccf88cd Merge branch 'creationpage' into staging 2017-12-11 12:21:21 +01:00
yflory
1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle
024aa741a7 Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant 2017-12-08 19:12:34 +01:00
Caleb James DeLisle
1d2119b292 Removed LESS duplicate attributes 2017-12-08 18:13:35 +01:00
Caleb James DeLisle
bfba239770 Fixed missing semicolons in less 2017-12-08 17:35:28 +01:00
Caleb James DeLisle
9af941741d Fix trailing whitespace and empty selectors in less 2017-12-08 17:30:45 +01:00
Caleb James DeLisle
dd44b4da99 Removed old /less/ directory which is nolonger used :) 2017-12-08 14:56:13 +01:00
Caleb James DeLisle
12b0f3e201 Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window 2017-12-08 14:00:53 +01:00
Caleb James DeLisle
617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
yflory
e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
Caleb James DeLisle
67f8031beb Wrong usage of colortheme.less, fixed 2017-12-07 14:57:24 +01:00
yflory
64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
Caleb James DeLisle
ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00
Caleb James DeLisle
1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file 2017-12-05 18:32:23 +01:00
Caleb James DeLisle
c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
ansuz
087eee55f6 update 404 page 2017-12-04 18:31:07 +01:00
ansuz
f95669a27a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 17:33:13 +01:00
ansuz
fc4fea9c54 update 404 messages and show actual text faster 2017-12-04 17:33:06 +01:00
yflory
f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
yflory
e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory
04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory
4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
ansuz
5acbaef28f tweak animation parameters for faster 'decryption' 2017-12-01 14:03:13 +01:00
ansuz
c80c97d7db lint compliance 2017-12-01 13:23:23 +01:00
ansuz
bcdc0d810a make 404 page translateable, point to home page or drive 2017-12-01 11:51:04 +01:00
ansuz
443eeaa407 fancy 404 page 2017-11-30 19:17:59 +01:00
yflory
acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
yflory
74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory
b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
yflory
9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory
280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory
cdd8c6e110 Fix history mode not centered 2017-11-21 17:48:43 +01:00
yflory
30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory
06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz
60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
yflory
477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +01:00
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
yflory
e8e90905e4 Fix assert translations 2017-11-20 14:23:56 +01:00
ansuz
78e972201a bump CryptPad version 2017-11-20 14:16:55 +01:00
yflory
ce3600b026 Update translation keys 2017-11-20 10:41:27 +01:00
yflory
cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
yflory
af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory
25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory
1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory
014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory
9184dd0ce6 Merge branch 'refactor2' into staging 2017-11-14 11:53:13 +01:00
yflory
5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory
af1ea4fd96 Fix typo in the French translation 2017-11-13 16:34:37 +01:00
yflory
c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory
dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
yflory
354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
yflory
101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory
2ff66e1a7c Update french translation 2017-11-06 17:39:41 +01:00
ansuz
2c9df23849 update english text for removing from trash in the drive 2017-11-06 17:37:29 +01:00
ansuz
d10f752457 s/delete/move to trash 2017-11-06 17:07:37 +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
2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory
1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory
cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory
e0f7df80b3 Fix avatar upload and use less2 everywhere in profile 2017-10-31 11:11:29 +01:00
yflory
7f9b21405b Add missing files for profile 2017-10-31 10:27:41 +01:00
yflory
4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
yflory
abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 15:12:29 +01:00
yflory
68accaf653 Todo in sframe with less2 2017-10-30 15:12:15 +01:00
Evilham
735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham
83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory
6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
ansuz
69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
yflory
204f3e1441 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 15:17:09 +02:00
yflory
74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz
7d1892546b add missing french translation 2017-10-23 14:59:14 +02:00
ansuz
2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
ansuz
aaef30f489 bump cryptpad version 2017-10-23 14:05:49 +02:00
yflory
ce5d24a1d3 Remove error message about Tether 2017-10-23 11:57:10 +02:00
ansuz
d571f408d8 Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
2017-10-23 11:46:56 +02:00
yflory
3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
Yannick A
63dcfd6d18 Update French translation 2017-10-19 21:02:03 +02:00
Caleb James DeLisle
a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory
e553351b79 Put the add friend button in the userlist below the name 2017-10-17 12:39:25 +02:00
yflory
6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon
867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. 2017-10-14 00:31:31 +02:00
yflory
2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle
15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle
753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory
62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +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
ansuz
d046b9ce33 add missing French key 2017-10-09 17:16:48 +02:00
ansuz
f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz
d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
CatalinScr
21f1a48380 changed the login in button 2017-10-09 17:17:33 +03:00
yflory
d3d6940b69 Update french translation for tags 2017-10-09 15:47:28 +02:00
ansuz
3f181fa370 update loading screen tip for tags 2017-10-09 15:38:33 +02: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
Caleb James DeLisle
f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
yflory
ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
yflory
1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz
080511efcd add missing translation for hashtags 2017-10-05 17:01:39 +02:00
Caleb James DeLisle
d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
Caleb James DeLisle
383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation. 2017-10-05 12:14:03 +03: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
ansuz
e2f53eaddb add loading screen tip about hashtags 2017-10-03 18:39:03 +02:00