10ce95087a
Merge branch 'password' into staging
2018-05-03 15:16:03 +02:00
123612b893
Merge branch 'de-translation-pl' into staging
2018-05-02 11:09:22 +02:00
a66d33e5ca
Improve export for pads with mediatags
2018-04-30 11:40:41 +02:00
b26ae67df5
Fix issues with channel ID when using a password
2018-04-26 15:10:31 +02:00
7384568f77
Lint compliance
2018-04-23 15:38:21 +02:00
9d30e48a44
Fix mediatag redrawn on content update
2018-04-23 15:35:55 +02:00
2d08924462
Fix CkEditor issues
2018-04-23 14:33:39 +02:00
cf549eeaef
Clean the code
2018-04-20 17:57:48 +02:00
41afc28802
Fix conflicts, clean the code, add migration from old mediatags
2018-04-20 17:49:40 +02:00
6a4f25bc9f
Test widget filters
2018-04-20 17:48:39 +02:00
fd89811479
Clean mediatag plugin
2018-04-19 18:29:10 +02:00
5eab39ad75
Tets mediatag plugin using widgets
2018-04-19 17:45:08 +02:00
5747e1a492
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
2018-04-10 19:12:30 +02:00
4288f536f1
Use requireCSS to load FontAwesome
2018-03-21 18:31:53 +01:00
01dd6953b9
Fix the previous fix...
2018-03-20 15:13:00 +01:00
c3f7b74baf
Fix CkEditor's toolbar initial state
2018-03-20 15:07:20 +01:00
442f15df98
Add help text in all the apps + french translation
2018-03-08 15:39:46 +01:00
7a70d69d8e
Hide editor toolbars by default when using a small screen
2018-03-07 17:34:55 +01:00
b0dba481d8
Fix small UI issues and IE issues
2018-03-02 18:33:43 +01:00
ee3b926e84
Get rid of ckeditor's reset_all class...
2018-03-01 10:33:28 +01:00
2c90cb5907
Move help button in drawer and fix drawer style
2018-02-28 17:59:27 +01:00
d975bb9cc0
Fix focus after pad creation screen
2018-02-28 13:16:30 +01:00
60b2384885
Move initial state into a help block
2018-02-27 17:38:29 +01:00
80df45f257
Get text from ckeditor
2018-02-01 10:09:08 +01:00
fb192a2c45
Add a configurable background color in the file app in view mode
2018-01-31 14:42:34 +01:00
c460e2820e
Fix a 1px offset for the userlist in Firefox/Windows
2018-01-11 16:09:29 +01:00
f329d65bc8
Ability to reduce the width of ckeditor
2017-12-22 18:01:15 +01:00
edc236e17b
Disable edition in pad read-only mode
2017-12-20 12:15:43 +01:00
c269929319
Fix creation page not displayed in pad and slide
2017-12-11 17:17:06 +01:00
617c4b6044
CSS refactorings and pad-is-not-pinned work
2017-12-07 19:00:13 +01:00
c702a23c77
Initial work on the 'pad will expire' logic
2017-12-05 17:48:30 +01:00
644f6e9985
Use the bounce app to open links from inner
2017-11-27 14:44:44 +01:00
812df7de6f
Merge branch 'merge-staging' into staging
2017-11-27 12:18:34 +01:00
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
2e00214783
drop unreachable code
2017-11-23 16:57:01 +01:00
ee6c2097f5
resolve merge conflicts
2017-11-23 16:56:49 +01:00
cf26c4c286
Improve the toolbar UI for smaller screens
2017-11-17 18:21:45 +01:00
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
2017-11-09 17:07:04 +01:00
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
2017-11-09 15:36:49 +01:00
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
5dcfbd07ab
Merge branch 'theming-improvement' into staging
2017-10-27 18:32:08 +02:00
4933aafbc8
Added default values to avoid breaking existing themes.
2017-10-27 18:31:52 +02:00
735f0a7e30
Merge branch 'theming-improvement' into staging
2017-10-26 20:44:56 +02:00
83da9cf752
Moved colours to colortheme.less to enable theming
2017-10-26 20:29:14 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
a6b34491fc
freeze the editor when reconnecting
2017-10-13 13:40:51 +03:00
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
2017-10-12 15:42:09 +03:00
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03:00
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
2017-10-03 17:57:57 +03:00
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +03:00
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +02:00
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95542bcdaf
Lint
2017-09-19 15:38:19 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
72f0952835
Make sure we can't open a pad using the wrong app
2017-09-19 11:31:45 +02:00
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +02:00
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
2017-09-13 16:04:01 +02:00
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
2017-09-13 14:47:50 +02:00
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
8ef27dca08
Lint
2017-09-11 12:25:23 +02:00
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
2017-09-11 10:10:29 +02:00
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
2017-09-07 22:08:34 +02:00
0423a5f4e2
Clean secure iframe code
2017-09-06 18:26:10 +02:00
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
2017-09-06 16:05:20 +02:00
47ec959032
make sure contenteditable is not set in read only mode
2017-09-05 18:35:11 +02:00
6a735b441f
use paul's print styles
2017-09-05 18:16:06 +02:00
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
2017-09-05 17:29:03 +02:00
204e45dfae
Enable templates in pad
2017-09-05 11:57:44 +02:00
86e23ac19f
Use less2 in secure iframes
2017-09-04 15:09:54 +02:00
0d008aaa2e
Add indent settings to code2
2017-08-30 17:57:10 +02:00
0893bcc0e5
Merge branch 'staging' into code2
2017-08-30 14:57:19 +02:00
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 11:31:59 +02:00
be8ea4102e
keep trying to parse the hash until it works
2017-08-30 11:26:51 +02:00
4db4f66786
Remove an unnecessary fix for Safari
2017-08-30 11:14:58 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
1044531806
Fix Safari iframe size issue
2017-08-30 11:04:52 +02:00
51fa6287c1
Enable notifications in secure pads
2017-08-29 11:20:02 +02:00
40f062abda
restore app usage report in new pad
2017-08-29 10:50:02 +02:00
fe03e6ae83
bad code, lint
2017-08-28 17:53:23 +02:00
190dff1c9b
Use the bounce app for opening a link with the right click
2017-08-28 17:50:55 +02:00
0b4e044540
Fix the plugin to open a link in a new tab in pad
2017-08-28 17:26:51 +02:00
88cb4fd83c
Enable friend requests from secure pads
2017-08-28 16:21:05 +02:00
f89015d9ed
Update the tab title to match the pad title in pad2
2017-08-28 14:49:33 +02:00
056285a7b6
Move pad2 to pad and create bounce app
2017-08-28 12:25:05 +02:00
b081603455
Update requirejs
2017-08-21 18:08:37 +02:00
3315449114
Lets try this...
2017-08-16 14:30:17 +02:00
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
2017-08-16 12:40:15 +02:00
725e19925c
Yeah, that was silly...
2017-08-16 12:11:25 +02:00
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
2017-08-16 10:19:24 +02:00
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-14 16:24:17 +02:00
7ca60e55a7
Lock the pad's inner-iframe down with CSP
2017-08-14 16:23:38 +02:00
5e6e76dfc1
make regex case insensitive
2017-08-14 14:41:23 +02:00
2cc6c636db
Add some missing titles
2017-08-08 16:20:31 +02:00
dc7db074e8
open pad links when clicking in readOnly mode
2017-08-03 11:04:38 +02:00
331b4dddea
Clean debugging code
2017-07-19 17:50:08 +02:00
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
88813aee02
Show that only html can be imported in pads
2017-07-19 16:36:10 +02:00
7be1e249e1
add fa-share-alt to pad initialText
2017-07-13 15:48:03 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
5a3e9c785c
Fix ckeditor toolbar
2017-06-29 18:15:41 +02:00
ed0121d172
Lint errors
2017-06-29 18:05:34 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
7a5c5ce0a3
load scripts asynchronously
2017-06-29 12:17:08 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
cfc5907237
remove unnecessary style rules
2017-06-28 10:41:08 +02:00
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
852c028822
don't allow editing if pad type is wrong
2017-06-22 14:31:55 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
2017-06-14 15:33:12 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
76c530037b
enable donate button in all apps
2017-05-30 15:51:07 +02:00
99a44f119f
don't send referrer headers on pads which may link outward
2017-05-30 10:44:40 +02:00
1240b864ef
fix misconfigured history
2017-05-29 17:25:06 +02:00
716245f864
Make all the buttons look the same
2017-05-15 16:16:50 +02:00
c00158d23a
Move code to common-history
2017-05-10 13:39:14 +02:00
ff16084719
Fix lint errors
2017-05-09 18:10:02 +02:00
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
2017-05-09 17:47:47 +02:00
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
2017-05-05 17:56:49 +02:00
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
2017-04-18 12:14:32 +02:00
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
2017-04-13 19:46:38 +02:00
df4a250359
use feedback api instead of app=
2017-04-13 12:18:08 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
233bb7a14f
reorganize some html tags for smaller diffs
2017-03-29 18:38:06 +02:00
71c59d7ae2
Remove unnecessary TODOs
2017-03-27 11:53:13 +02:00
d92a875ce5
Translate the 'wrong application' error message
2017-03-27 11:34:54 +02:00
a8ffac5dcd
Remove old code
2017-03-27 11:30:09 +02:00
912215185f
add uid to userdata for better notifications
2017-03-24 13:32:42 +01:00
4a173e30dc
set user's cursor to either the beginning or end of the document
2017-03-20 17:51:56 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
2017-03-15 16:01:00 +01:00
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 10:59:20 +01:00
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
2017-03-08 18:05:15 +01:00
8a48612de2
add some notes for later
2017-03-07 14:40:06 +01:00
c04819538b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-03 18:16:39 +01:00
fcb9848b3a
hide toolbar when in read-only mode
2017-03-03 18:16:34 +01:00
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
2017-03-03 18:14:53 +01:00
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
7db0e14bc0
add 'force' flag to override removal of html elements
2017-03-01 17:05:57 +01:00
412815b042
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
2017-03-01 13:10:55 +01:00
11d54256da
Make sure the display name is displayed in the same way everywhere
2017-03-01 13:10:06 +01:00
639376f1cb
don't use hyperjson.toString
2017-03-01 12:36:10 +01:00
86adfbf27d
update cache-busting directive in all supported apps
2017-02-28 10:47:18 +01:00
8741b50f5b
Set the file name as default title if a pad is created from the drive
2017-02-27 18:15:18 +01:00
e38df7ce47
Fix creation of new pads in /pad
2017-02-27 17:47:11 +01:00
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
2017-02-27 14:29:38 +01:00
fadddb297c
Readonly mode in /pad had contenteditable set to true
2017-02-27 12:41:29 +01:00
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 18:55:48 +01:00
5303e76ece
Make sure the content is correctly applied in onReady
2017-02-24 18:55:41 +01:00
cc829d51f8
jshint compliance
2017-02-24 18:23:43 +01:00
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
a0340f1419
Open link in a new tab in /pad
2017-02-23 14:27:18 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
c17f28e5fe
Fix race condition #2
2017-02-17 15:39:34 +01:00
8167ed9048
implement cache-busting everywhere
2017-02-17 12:39:01 +01:00
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
2851ceb95a
Merge branch 'soon' into staging
2017-02-13 11:59:49 +01:00
1232aa8a79
jshint compliance
2017-02-10 14:25:02 +01:00
a995df25f6
disable new OT in pad and code app
2017-02-09 17:20:13 +01:00
d54262c8df
Use the same disconnecter error translation key for all the apps
2017-02-09 15:34:14 +01:00
3af7c9cff8
Replace the expand/collapse ckeditor button by our own to save space
2017-02-08 15:32:55 +01:00
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
a4286f1c83
Merge branch 'soon' into newtoolbar
2017-01-27 16:52:49 +01:00
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
ce1e792419
Merge branch 'soon' into newtoolbar
2017-01-24 12:54:07 +01:00
69fb8b4d2f
Merge branch 'master' into soon
2017-01-23 15:13:26 +01:00
f8455875a9
Fix the NoScript (iframe not loaded) bug with inner iframes
2017-01-23 15:07:38 +01:00
1e1bfd275c
Don't show the tab notification when someone has joined the pad
2017-01-19 15:17:21 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
b5acdb8cc0
Disable zooming on mobile
2017-01-12 18:50:39 +03:00
40985f1811
Dubious height setting for iOS
2017-01-12 18:49:46 +03:00
52d8d8db1d
Get rid of margins on mobile
2017-01-12 18:49:46 +03:00
cd0931c951
UI improvements for mobile browsers
2017-01-12 18:49:46 +03:00
605072cfbf
Fix empty title with new documents
2017-01-12 15:15:10 +01:00
4963c77b61
Fix the title reset bug
2017-01-12 14:29:40 +01:00
6c5e8d3118
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
2017-01-11 18:00:41 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
a3cd100c94
apply yflory's safari patch
2017-01-09 11:46:51 +01:00
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
b33661d9d5
don't toggle maximization state after setting
2017-01-05 15:21:17 +01:00
f020fd5a75
remove /customize/pad.js from main apps
2016-12-28 15:12:22 +01:00
e9376a66c2
apply 'cp' class for unified styles
2016-12-27 14:29:20 +01:00
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
a220742f68
fix reversed color settings
2016-12-16 15:31:22 +01:00
308db7fa79
fix uncolored /pad/ content in IE
2016-12-16 15:25:06 +01:00
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:03:00 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
de0863e232
use new ot
2016-12-06 16:22:42 +01:00
4cd9bd5534
strip listeners
2016-12-06 16:21:11 +01:00
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
2016-11-07 15:08:49 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
d009b7400c
fall back to default title if one is not suggested
2016-11-07 12:29:57 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
3de4e5709b
Clean the code
2016-10-26 17:50:59 +02:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
46c5f64369
remove absent users from the userlist
2016-10-19 12:30:25 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
e739c49e7f
Remove the 'about' button in ckeditor
2016-10-11 11:57:07 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
5e76194262
use new config api
2016-10-03 19:28:36 +02:00
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
bc73fa2074
Merge branch 'fontawesome' into soon
2016-09-29 14:52:48 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
2016-09-28 09:01:33 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
a266f0bee1
query parameter for messages
2016-09-27 11:01:32 +02:00
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
2016-09-23 16:40:07 +02:00
a82b7aaf8b
allow empty names
2016-09-23 16:06:46 +02:00
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
73d5ea967b
Fix an error created by the merge
2016-09-22 16:34:06 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
2016-09-21 15:03:36 +02:00
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
a9e2ca8d72
make tests green again
2016-09-20 23:31:29 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
e6785b4dad
push /pad/ state once ready to avoid OT collision
2016-09-20 16:35:55 +02:00
bf8c9a2c4b
Add a button to get the read only URL
2016-09-20 11:35:57 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
6363d3fb90
Pad titles are now shared with the userdoc
2016-09-16 12:49:47 +02:00
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
7c5ee53e81
resolve conflict and merge
2016-08-25 18:01:03 +02:00
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
e386749e89
unlock the editor after your name has been set (or not)
2016-08-25 11:36:20 +02:00
2d5caf38d9
show a spinner until the document has loaded
2016-08-04 17:00:30 +02:00
fd0a7337a3
wait a full minute until requirejs times out
2016-08-04 12:44:27 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
4833cf0d7b
add a fontpicker
2016-07-28 09:24:14 +02:00
6cb2f72aa6
pretty print html during export if possible
2016-07-27 11:38:25 +02:00
fe3f02f5e0
enable text foreground and background colors
2016-07-25 15:38:59 +02:00
992bc4f449
add missing script
2016-07-25 11:09:25 +02:00
a995f2306d
fix undefined variable reference
2016-07-16 12:42:23 +02:00
44fe95c76b
add titles to buttons on pad and code
2016-07-16 12:38:21 +02:00
yflory