e3f79f914a
fix user hash
8 years ago
d232a5a83e
Revert "simplify key generation and remember user's additional keys"
...
This reverts commit 75786ff9ff
8 years ago
91a806ab86
focus on OK button when we pop an alert
8 years ago
850bd42149
don't try to display things that don't exist
8 years ago
75786ff9ff
simplify key generation and remember user's additional keys
8 years ago
621476424d
make strings translatable and refocus on correct input
8 years ago
a97696c712
show user's display name and account name
8 years ago
3560f0580f
commit prototype upload script
8 years ago
2f9f3d921a
trim excess whitespace from usernames
8 years ago
89e5830409
make alertify display time configurable
8 years ago
49d80d91d9
don't load customize/pad.js anymore
8 years ago
f020fd5a75
remove /customize/pad.js from main apps
8 years ago
aae443c8e9
replace old poll app with new
8 years ago
387f4ebf5d
add this important js file I forgot
8 years ago
8f0de589dc
add missing cp class to more html
8 years ago
e9376a66c2
apply 'cp' class for unified styles
8 years ago
8b034a9554
better flow and animations for login page
8 years ago
db12b5e896
move text for login page into translation file
8 years ago
5e1d8292c5
guard against trying to parse special fragments
8 years ago
51067430f9
more restructuring of user app
8 years ago
a4ed2388e2
use 'box' class
8 years ago
eb620bee77
restructure user application
8 years ago
a10eac2773
Fix lint errors
8 years ago
52a593c2c2
fix jshint complaints
8 years ago
53a4d4738a
really make sure you're logged out
8 years ago
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
81259fc25f
Refresh unsorted and templates when files data changes
8 years ago
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
9b6c9e3891
Add support for templates in the file manager
8 years ago
acfc27f5c5
fix merge conflicts
8 years ago
3197b62fbb
latest work
8 years ago
29d406b7a9
implement cryptput
8 years ago
84d5e4b35d
better tools for playing with template code
8 years ago
1772cc93c8
Fix the taildoc bug
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
86cda4357b
handle more possible cases
8 years ago
1682d23c1c
remove old user prototype
8 years ago
046220f239
Add info boxes for the different categories
8 years ago
403ba53980
Fix typo error
8 years ago
e9418af88b
Add an info box in the file manager
8 years ago
c359c27997
Use user object as default store in file manager
8 years ago
4aed585574
Fix style issues in the toolbar
8 years ago
f9db7e588e
Fix unused backup in localStorage
8 years ago
c7e63f63fd
Use the user object in file manager if it exists
8 years ago
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
8 years ago
bd6992da0a
create a random hash
8 years ago
2cd50498c2
add log(in|out) functions to common
8 years ago
dfea802c77
better crypto hygeine, start thinking more about ui
8 years ago
e3f484d876
File manager in the home page, lint
8 years ago
7df460c766
implement createChannelId api
8 years ago
3698fe8b0e
Merge branch 'soon' into login
8 years ago
5a14db9f07
Merge branch 'test-filemanager' into login
8 years ago
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
4646d5c866
Add suport for read-only mode in the file manager
8 years ago
2a624a0b60
add example usage for cryptget.js
8 years ago
303953a431
Merge branch 'soon' into login
8 years ago
6b9529b121
implement ajax-like functionality for zk docs
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
8 years ago
8a7fda6341
Merge branch 'soon' into login
8 years ago
a220742f68
fix reversed color settings
8 years ago
308db7fa79
fix uncolored /pad/ content in IE
8 years ago
67baf30d65
basic outline of logins
8 years ago
2968488278
convert uint8 arrays to hex
8 years ago
d95a3ac92e
Fix an issue when deleting a key from the proxy
8 years ago
82f3d5f852
Open the file manager of someone else
8 years ago
c0d96fb10d
Merge branch 'login' into test-filemanager
8 years ago
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
8 years ago
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
8e6830d080
Fix file manager with a chosen hash
8 years ago
2b077a8e95
add the file manager in the main page
8 years ago
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
b7f2ef97c7
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
8 years ago
fdb5c2ddb5
Fix UI issues with rename and delete actions
8 years ago
319ce5d8c8
Fix the code app
8 years ago
ee56f5608f
Fix the infinite spinner bug with the file manager store
8 years ago
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
5cd7d8ec84
Fix undefined userid in new poll
8 years ago
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
8 years ago
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
8 years ago
b7b4a034a3
Merge branch 'soon' into newpoll
8 years ago
ddc99cecb1
Fix lint errors
8 years ago
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
8 years ago
6feb8548b3
Prevent the proxy handlers from being called on the parents
8 years ago
740b6e955e
Improve UI, fix issues with the table
8 years ago
94fbc2dca4
prototype cryptographic login
8 years ago
a23b3d3517
use new ot in code too
8 years ago
de0863e232
use new ot
8 years ago
4cd9bd5534
strip listeners
8 years ago
b79618c94a
don't allow listeners in /slide/
8 years ago
ebff304602
turn off some unwanted behaviour
8 years ago
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
8 years ago
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
8 years ago
3632834500
Lock inputs when the user is not editing them
8 years ago
eaeaf4df40
Improve UI, add title input and forget button
8 years ago
bca746bbb5
Fix uncommitted column, add toolbar
8 years ago
ffedcb63f7
Display own column at the beginning, add uncommitted column
8 years ago
4a4d4a0474
most recent work
8 years ago
e5ff7020fb
move buttons out of form
8 years ago
c88fa34558
Improve UI, fix issues with new file manager channels
8 years ago
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
8 years ago
19e4a2d044
Create new files, sort displayed elements
8 years ago
a957b72598
Create a new pad from the file manager
8 years ago
4fcdece4af
Test create new pad from the file manager
8 years ago
d6e1215166
Refresh the directory if needed when the object has changed
8 years ago
118829617f
Use the FS store as default store
8 years ago
aa14ea7ac4
Use the old store format
8 years ago
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
8 years ago
7a035fa4a0
Fix drag and drop with multiple elements selected
8 years ago
d77970975c
Add translations, ability to select multiple elements, clean the code
8 years ago
eb50177201
do a bit of work to preserve cursors
8 years ago
ac43f4cb1f
new prototype poll
8 years ago
f05efbb113
Clean the code
8 years ago
851d3df656
Ability to see, move and delete unsorted files
8 years ago
43d93938c3
Fix the list, find the unsorted files, ability to add a folder
8 years ago
cfe3d38197
Add expend/collapse to the tree, fix CSS, add list/grid view modes
8 years ago
c9cd06514c
Add "restore" from trash, improve drag and drop and update css
8 years ago
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
8 years ago
c2770a7a74
set correct hash even if browser does not implement replaceState
8 years ago
d009b7400c
fall back to default title if one is not suggested
8 years ago
e77ad4e909
better fixes for export
8 years ago
75dd4a5926
slightly better test for variable
8 years ago
b7d9998b9b
fix reference to undefined variable
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
8e1bff706b
Add drag and drop, rename and delete actions
8 years ago
67bf41627d
comment out dead code so CI doesn't complain
8 years ago
002e22ee9a
turn off unwanted behaviour until we can do it correctly
8 years ago
5fc44a6e4b
Merge branch 'soon' into fixpolls
8 years ago
ce9eb47351
Initial state of the file manager app
8 years ago
2d5448458b
export messages
8 years ago
b1370c05b7
add translation completeness test to assertion page
8 years ago
5f6ebb5cc1
fix incorrect regex for c-like title detection
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
8 years ago
636b0fcadc
do our best to keep the console quiet
8 years ago
3de4e5709b
Clean the code
8 years ago
ab1d3958ce
Add a pencil icon when hovering the title
8 years ago
6d1e06cca3
Add notifications when a user joins or leaves the channel
8 years ago
54a63267cd
Add a share button and merge the viewers and editors buttons
8 years ago
87d86384ac
Fix broken elements in the new toolbar
8 years ago
6351d1856f
Remove the top bar and move its content in the applications' toolbars
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
0a9d34a6c9
hide appended color pickers
8 years ago
c858b247c1
filter absent users from the userlist
8 years ago
ac3ddbab70
expose userList for later usage
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
8 years ago
46c5f64369
remove absent users from the userlist
8 years ago
51a79c5218
Remove unused dependency
8 years ago
9a733bb360
Fix dropdown menus with Edge
8 years ago
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
d2389a5729
Change the userlist in the toolbar
8 years ago
e739c49e7f
Remove the 'about' button in ckeditor
8 years ago
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
53fe002d3b
Merge branch 'slide' into soon
8 years ago
6c04b7967d
Remove unused library
8 years ago
d63c912af0
Use the HTML5 color picker to change the colors in slides
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
d7e170c797
Test colorpicker
8 years ago
81fce1237f
Colorpicker to choose the background color in present mode
8 years ago
5300bc363c
Fix a race condition in the slide application
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
8 years ago
a28daf2715
use websocket url configuration api
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
8 years ago
5e76194262
use new config api
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
1c808b3da8
Add comment for the 'important' css rule
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
8c33218ceb
Move the codemirror themes in /common
8 years ago
2609af2105
Use the CodeMirror editor in the slide application
8 years ago
b5b0eacebc
Remove the old (non-bower) codemirror
8 years ago
261d2fecbc
Get codemirror from bower and use that version in the code app
8 years ago
bc73fa2074
Merge branch 'fontawesome' into soon
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
a266f0bee1
query parameter for messages
8 years ago
c16e8d603b
Enable reconnecting websocket in code pad
8 years ago
d6525087c7
jshint compliancy
8 years ago
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
8 years ago
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
8 years ago
a82b7aaf8b
allow empty names
8 years ago
2267ec8c43
Slides in read-only were not updated with the latest content
8 years ago
eac0cdd6dd
Enable read-only mode in slides
8 years ago
d46bd1af5c
Improve the toolbar UI with the username displayed
8 years ago
79884e2400
Use the same username for all pads
8 years ago
73d5ea967b
Fix an error created by the merge
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
99004428d5
Enable the read-only mode in Cryptpoll
8 years ago
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
a9e2ca8d72
make tests green again
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
e6785b4dad
push /pad/ state once ready to avoid OT collision
8 years ago
723df4880e
Merge branch 'slides' into merge-slides
8 years ago
b96f050555
Merge branch 'board' into merge-boards
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
2d42cadb23
push /code/ state once ready to avoid OT collision
8 years ago
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
8 years ago
bf8c9a2c4b
Add a button to get the read only URL
8 years ago
99b50465c7
Add the read-only mode for /pad and /code
8 years ago
42f14873cd
Merge branch 'translations' into newhashmerge
8 years ago
391b7690e6
Set the pad to readonly mode when using a 'view' url
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
6363d3fb90
Pad titles are now shared with the userdoc
8 years ago
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
cc4bca8004
execute callbacks on presentation events
8 years ago
8bf79ef915
serialize slide pads as a sorted object
8 years ago
997b46a3f7
limit the size of rendered images
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c35c7cda20
hide wizard after computing results
8 years ago
0dae949c4f
fix scrolljank bug
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
122a9fe068
realtime kanban board
8 years ago
4561ddcdf3
add missing semicolon
8 years ago
8031770f90
rename "module" to "APP" in /slide/ for jshint
8 years ago
8e86be81b2
Merge branch 'better-slides'
8 years ago
fb21b4e46b
fix up /render/
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
2f2aeef0e5
add missing semicolon
8 years ago
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
168338b898
add missing functions
8 years ago
7c5ee53e81
resolve conflict and merge
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
e386749e89
unlock the editor after your name has been set (or not)
8 years ago
aa91ebd24e
don't initialize until the store is ready
8 years ago
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
dcebb9597f
prototype of password based key derivation
8 years ago
848f16e8f5
unused function which computes values for the table
8 years ago
18ea61dc9a
use diffdom for sanitation and better redraws
8 years ago
c62d064ee9
add a 'share' button which copies the url to the clipboard
8 years ago
b229a18ccf
notify users of changes if the visibility api is supported
8 years ago
d64e06c12e
don't make empty options
8 years ago
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
8 years ago
8c914dfe1f
better filenames
8 years ago
f1619f4a0f
get /slide/ up to par with other prototypes
...
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
8 years ago
269eba3c47
remove commit button if a user is removed
8 years ago
f8f66800d1
display a 'commit' button which locks your column
8 years ago
85540bad12
leave all columns locked unless you've visited before
8 years ago
d679cac666
fewer log statements for the console
8 years ago
55b1a17b0d
off by one error
8 years ago
235c0482f9
increase clickable area around editable columns' checkboxes
8 years ago
c76aaac542
don't make columns with empty names
8 years ago
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
8 years ago
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
8 years ago
e2b162bf6d
snapshot some dead code
8 years ago
55666e9f70
remember presentations, and label them correctly on the home page
8 years ago
5a3da11c40
very simple presentation with markdown
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
8 years ago
da6e5d73d0
fix undefined reference
8 years ago
043041523f
on import, fall back to setting language from file extension
8 years ago
deb63d2447
share syntax highlighting selection with peers
8 years ago
2d5caf38d9
show a spinner until the document has loaded
8 years ago
fd0a7337a3
wait a full minute until requirejs times out
8 years ago
975bff5794
show a spinner until the document has loaded
8 years ago
a58f58535b
better regex for pulling titles out of c-like comments
8 years ago
5131f47cca
jshint compliance
8 years ago
306d524416
fix broken removal call
8 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
8 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
8 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
8 years ago
9a5294016d
fix incorrect usage of store api
8 years ago
4e5f381325
add spinner to API. update bower deps
8 years ago
01d9923e15
export Cryptpad at window level
8 years ago
fa654a7646
slightly better regex
8 years ago
254d800a3b
add a /p/ route so that we don't break old urls
8 years ago
cd18075ac7
add some redirection logic to support old hash types
8 years ago
600f3151e9
don't use the store until it's ready to be used
8 years ago
fffa9acf15
remove unused files from fs and jshintignore
8 years ago
551d38c930
let the abstraction take care of stringification
8 years ago
9b16d529ca
add one more missing script that caused handlebar highlighting to break
8 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
8 years ago
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
8 years ago
7f02c899ea
add snippet for copying text to the clipboard
8 years ago
93142b364f
tests for pretty printed html
8 years ago
4833cf0d7b
add a fontpicker
8 years ago
ansuz