Commit graph

451 commits

Author SHA1 Message Date
ansuz
5e1d8292c5 guard against trying to parse special fragments 2016-12-26 14:23:17 +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
ansuz
5534da8abf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login 2016-12-22 16:54:51 +01:00
yflory
9b6c9e3891 Add support for templates in the file manager 2016-12-22 16:53:38 +01:00
ansuz
29d406b7a9 implement cryptput 2016-12-22 16:00:13 +01:00
yflory
87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz
1682d23c1c remove old user prototype 2016-12-21 18:06:05 +01:00
yflory
c359c27997 Use user object as default store in file manager 2016-12-20 17:27:45 +01:00
yflory
4aed585574 Fix style issues in the toolbar 2016-12-20 14:40:00 +01:00
ansuz
bd6992da0a create a random hash 2016-12-20 11:13:15 +01:00
ansuz
2cd50498c2 add log(in|out) functions to common 2016-12-20 11:11:40 +01:00
ansuz
7df460c766 implement createChannelId api 2016-12-19 14:55:39 +01:00
ansuz
5a14db9f07 Merge branch 'test-filemanager' into login 2016-12-19 12:37:28 +01:00
ansuz
303953a431 Merge branch 'soon' into login 2016-12-19 11:04:46 +01:00
ansuz
6b9529b121 implement ajax-like functionality for zk docs 2016-12-19 10:59:18 +01:00
yflory
5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +01:00
ansuz
2968488278 convert uint8 arrays to hex 2016-12-16 15:18:06 +01:00
yflory
8e6830d080 Fix file manager with a chosen hash 2016-12-12 18:24:45 +01:00
yflory
ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory
43ccd11adc Merge branch 'infiniteSpinner' into fileManagerMerge 2016-12-08 16:03:18 +01:00
yflory
05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
yflory
cb43eb9ca1 Merge branch 'newpoll' into fileManagerMerge 2016-12-07 16:59:43 +01:00
yflory
9b3719e0ae Merge branch 'soon' into fileManagerMerge 2016-12-07 16:59:32 +01:00
yflory
6dff82ede2 Improve UI, scrollbar in the table, publish/admin buttons 2016-12-05 18:54:46 +01:00
yflory
90804ed9e0 Add usernames/userlist in the toolbar and fix publish button 2016-12-01 18:40:09 +01:00
yflory
5a5451d94c Sort elements in the trash, add properties in the context menu, fix issue with Edge 2016-11-23 18:21:45 +01:00
yflory
a957b72598 Create a new pad from the file manager 2016-11-21 18:49:13 +01:00
yflory
d6e1215166 Refresh the directory if needed when the object has changed 2016-11-18 17:17:48 +01:00
yflory
118829617f Use the FS store as default store 2016-11-17 18:27:55 +01:00
ansuz
c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz
303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
ansuz
2d5448458b export messages 2016-11-03 12:45:11 +01:00
ansuz
d512b113cd address failure to parse url when hash is not present 2016-11-02 18:28:19 +01:00
yflory
ab1d3958ce Add a pencil icon when hovering the title 2016-10-26 17:49:16 +02:00
yflory
6d1e06cca3 Add notifications when a user joins or leaves the channel 2016-10-26 15:02:30 +02:00
yflory
54a63267cd Add a share button and merge the viewers and editors buttons 2016-10-25 18:34:23 +02:00
yflory
87d86384ac Fix broken elements in the new toolbar 2016-10-25 17:29:13 +02:00
yflory
6351d1856f Remove the top bar and move its content in the applications' toolbars 2016-10-25 15:22:35 +02:00
yflory
3d74290c7d Merge branch 'usability5' into staging 2016-10-24 18:33:10 +02:00
yflory
9e92a597b3 Ability to edit the title in the toolbar by clicking it 2016-10-24 18:32:43 +02:00
ansuz
a8612ed1c7 Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging 2016-10-24 14:54:35 +02:00
Yann Flory
10bb5e1607 Add the title in the toolbar 2016-10-21 18:16:27 +02:00
Yann Flory
1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad 2016-10-21 15:17:15 +02:00
yflory
51a79c5218 Remove unused dependency 2016-10-18 13:38:48 +02:00
yflory
9a733bb360 Fix dropdown menus with Edge 2016-10-13 15:00:53 +02:00
yflory
39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 2016-10-13 14:24:59 +02:00
yflory
24fbe22c9d Improve the toolbar style and the way the userlist is displayed 2016-10-12 18:40:26 +02:00
yflory
d2389a5729 Change the userlist in the toolbar 2016-10-11 18:39:43 +02:00
yflory
91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +02:00
ansuz
bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
yflory
765498e88e Remove the support for old.cryptpad.fr 2016-10-07 10:39:48 +02:00
yflory
c322aa440e Fix the username icon hcih was not working anymore 2016-10-05 18:19:52 +02:00
yflory
8575f3f79f Fix the "rename" feature which was not working anymore in some cases 2016-10-05 17:22:56 +02:00
yflory
a989b51d74 Fix race conditions with Alertify 2016-10-05 16:04:21 +02:00
yflory
74df38f94f Fix race conditions that could prevent applications from being loaded 2016-10-05 11:19:18 +02:00
ansuz
dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory
a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory
e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
ansuz
2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz
3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory
76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory
17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory
391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
yflory
8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
Yann Flory
2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
yflory
f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
yflory
3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz
d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
yflory
d46bd1af5c Improve the toolbar UI with the username displayed 2016-09-22 17:56:51 +02:00
yflory
79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory
dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
ansuz
f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
yflory
83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz
fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
Yann Flory
99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +02:00
Yann Flory
42f14873cd Merge branch 'translations' into newhashmerge 2016-09-19 14:53:40 +02:00
Yann Flory
391b7690e6 Set the pad to readonly mode when using a 'view' url 2016-09-19 14:52:36 +02:00
Yann Flory
368e253c9f Ability to send a read-only URL 2016-09-16 18:45:40 +02:00
yflory
5c63585952 Complete the French translation 2016-09-15 18:35:09 +02:00
yflory
0d9f63b977 Merge branch 'translations' - part one 2016-09-15 10:36:05 +02:00
yflory
f086492e50 Improve the localization system
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
yflory
25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
yflory
c736caceba Use a better default pad title 2016-09-13 12:24:06 +02:00
ansuz
97415d8158 Merge branch 'users' 2016-09-01 17:38:25 +02:00
ansuz
8e86be81b2 Merge branch 'better-slides' 2016-09-01 16:01:21 +02:00
ansuz
fb21b4e46b fix up /render/ 2016-09-01 15:54:21 +02:00
ansuz
4941c1493e better user integration. a few more common utils 2016-09-01 12:15:30 +02:00
ansuz
30ea1b59b7 integrate users into common utilities 2016-08-30 18:09:53 +02:00
ansuz
6d775f61c6 add missing functions 2016-08-30 10:06:14 +02:00
ansuz
168338b898 add missing functions 2016-08-29 18:10:15 +02:00
ansuz
f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 2016-08-25 17:59:37 +02:00
ansuz
f40b798d88 Merge pull request #30 from xwiki-labs/reconnect
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
yflory
c168ce2d1c Ability to reconnect after a connection failure 2016-08-25 17:56:17 +02:00
ansuz
1bec02239c coerce dates into strings 2016-08-25 11:19:09 +02:00
ansuz
0add01a940 remove dead code 2016-08-25 11:08:15 +02:00
ansuz
8c914dfe1f better filenames 2016-08-19 10:47:07 +02:00
ansuz
7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain 2016-08-05 17:17:49 +02:00
ansuz
5131f47cca jshint compliance 2016-08-03 17:03:50 +02:00
ansuz
306d524416 fix broken removal call 2016-08-03 16:53:41 +02:00
ansuz
dd3a5d47be migrate localStorage so people go to cryptpad.fr 2016-08-03 11:08:45 +02:00
ansuz
a094e3c02e use correct store api calls in frame.js
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
ansuz
dcc9810a42 avoid extra call to store if there are no keys to remove 2016-08-03 09:42:49 +02:00
ansuz
9a5294016d fix incorrect usage of store api 2016-08-03 09:35:16 +02:00
ansuz
4e5f381325 add spinner to API. update bower deps 2016-08-02 18:56:35 +02:00
ansuz
fa654a7646 slightly better regex 2016-08-02 17:08:46 +02:00
ansuz
cd18075ac7 add some redirection logic to support old hash types 2016-08-02 15:17:20 +02:00
ansuz
600f3151e9 don't use the store until it's ready to be used 2016-08-02 12:11:40 +02:00
ansuz
fffa9acf15 remove unused files from fs and jshintignore 2016-08-02 11:59:54 +02:00
ansuz
551d38c930 let the abstraction take care of stringification 2016-07-29 18:05:58 +02:00
ansuz
0ada6a3d0a jshint compliance. gotta keep those tests green 2016-07-28 17:52:26 +02:00
ansuz
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
ansuz
7f02c899ea add snippet for copying text to the clipboard 2016-07-28 10:08:51 +02:00
ansuz
42eafe9e29 don't create duplicate stylesheets in the document head 2016-07-25 15:39:54 +02:00
ansuz
c6bdb7506d forget everything about a pad when you forget it 2016-07-22 15:18:09 +02:00
ansuz
e84fbf0bc3 more helpers in common 2016-07-22 12:24:54 +02:00
ansuz
ff74a67a09 translate alertify button messages 2016-07-12 16:43:33 +02:00
ansuz
d39ab5c250 point to the actual translation file 2016-07-12 15:52:36 +02:00
ansuz
dea8e225db fix double scrollbar issue 2016-07-12 15:45:49 +02:00
ansuz
3eccec7054 better effort for translation 2016-07-11 17:36:53 +02:00
ansuz
cbeaa8d609 major refactoring for toolbar. CAN HAZ LESS 2016-07-08 16:45:48 +02:00
ansuz
7504f79e05 add log and warn methods to cryptpad common 2016-07-08 16:45:15 +02:00
ansuz
3ad5d71ab1 make sure the regular favicon is set 2016-07-07 13:43:08 +02:00
ansuz
fd3cd73d0b try to fix favicon bug 2016-07-07 13:40:03 +02:00
ansuz
589b0087a1 listen for keyup events while alertify prompts are active 2016-07-07 13:27:45 +02:00
ansuz
deae7ac78f don't hide the notification until it has been seen 2016-07-07 10:45:09 +02:00
ansuz
3d3c6e4800 add wrappers for alertifyjs 2016-07-06 22:20:15 +02:00
ansuz
73d2b6561a add small modules for page visibility api and notification apis 2016-07-06 22:16:17 +02:00
ansuz
d8b467422a fix default title in localStorage migration 2016-07-04 16:43:39 +02:00
ansuz
7a5877d12a don't filter pads after 30 days 2016-07-04 15:34:43 +02:00
ansuz
d844551fba add a forget button. clean up toolbar a bit 2016-06-30 17:24:25 +02:00
ansuz
8a82e11306 make sure title is defined for home page usage 2016-06-30 15:53:13 +02:00
ansuz
71b1f71ba0 fix migration to include ctime 2016-06-30 15:15:38 +02:00
ansuz
7da58a0de9 improve pad naming UX, slight refactoring
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
ansuz
a3da10766a add rename button to /code/ and /pad/ 2016-06-30 10:51:19 +02:00
ansuz
93dcf29c15 more functions for working with localstorage 2016-06-30 10:43:56 +02:00
ansuz
d025d13295 address some jshint complaints 2016-06-23 16:44:20 +02:00
ansuz
12bbf3e8f6 don't drop values onto the window 2016-06-23 16:38:40 +02:00
ansuz
ca45e3533d pass loaded file to callback when importing 2016-06-23 16:38:24 +02:00
ansuz
1a5905d9fd more work on highlighting modes in codemirror
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
ansuz
31aa09d6f6 work a bit more on import/export and code highlighting 2016-06-22 20:58:50 +02:00
ansuz
242c9a99e3 implement import and export in /pad/ 2016-06-22 17:00:07 +02:00
ansuz
0a8137e7eb move rememberPad to cryptpad common and simplify it a bit 2016-06-21 18:46:19 +02:00
ansuz
c3d2568d3c add file export for codepad
addresses #24
2016-06-17 10:59:45 +02:00
ansuz
2b8c21d292 set styles with setAttribute. fixes style fights 2016-06-16 13:00:48 +02:00
ansuz
1746a4e732 use crypto from bower 2016-06-06 12:35:06 +02:00
ansuz
2a3ff256b9 remove libraries which are now in bower 2016-06-06 12:29:45 +02:00
ansuz
f72cb24fc5 rm LORIA 2016-06-06 12:27:42 +02:00
ansuz
2c3de49922 remove realtime-input, since it's in bower now 2016-06-06 12:15:00 +02:00
ansuz
2798d1b1f9 all of the list/map api's dependencies are now on bower 2016-06-06 11:54:37 +02:00