yflory
|
8ccd845d52
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
ce1e792419
|
Merge branch 'soon' into newtoolbar
|
8 years ago |
|
yflory
|
9d275daebb
|
Backport changes for the login page from hpbs branch
|
8 years ago |
|
yflory
|
a5c03c1540
|
Make sure data is migrated before leaving registration page
|
8 years ago |
|
yflory
|
69fb8b4d2f
|
Merge branch 'master' into soon
|
8 years ago |
|
yflory
|
f8455875a9
|
Fix the NoScript (iframe not loaded) bug with inner iframes
|
8 years ago |
|
yflory
|
c77abfa7f4
|
Remove a second scrollbar in polls
|
8 years ago |
|
yflory
|
5e36d9ea29
|
Fix polls table not updated with local events
|
8 years ago |
|
yflory
|
39ca2e6dd6
|
Fix bootstrap conflict with context menus
|
8 years ago |
|
yflory
|
d1bed5ae4b
|
Fix polls table not updated with local events
|
8 years ago |
|
yflory
|
26bea774cb
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
99b8898e54
|
Apply new title when clicking on the page without pressing enter
|
8 years ago |
|
yflory
|
ea8667302c
|
Display only a placeholder when the poll title is default
|
8 years ago |
|
yflory
|
7d66d391fc
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
1e1bfd275c
|
Don't show the tab notification when someone has joined the pad
|
8 years ago |
|
yflory
|
5d5d03163e
|
Add favicon and notifications in polls
|
8 years ago |
|
yflory
|
3338000018
|
Add Esc and Arrow icons in the slide's present mode
|
8 years ago |
|
yflory
|
efdae19f0c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
8 years ago |
|
yflory
|
36c8ade26c
|
Update the lists in the code and slide toolbars to use the new dropdown
|
8 years ago |
|
yflory
|
fa8a0d5880
|
Merge branch 'newtoolbar' into hpbs
|
8 years ago |
|
yflory
|
69bee7d79a
|
Add data into the homepage
|
8 years ago |
|
yflory
|
88d5b4cc9c
|
Add a 'New pad' button in the toolbar
|
8 years ago |
|
yflory
|
73d424b506
|
Improve the login UI (css and translations)
|
8 years ago |
|
yflory
|
e006ed7076
|
Ability to log in from the main page
|
8 years ago |
|
yflory
|
a9063e0459
|
Reload all tabs when the user logs in or out
|
8 years ago |
|
yflory
|
efed1f5efe
|
Add handlers to login and logout buttons
|
8 years ago |
|
yflory
|
767ba8b549
|
Select what we want to display in the toolbar
|
8 years ago |
|
yflory
|
2afdc11327
|
Replace the username button by a dropdown menu
|
8 years ago |
|
yflory
|
4adde0f0c0
|
Use the new dropdown for userlist and share
|
8 years ago |
|
yflory
|
70b73206b7
|
Merge branch 'brandones-master' into soon
|
8 years ago |
|
yflory
|
efffd4974f
|
Add createDropdown and createLanguageSelector in cryptpad-common
|
8 years ago |
|
yflory
|
29c8f0bbef
|
Use a FontAwesome spinner to replace the old unaligned one
|
8 years ago |
|
Brandon Istenes
|
b5acdb8cc0
|
Disable zooming on mobile
|
8 years ago |
|
Brandon Istenes
|
40985f1811
|
Dubious height setting for iOS
|
8 years ago |
|
Brandon Istenes
|
52d8d8db1d
|
Get rid of margins on mobile
|
8 years ago |
|
Brandon Istenes
|
cd0931c951
|
UI improvements for mobile browsers
|
8 years ago |
|
yflory
|
6352656737
|
Remove the default context menu in the entire drive
|
8 years ago |
|
yflory
|
ed79b8870c
|
Merge branch 'master' into soon
|
8 years ago |
|
yflory
|
605072cfbf
|
Fix empty title with new documents
|
8 years ago |
|
yflory
|
4963c77b61
|
Fix the title reset bug
|
8 years ago |
|
Caleb James DeLisle
|
35a853ffff
|
Stop failing tests over missing translations because otherwise they'll almost never be passing.
|
8 years ago |
|
yflory
|
3f1e287811
|
Fix an issue causing a user object to be turned into a pad
|
8 years ago |
|
Caleb James DeLisle
|
994f6991c8
|
Merge branch 'master' into soon
|
8 years ago |
|
Caleb James DeLisle
|
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
|
8 years ago |
|
yflory
|
569ea21705
|
Replace the language selector by our custom dropdown menu
|
8 years ago |
|
ansuz
|
33b8de888e
|
clean up unused files
|
8 years ago |
|
yflory
|
26dd4ea11f
|
Fix lint errors
|
8 years ago |
|
yflory
|
4278ac7637
|
Merge branch 'soon' into fileManager
|
8 years ago |
|
yflory
|
2be5db9540
|
Ability to open files in readonly mode
Fix CSS issues
|
8 years ago |
|
ansuz
|
63b9d4e9fd
|
remove path for backwards compatibility
|
8 years ago |
|
yflory
|
f74d0a46a4
|
Remove the alert when pressing del in 'all files'
|
8 years ago |
|
ansuz
|
b39067d2a1
|
jshint compliance
|
8 years ago |
|
ansuz
|
74a12f50ac
|
only migrate keys which don't already exist
|
8 years ago |
|
ansuz
|
1c3f1a15cd
|
make sure that /pad is resized after loading
|
8 years ago |
|
yflory
|
5b08fed7fa
|
Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
|
8 years ago |
|
ansuz
|
a3cd100c94
|
apply yflory's safari patch
|
8 years ago |
|
ansuz
|
0373556475
|
support old hashes in /poll
|
8 years ago |
|
yflory
|
d5561910d4
|
Move the file manager into /drive and add a toolbar
|
8 years ago |
|
yflory
|
1e70af0c16
|
Use the same network for the apps and the file store
|
8 years ago |
|
yflory
|
bf764d26e7
|
Merge branch 'staging' into workgroups
|
8 years ago |
|
yflory
|
3836b20b08
|
enable the file store
|
8 years ago |
|
yflory
|
b0d4dad417
|
Fix creation of a new file manager object
|
8 years ago |
|
yflory
|
5a8f0df19e
|
Add support for reconnecting websocket
|
8 years ago |
|
ansuz
|
b33661d9d5
|
don't toggle maximization state after setting
|
8 years ago |
|
ansuz
|
e56cc49f79
|
catch errors that popped up because of a cross-origin iframe
|
8 years ago |
|
ansuz
|
5080751a90
|
hide unnecessary scrollbar
|
8 years ago |
|
ansuz
|
95617a11c8
|
fix broken paths in old poll
|
8 years ago |
|
yflory
|
7a0442afe0
|
Drag and drop files into a workgroup
|
8 years ago |
|
ansuz
|
05a956879a
|
prepare new poll app for release
move old poll into poll/old
|
8 years ago |
|
ansuz
|
5cd714b18a
|
configure filestore usage via customize/application_config.js
|
8 years ago |
|
ansuz
|
2b5085625c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
69b1764c9d
|
Missing entries in the context menu with users
|
8 years ago |
|
ansuz
|
c6499d6789
|
make panel styles reusable
|
8 years ago |
|
ansuz
|
34967ac354
|
encapsulate rendering functions so we can pass in cryptpad-common
|
8 years ago |
|
ansuz
|
66b8c93205
|
remember time of first visit
|
8 years ago |
|
ansuz
|
ba4df1a22c
|
create examples directory with old prototypes
|
8 years ago |
|
ansuz
|
0abf45bdc5
|
better fsStore debugging
|
8 years ago |
|
ansuz
|
e3f79f914a
|
fix user hash
|
8 years ago |
|
ansuz
|
d232a5a83e
|
Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
|
8 years ago |
|
ansuz
|
91a806ab86
|
focus on OK button when we pop an alert
|
8 years ago |
|
ansuz
|
850bd42149
|
don't try to display things that don't exist
|
8 years ago |
|
ansuz
|
75786ff9ff
|
simplify key generation and remember user's additional keys
|
8 years ago |
|
ansuz
|
621476424d
|
make strings translatable and refocus on correct input
|
8 years ago |
|
ansuz
|
a97696c712
|
show user's display name and account name
|
8 years ago |
|
ansuz
|
3560f0580f
|
commit prototype upload script
|
8 years ago |
|
ansuz
|
2f9f3d921a
|
trim excess whitespace from usernames
|
8 years ago |
|
ansuz
|
89e5830409
|
make alertify display time configurable
|
8 years ago |
|
ansuz
|
49d80d91d9
|
don't load customize/pad.js anymore
|
8 years ago |
|
ansuz
|
f020fd5a75
|
remove /customize/pad.js from main apps
|
8 years ago |
|
ansuz
|
aae443c8e9
|
replace old poll app with new
|
8 years ago |
|
ansuz
|
387f4ebf5d
|
add this important js file I forgot
|
8 years ago |
|
ansuz
|
8f0de589dc
|
add missing cp class to more html
|
8 years ago |
|
ansuz
|
e9376a66c2
|
apply 'cp' class for unified styles
|
8 years ago |
|
ansuz
|
8b034a9554
|
better flow and animations for login page
|
8 years ago |
|
ansuz
|
db12b5e896
|
move text for login page into translation file
|
8 years ago |
|
ansuz
|
5e1d8292c5
|
guard against trying to parse special fragments
|
8 years ago |
|
ansuz
|
51067430f9
|
more restructuring of user app
|
8 years ago |
|
ansuz
|
a4ed2388e2
|
use 'box' class
|
8 years ago |
|
ansuz
|
eb620bee77
|
restructure user application
|
8 years ago |
|
yflory
|
a10eac2773
|
Fix lint errors
|
8 years ago |
|
ansuz
|
52a593c2c2
|
fix jshint complaints
|
8 years ago |
|
ansuz
|
53a4d4738a
|
really make sure you're logged out
|
8 years ago |
|
ansuz
|
63cd5c16ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
8 years ago |
|
yflory
|
81259fc25f
|
Refresh unsorted and templates when files data changes
|
8 years ago |
|
ansuz
|
5534da8abf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
|
8 years ago |
|
yflory
|
9b6c9e3891
|
Add support for templates in the file manager
|
8 years ago |
|
ansuz
|
acfc27f5c5
|
fix merge conflicts
|
8 years ago |
|
ansuz
|
3197b62fbb
|
latest work
|
8 years ago |
|
ansuz
|
29d406b7a9
|
implement cryptput
|
8 years ago |
|
ansuz
|
84d5e4b35d
|
better tools for playing with template code
|
8 years ago |
|
yflory
|
1772cc93c8
|
Fix the taildoc bug
|
8 years ago |
|
yflory
|
87abfff66b
|
Fix Flash Of Unstyled Content (fouc)
|
8 years ago |
|
ansuz
|
86cda4357b
|
handle more possible cases
|
8 years ago |
|
ansuz
|
1682d23c1c
|
remove old user prototype
|
8 years ago |
|
yflory
|
046220f239
|
Add info boxes for the different categories
|
8 years ago |
|
yflory
|
403ba53980
|
Fix typo error
|
8 years ago |
|
yflory
|
e9418af88b
|
Add an info box in the file manager
|
8 years ago |
|
yflory
|
c359c27997
|
Use user object as default store in file manager
|
8 years ago |
|
yflory
|
4aed585574
|
Fix style issues in the toolbar
|
8 years ago |
|
yflory
|
f9db7e588e
|
Fix unused backup in localStorage
|
8 years ago |
|
yflory
|
c7e63f63fd
|
Use the user object in file manager if it exists
|
8 years ago |
|
ansuz
|
6778a7062d
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
bd6992da0a
|
create a random hash
|
8 years ago |
|
ansuz
|
2cd50498c2
|
add log(in|out) functions to common
|
8 years ago |
|
ansuz
|
dfea802c77
|
better crypto hygeine, start thinking more about ui
|
8 years ago |
|
yflory
|
e3f484d876
|
File manager in the home page, lint
|
8 years ago |
|
ansuz
|
7df460c766
|
implement createChannelId api
|
8 years ago |
|
ansuz
|
3698fe8b0e
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
5a14db9f07
|
Merge branch 'test-filemanager' into login
|
8 years ago |
|
ansuz
|
dd46b9425a
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
4646d5c866
|
Add suport for read-only mode in the file manager
|
8 years ago |
|
ansuz
|
2a624a0b60
|
add example usage for cryptget.js
|
8 years ago |
|
ansuz
|
303953a431
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
6b9529b121
|
implement ajax-like functionality for zk docs
|
8 years ago |
|
yflory
|
5bc7766f44
|
Use a consistent toolbar across all apps
|
8 years ago |
|
ansuz
|
8a7fda6341
|
Merge branch 'soon' into login
|
8 years ago |
|
ansuz
|
a220742f68
|
fix reversed color settings
|
8 years ago |
|
ansuz
|
308db7fa79
|
fix uncolored /pad/ content in IE
|
8 years ago |
|
ansuz
|
67baf30d65
|
basic outline of logins
|
8 years ago |
|
ansuz
|
2968488278
|
convert uint8 arrays to hex
|
8 years ago |
|
yflory
|
d95a3ac92e
|
Fix an issue when deleting a key from the proxy
|
8 years ago |
|
yflory
|
82f3d5f852
|
Open the file manager of someone else
|
8 years ago |
|
ansuz
|
c0d96fb10d
|
Merge branch 'login' into test-filemanager
|
8 years ago |
|
yflory
|
c3e3aa69c3
|
Merge branch 'fileManager' into fmIndex
|
8 years ago |
|
ansuz
|
5d335ba796
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
8e6830d080
|
Fix file manager with a chosen hash
|
8 years ago |
|
yflory
|
2b077a8e95
|
add the file manager in the main page
|
8 years ago |
|
ansuz
|
f36d15d0db
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
|
8 years ago |
|
yflory
|
b7f2ef97c7
|
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
|
8 years ago |
|
yflory
|
fdb5c2ddb5
|
Fix UI issues with rename and delete actions
|
8 years ago |
|
yflory
|
319ce5d8c8
|
Fix the code app
|
8 years ago |
|
yflory
|
ee56f5608f
|
Fix the infinite spinner bug with the file manager store
|
8 years ago |
|
yflory
|
43ccd11adc
|
Merge branch 'infiniteSpinner' into fileManagerMerge
|
8 years ago |
|
yflory
|
05fd6c1563
|
Fix the infinite spinner problem
|
8 years ago |
|
yflory
|
5cd7d8ec84
|
Fix undefined userid in new poll
|
8 years ago |
|
yflory
|
cb43eb9ca1
|
Merge branch 'newpoll' into fileManagerMerge
|
8 years ago |
|
yflory
|
9b3719e0ae
|
Merge branch 'soon' into fileManagerMerge
|
8 years ago |
|
yflory
|
b7b4a034a3
|
Merge branch 'soon' into newpoll
|
8 years ago |
|
yflory
|
ddc99cecb1
|
Fix lint errors
|
8 years ago |
|
yflory
|
f26cdb1a21
|
Fix UI issues, unclickable user column, add confirm dialog
|
8 years ago |
|
yflory
|
6feb8548b3
|
Prevent the proxy handlers from being called on the parents
|
8 years ago |
|
yflory
|
740b6e955e
|
Improve UI, fix issues with the table
|
8 years ago |
|
ansuz
|
94fbc2dca4
|
prototype cryptographic login
|
8 years ago |
|
ansuz
|
a23b3d3517
|
use new ot in code too
|
8 years ago |
|
ansuz
|
de0863e232
|
use new ot
|
8 years ago |
|
ansuz
|
4cd9bd5534
|
strip listeners
|
8 years ago |
|
ansuz
|
b79618c94a
|
don't allow listeners in /slide/
|
8 years ago |
|
ansuz
|
ebff304602
|
turn off some unwanted behaviour
|
8 years ago |
|
yflory
|
6dff82ede2
|
Improve UI, scrollbar in the table, publish/admin buttons
|
8 years ago |
|
yflory
|
90804ed9e0
|
Add usernames/userlist in the toolbar and fix publish button
|
8 years ago |
|
yflory
|
3632834500
|
Lock inputs when the user is not editing them
|
8 years ago |
|
yflory
|
eaeaf4df40
|
Improve UI, add title input and forget button
|
8 years ago |
|
yflory
|
bca746bbb5
|
Fix uncommitted column, add toolbar
|
8 years ago |
|
yflory
|
ffedcb63f7
|
Display own column at the beginning, add uncommitted column
|
8 years ago |
|
ansuz
|
4a4d4a0474
|
most recent work
|
8 years ago |
|
ansuz
|
e5ff7020fb
|
move buttons out of form
|
8 years ago |
|
yflory
|
c88fa34558
|
Improve UI, fix issues with new file manager channels
|
8 years ago |
|
yflory
|
5a5451d94c
|
Sort elements in the trash, add properties in the context menu, fix issue with Edge
|
8 years ago |
|
yflory
|
19e4a2d044
|
Create new files, sort displayed elements
|
8 years ago |
|
yflory
|
a957b72598
|
Create a new pad from the file manager
|
8 years ago |
|
yflory
|
4fcdece4af
|
Test create new pad from the file manager
|
8 years ago |
|
yflory
|
d6e1215166
|
Refresh the directory if needed when the object has changed
|
8 years ago |
|
yflory
|
118829617f
|
Use the FS store as default store
|
8 years ago |
|
yflory
|
aa14ea7ac4
|
Use the old store format
|
8 years ago |
|
yflory
|
da19608269
|
Translate the context menus, Shift+Del shortcut and realtime object
|
8 years ago |
|
yflory
|
7a035fa4a0
|
Fix drag and drop with multiple elements selected
|
8 years ago |
|
yflory
|
d77970975c
|
Add translations, ability to select multiple elements, clean the code
|
8 years ago |
|
ansuz
|
eb50177201
|
do a bit of work to preserve cursors
|
8 years ago |
|
ansuz
|
ac43f4cb1f
|
new prototype poll
|
8 years ago |
|
yflory
|
f05efbb113
|
Clean the code
|
8 years ago |
|
yflory
|
851d3df656
|
Ability to see, move and delete unsorted files
|
8 years ago |
|
yflory
|
43d93938c3
|
Fix the list, find the unsorted files, ability to add a folder
|
8 years ago |
|
yflory
|
cfe3d38197
|
Add expend/collapse to the tree, fix CSS, add list/grid view modes
|
8 years ago |
|
yflory
|
c9cd06514c
|
Add "restore" from trash, improve drag and drop and update css
|
8 years ago |
|
ansuz
|
4c5cb79c20
|
Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
|
8 years ago |
|
ansuz
|
c2770a7a74
|
set correct hash even if browser does not implement replaceState
|
8 years ago |
|
ansuz
|
d009b7400c
|
fall back to default title if one is not suggested
|
8 years ago |
|
ansuz
|
e77ad4e909
|
better fixes for export
|
8 years ago |
|
ansuz
|
75dd4a5926
|
slightly better test for variable
|
8 years ago |
|
ansuz
|
b7d9998b9b
|
fix reference to undefined variable
|
8 years ago |