Commit graph

1176 commits

Author SHA1 Message Date
ansuz
562e5b8c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:17:16 +01:00
ansuz
5d4d530c89 switch registration text to an explanation of how login works 2017-02-13 11:17:00 +01:00
yflory
bff9d05210 Make sure the login_name is in the object 2017-02-13 11:15:30 +01:00
yflory
b1b294aade Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 11:10:40 +01:00
ansuz
20083264b2 load fontawesome icons on register page 2017-02-13 11:09:44 +01:00
yflory
3aa03225c9 Add a spinner when hashing the password and translate homepage 2017-02-13 11:09:30 +01:00
ansuz
fbcf4ccec4 force usernames to be lowercase 2017-02-13 11:01:30 +01:00
ansuz
5614bea271 redirect users to login and register from toolbar 2017-02-13 10:51:54 +01:00
ansuz
f723585758 add api to check whether the realtime has synced with the server 2017-02-13 10:42:17 +01:00
ansuz
3b1bd2f720 use additional translation keys for registration 2017-02-13 10:15:25 +01:00
ansuz
b5b2454f0b use bootstrap for login and register pages 2017-02-10 18:29:49 +01:00
ansuz
c556f78562 log in directly from home page, sign up at /register/ 2017-02-10 16:49:17 +01:00
ansuz
d0edf75c89 signup link directs users to register page, not user 2017-02-10 16:48:28 +01:00
ansuz
1232aa8a79 jshint compliance 2017-02-10 14:25:02 +01:00
yflory
8eec7ec7c8 Fix typo 2017-02-10 11:00:34 +01:00
ansuz
88af104ce8 basic registration page to replace user page 2017-02-09 18:50:28 +01:00
ansuz
a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00
ansuz
f92ba193c3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-09 17:16:03 +01:00
ansuz
e100110741 implement log in as an api 2017-02-09 16:31:57 +01:00
yflory
d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +01:00
yflory
f8366e0cfc Remove support for legacy store and add a way to import legacy pads 2017-02-09 15:23:09 +01:00
yflory
342cb44cf7 Ability to migrate a anon drive directly from the drive 2017-02-09 12:58:08 +01:00
ansuz
c642bce984 restore disabled listener 2017-02-09 10:31:00 +01:00
yflory
67d881b2cf Remove the drive entry from the user menu if already in drive 2017-02-08 16:25:52 +01:00
yflory
e865b89f43 Add the contextmenu button in the drive dynamically 2017-02-08 15:41:50 +01:00
yflory
3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space 2017-02-08 15:32:55 +01:00
yflory
914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory
702798f65a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:47:24 +01:00
yflory
1e2cc6bea4 Fix race condition with the iframe store 2017-02-07 18:47:10 +01:00
ansuz
dae17588c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:27:28 +01:00
ansuz
32a5c5ff62 better integration between /user/ and home 2017-02-07 17:50:37 +01:00
ansuz
fe7ba98338 remove dead code from /user/ 2017-02-07 17:50:02 +01:00
ansuz
9b047bfb53 don't autocorrect usernames. add trailing slash to /drive 2017-02-07 17:28:32 +01:00
ansuz
6e97082ff9 remove dead code from login function 2017-02-07 17:27:36 +01:00
yflory
b3e73b0f0b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 16:49:31 +01:00
yflory
367a02c031 Add mobile support for the code app 2017-02-07 16:49:25 +01:00
yflory
628148d001 Display the contextmenu button only if contextmenu exists 2017-02-07 13:09:14 +01:00
ansuz
8a1acc3c37 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 10:40:03 +01:00
ansuz
6f07a3b7b4 erase lingering sessionStorage values when logging out 2017-02-07 10:39:42 +01:00
yflory
ac79fbb5a2 Improve mobile support for the toolbar and the drive 2017-02-06 18:06:59 +01:00
yflory
9f1789b2d2 Fix creation of pads from non-root category in the drive 2017-02-06 14:47:37 +01:00
yflory
7e7d1f7a16 Display the error when opening a document with the wrong app 2017-02-06 12:43:56 +01:00
yflory
6f0d33dc1d Fix missing placeholder in the Slide app 2017-02-06 12:14:33 +01:00
yflory
7d6e15e465 Throw an error when trying to open a document with the wrong app 2017-02-06 12:06:39 +01:00
yflory
ad82a275bc Replace the Apps button by a New button again 2017-02-06 11:39:04 +01:00
yflory
fd33ffd56f Fix issue creating a patch everytime the user clicked in an app 2017-02-06 11:12:08 +01:00
yflory
fbbf8a2829 Replace initialState by a placeholder in slide and code 2017-02-03 18:45:30 +01:00
yflory
87abfac5e0 Fix lint error 2017-02-03 16:53:47 +01:00
yflory
02439e0f61 Improve the homepage with new images and translations 2017-02-03 16:03:36 +01:00
yflory
f57c8c0e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:40:45 +01:00
yflory
2c6b4b9c6a Hide disabled applications from the context menu in drive 2017-02-02 18:40:39 +01:00
ansuz
85b49d5ec8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:37:09 +01:00
yflory
91299f5f30 Ability to access the drive from any pad 2017-02-02 18:22:59 +01:00
yflory
b0fb56fa63 Allow logge din users to access the home page 2017-02-02 18:09:27 +01:00
ansuz
72c4175b6f remove slide/oldmain.js 2017-02-02 14:44:43 +01:00
yflory
e607ba5dad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 11:33:44 +01:00
yflory
9cea8d82c2 Fix left-click disabled in Edge after renaming a file 2017-02-02 11:33:37 +01:00
ansuz
2dfe182d8d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 11:27:17 +01:00
ansuz
0ca1775657 add page for listing missing translations 2017-02-02 11:27:08 +01:00
yflory
6a5769405b Fix a race condition issue introduced with reconnecting patch 2017-02-01 18:48:30 +01:00
yflory
8881334ca8 Fix renaming folders from the tree 2017-02-01 17:46:05 +01:00
yflory
65054119cf Fix a bug preventing reconnection in drive 2017-02-01 17:21:54 +01:00
yflory
89da142204 Fix pad creation from the context menu 2017-02-01 15:52:47 +01:00
yflory
757ae7a3ad Fix a cross origin frame issue with dropdowns 2017-02-01 12:19:54 +01:00
ansuz
3321d01040 add background image 2017-01-31 19:48:55 +01:00
yflory
8427b6ae8e Fix 'sort by type' in drive 2017-01-31 17:00:30 +01:00
yflory
39c85ca3f7 Fix race condition causing missing translations in homepage 2017-01-31 12:01:33 +01:00
yflory
dc39c4e179 Fix a race condition causing the drive toolbar to be missing 2017-01-31 11:50:20 +01:00
yflory
2e247d44c7 Hide the backup icon when logged in 2017-01-31 10:59:23 +01:00
yflory
8ed593bfff Keep the anon drive when signing up 2017-01-31 10:46:41 +01:00
yflory
5e69b78334 Remove the domain from the href in store 2017-01-30 18:52:27 +01:00
yflory
a9c9d19212 Hide the template from the list in the drive until it's done 2017-01-30 17:46:08 +01:00
yflory
487650df78 Remove the remember me checkbox 2017-01-30 15:32:42 +01:00
yflory
58d8a30b5b Redirect to the main page when logging out 2017-01-30 15:26:32 +01:00
yflory
29578a7400 Merge branch 'hpbs' into newtoolbar 2017-01-30 14:45:02 +01:00
yflory
2d79649949 Fix the 'NoScript' bug with the drive 2017-01-30 12:28:21 +01:00
yflory
5ef074370b Name a place before creating it in the drive 2017-01-27 17:51:08 +01:00
yflory
02906b3945 Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar 2017-01-27 16:57:22 +01:00
yflory
a4286f1c83 Merge branch 'soon' into newtoolbar 2017-01-27 16:52:49 +01:00
yflory
0e9e0e545f Load the new pad when the hash is changed 2017-01-27 14:57:45 +01:00
yflory
e41cbb92d8 Use default FILES_DATA name if not provided 2017-01-26 16:52:23 +01:00
yflory
fa1582f307 Replace 'filename' by 'title' in drive when there is no filename 2017-01-26 16:43:26 +01:00
yflory
c44f3a1044 Delete multiple elements could also remove unselected ones 2017-01-26 16:18:43 +01:00
yflory
b79e1e48c7 Update colors in drive 2017-01-26 14:52:34 +01:00
yflory
fb48484d2a Fix the rename feature in drive not working with tables 2017-01-26 14:51:59 +01:00
yflory
3f44444f41 Display the 'New' button in the trash 2017-01-26 13:19:40 +01:00
yflory
00efc96919 Move the toolbar and add a breadcrumb 2017-01-26 12:56:19 +01:00
yflory
6f5ff07c2b Display the elements as a table instead of a list 2017-01-25 18:33:59 +01:00
yflory
95056315cf Move the folder icon style to the less file 2017-01-25 17:29:06 +01:00
yflory
8c7305bf1b Use less to write the drive stylesheet 2017-01-25 16:21:46 +01:00
yflory
11f0a9ae5f Revert the changes adding anonymous pads 2017-01-25 15:35:40 +01:00
yflory
f42665ba49 Remove the unowned pads category 2017-01-25 14:27:06 +01:00
yflory
cb85ad3fdf Merge branch 'newtoolbar' into ownedpads 2017-01-25 10:23:03 +01:00
yflory
75f1eed712 Merge branch 'newtoolbar' into hpbs 2017-01-25 10:21:50 +01:00
yflory
373b07ed28 Fix lint errors 2017-01-25 10:21:31 +01:00
yflory
097f78d777 Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar 2017-01-25 10:01:49 +01:00
yflory
015e6fc262 Make sure we have the same hash in all the tabs when disconnecting 2017-01-24 18:17:23 +01:00
yflory
88021f2264 Anonymous pads fo anonymous users 2017-01-24 18:14:29 +01:00
yflory
8ccd845d52 Merge branch 'newtoolbar' into hpbs 2017-01-24 12:54:32 +01:00
yflory
ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory
9d275daebb Backport changes for the login page from hpbs branch 2017-01-24 12:47:53 +01:00
yflory
a5c03c1540 Make sure data is migrated before leaving registration page 2017-01-24 12:38:06 +01:00
yflory
69fb8b4d2f Merge branch 'master' into soon 2017-01-23 15:13:26 +01:00
yflory
f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes 2017-01-23 15:07:38 +01:00
yflory
c77abfa7f4 Remove a second scrollbar in polls 2017-01-23 11:05:13 +01:00
yflory
5e36d9ea29 Fix polls table not updated with local events 2017-01-23 10:53:01 +01:00
yflory
39ca2e6dd6 Fix bootstrap conflict with context menus 2017-01-23 10:52:37 +01:00
yflory
d1bed5ae4b Fix polls table not updated with local events 2017-01-23 10:51:44 +01:00
yflory
26bea774cb Merge branch 'newtoolbar' into hpbs 2017-01-19 15:52:12 +01:00
yflory
99b8898e54 Apply new title when clicking on the page without pressing enter 2017-01-19 15:41:25 +01:00
yflory
ea8667302c Display only a placeholder when the poll title is default 2017-01-19 15:35:38 +01:00
yflory
7d66d391fc Merge branch 'newtoolbar' into hpbs 2017-01-19 15:17:30 +01:00
yflory
1e1bfd275c Don't show the tab notification when someone has joined the pad 2017-01-19 15:17:21 +01:00
yflory
5d5d03163e Add favicon and notifications in polls 2017-01-19 14:52:12 +01:00
yflory
3338000018 Add Esc and Arrow icons in the slide's present mode 2017-01-19 12:49:40 +01:00
yflory
efdae19f0c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:14:14 +01:00
yflory
36c8ade26c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:13:57 +01:00
yflory
fa8a0d5880 Merge branch 'newtoolbar' into hpbs 2017-01-19 10:53:55 +01:00
yflory
69bee7d79a Add data into the homepage 2017-01-18 18:02:32 +01:00
yflory
88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory
73d424b506 Improve the login UI (css and translations) 2017-01-17 16:21:12 +01:00
yflory
e006ed7076 Ability to log in from the main page 2017-01-17 11:52:44 +01:00
yflory
a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory
efed1f5efe Add handlers to login and logout buttons 2017-01-13 17:39:41 +01:00
yflory
767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory
2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory
4adde0f0c0 Use the new dropdown for userlist and share 2017-01-13 15:05:00 +01:00
yflory
70b73206b7 Merge branch 'brandones-master' into soon 2017-01-13 10:33:38 +01:00
yflory
efffd4974f Add createDropdown and createLanguageSelector in cryptpad-common 2017-01-12 18:28:38 +01:00
yflory
29c8f0bbef Use a FontAwesome spinner to replace the old unaligned one 2017-01-12 17:05:16 +01:00
Brandon Istenes
b5acdb8cc0 Disable zooming on mobile 2017-01-12 18:50:39 +03:00
Brandon Istenes
40985f1811 Dubious height setting for iOS 2017-01-12 18:49:46 +03:00
Brandon Istenes
52d8d8db1d Get rid of margins on mobile 2017-01-12 18:49:46 +03:00
Brandon Istenes
cd0931c951 UI improvements for mobile browsers 2017-01-12 18:49:46 +03:00
yflory
6352656737 Remove the default context menu in the entire drive 2017-01-12 15:55:35 +01:00
yflory
ed79b8870c Merge branch 'master' into soon 2017-01-12 15:37:48 +01:00
yflory
605072cfbf Fix empty title with new documents 2017-01-12 15:15:10 +01:00
yflory
4963c77b61 Fix the title reset bug 2017-01-12 14:29:40 +01:00
Caleb James DeLisle
35a853ffff Stop failing tests over missing translations because otherwise they'll almost never be passing. 2017-01-12 12:06:44 +01:00
yflory
3f1e287811 Fix an issue causing a user object to be turned into a pad 2017-01-12 11:09:45 +01:00
Caleb James DeLisle
994f6991c8 Merge branch 'master' into soon 2017-01-11 18:01:08 +01:00
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 2017-01-11 18:00:41 +01:00
yflory
569ea21705 Replace the language selector by our custom dropdown menu 2017-01-11 10:59:09 +01:00
ansuz
33b8de888e clean up unused files 2017-01-11 07:49:56 +01:00
yflory
26dd4ea11f Fix lint errors 2017-01-10 15:33:21 +01:00
yflory
4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
yflory
2be5db9540 Ability to open files in readonly mode
Fix CSS issues
2017-01-10 15:04:02 +01:00
ansuz
63b9d4e9fd remove path for backwards compatibility 2017-01-10 10:54:08 +01:00
yflory
f74d0a46a4 Remove the alert when pressing del in 'all files' 2017-01-09 18:38:05 +01:00
ansuz
b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
ansuz
74a12f50ac only migrate keys which don't already exist 2017-01-09 17:35:58 +01:00
ansuz
1c3f1a15cd make sure that /pad is resized after loading 2017-01-09 17:02:01 +01:00
yflory
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
ansuz
a3cd100c94 apply yflory's safari patch 2017-01-09 11:46:51 +01:00
ansuz
0373556475 support old hashes in /poll 2017-01-09 11:46:21 +01:00
yflory
d5561910d4 Move the file manager into /drive and add a toolbar 2017-01-06 18:26:41 +01:00
yflory
1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
yflory
bf764d26e7 Merge branch 'staging' into workgroups 2017-01-06 11:17:17 +01:00
yflory
3836b20b08 enable the file store 2017-01-06 11:16:56 +01:00
yflory
b0d4dad417 Fix creation of a new file manager object 2017-01-05 18:43:00 +01:00
yflory
5a8f0df19e Add support for reconnecting websocket 2017-01-05 18:42:18 +01:00
ansuz
b33661d9d5 don't toggle maximization state after setting 2017-01-05 15:21:17 +01:00
ansuz
e56cc49f79 catch errors that popped up because of a cross-origin iframe 2017-01-05 14:14:26 +01:00
ansuz
5080751a90 hide unnecessary scrollbar 2017-01-05 10:58:10 +01:00
ansuz
95617a11c8 fix broken paths in old poll 2017-01-05 10:57:13 +01:00
yflory
7a0442afe0 Drag and drop files into a workgroup 2017-01-04 18:24:20 +01:00
ansuz
05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz
5cd714b18a configure filestore usage via customize/application_config.js 2017-01-03 12:10:11 +01:00
ansuz
2b5085625c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-02 15:43:06 +01:00
yflory
69b1764c9d Missing entries in the context menu with users 2017-01-02 15:42:29 +01:00
ansuz
c6499d6789 make panel styles reusable 2016-12-30 15:30:35 +01:00
ansuz
34967ac354 encapsulate rendering functions so we can pass in cryptpad-common 2016-12-30 13:27:01 +01:00
ansuz
66b8c93205 remember time of first visit 2016-12-30 13:23:09 +01:00
ansuz
ba4df1a22c create examples directory with old prototypes 2016-12-30 13:22:15 +01:00
ansuz
0abf45bdc5 better fsStore debugging 2016-12-30 12:27:58 +01:00
ansuz
e3f79f914a fix user hash 2016-12-29 18:12:30 +01:00
ansuz
d232a5a83e Revert "simplify key generation and remember user's additional keys"
This reverts commit 75786ff9ff.
2016-12-29 17:51:58 +01:00
ansuz
91a806ab86 focus on OK button when we pop an alert 2016-12-29 17:10:59 +01:00
ansuz
850bd42149 don't try to display things that don't exist 2016-12-29 17:05:28 +01:00
ansuz
75786ff9ff simplify key generation and remember user's additional keys 2016-12-29 17:04:48 +01:00
ansuz
621476424d make strings translatable and refocus on correct input 2016-12-29 17:04:01 +01:00
ansuz
a97696c712 show user's display name and account name 2016-12-29 17:03:17 +01:00
ansuz
3560f0580f commit prototype upload script 2016-12-28 17:23:57 +01:00
ansuz
2f9f3d921a trim excess whitespace from usernames 2016-12-28 17:13:41 +01:00
ansuz
89e5830409 make alertify display time configurable 2016-12-28 17:13:00 +01:00
ansuz
49d80d91d9 don't load customize/pad.js anymore 2016-12-28 15:53:27 +01:00
ansuz
f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
ansuz
aae443c8e9 replace old poll app with new 2016-12-28 11:44:48 +01:00
ansuz
387f4ebf5d add this important js file I forgot 2016-12-28 11:01:14 +01:00
ansuz
8f0de589dc add missing cp class to more html 2016-12-28 10:45:14 +01:00
ansuz
e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz
8b034a9554 better flow and animations for login page 2016-12-27 12:32:20 +01:00
ansuz
db12b5e896 move text for login page into translation file 2016-12-27 12:31:16 +01:00
ansuz
5e1d8292c5 guard against trying to parse special fragments 2016-12-26 14:23:17 +01:00
ansuz
51067430f9 more restructuring of user app 2016-12-26 14:19:29 +01:00
ansuz
a4ed2388e2 use 'box' class 2016-12-26 14:19:02 +01:00
ansuz
eb620bee77 restructure user application 2016-12-26 14:17:39 +01:00
yflory
a10eac2773 Fix lint errors 2016-12-22 18:16:38 +01:00
ansuz
52a593c2c2 fix jshint complaints 2016-12-22 17:27:56 +01:00
ansuz
53a4d4738a really make sure you're logged out 2016-12-22 17:22:32 +01:00