yflory
|
34914785eb
|
lint compliance
|
2018-06-28 16:15:38 +02:00 |
|
yflory
|
a537f7de8b
|
Fix infinite loading screen caused by some browser settings
|
2018-06-28 16:13:52 +02:00 |
|
yflory
|
470f404a24
|
temp
|
2018-06-28 15:31:30 +02:00 |
|
ansuz
|
7aa7b82c60
|
merge staging
|
2018-06-28 13:33:54 +02:00 |
|
yflory
|
6dc7e7eff4
|
Disable WebWorkers by default
|
2018-06-26 14:15:25 +02:00 |
|
ansuz
|
d76f3dceab
|
remove comment
|
2018-06-25 14:30:41 +02:00 |
|
ansuz
|
fb5553f918
|
fix typo
|
2018-06-25 14:25:37 +02:00 |
|
yflory
|
fbe940c024
|
Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge)
|
2018-06-22 19:43:07 +02:00 |
|
ansuz
|
01614c4256
|
verify old user password before proceeding to change passwords
|
2018-06-22 15:34:50 +02:00 |
|
ansuz
|
85bcaa51f7
|
export a constant for the number of required bytes at login time
allocate bytes for blockSeed when changing passwords
|
2018-06-22 11:41:10 +02:00 |
|
yflory
|
a146f6acc9
|
Change user account password function
|
2018-06-22 10:37:54 +02:00 |
|
ansuz
|
9a7abe0b1e
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
2018-06-21 10:16:25 +02:00 |
|
ansuz
|
c2014c5906
|
a bit of cleanup, bug fixes, and lint compliance
|
2018-06-21 10:16:16 +02:00 |
|
yflory
|
36d1ae0f6c
|
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
|
2018-06-20 16:39:52 +02:00 |
|
yflory
|
71b085ba23
|
Owned drive migration UI
|
2018-06-20 16:39:01 +02:00 |
|
ansuz
|
c3741f847d
|
resolve conflicts from merge with staging
|
2018-06-20 14:29:13 +02:00 |
|
ansuz
|
d03339f20b
|
check for the presence of a blockHash in localStorage when logging in
|
2018-06-20 14:27:44 +02:00 |
|
ansuz
|
cb5fa72dba
|
implement removeLoginBlock rpc
|
2018-06-19 17:17:56 +02:00 |
|
yflory
|
7948fe2b70
|
Merge branch 'soon' into staging
|
2018-06-19 17:02:26 +02:00 |
|
yflory
|
29f577dfc6
|
Improve history to load it chunk by chunk
|
2018-06-19 17:02:16 +02:00 |
|
yflory
|
c802b761c7
|
Fix pads not stored in the correct folder the first time
|
2018-06-19 11:04:39 +02:00 |
|
yflory
|
d37aa0646e
|
Change account password (clientside RPC)
|
2018-06-14 18:18:53 +02:00 |
|
yflory
|
54d63df1cf
|
Ability to change the password of a pad
|
2018-06-14 17:18:32 +02:00 |
|
yflory
|
4896fe81fe
|
Merge branch 'serviceworker' into staging
|
2018-06-12 18:24:19 +02:00 |
|
yflory
|
1b49020753
|
Add support for async store when WebWorker is not available
|
2018-06-12 18:20:48 +02:00 |
|
yflory
|
9fbf507cda
|
Fix new version detection
|
2018-06-12 14:23:54 +02:00 |
|
yflory
|
089e0361b6
|
Detect new version
|
2018-06-11 16:52:26 +02:00 |
|
yflory
|
996245ec3d
|
Merge branch 'staging' into serviceworker
|
2018-06-11 10:17:50 +02:00 |
|
yflory
|
47dee664da
|
Add support for login & logout while keeping the same shared worker
|
2018-06-08 17:35:44 +02:00 |
|
yflory
|
02b282a1a5
|
Disconnect from shared/service worker
|
2018-06-08 16:45:07 +02:00 |
|
yflory
|
f05e2225d6
|
lint compliance
|
2018-06-06 18:22:48 +02:00 |
|
yflory
|
78ff55e34e
|
Fix race condition
|
2018-06-06 18:21:52 +02:00 |
|
yflory
|
48dc8c78b4
|
Fix cache and merge issues
|
2018-06-06 18:10:58 +02:00 |
|
yflory
|
14db9fad8e
|
Merge branch 'echidna' into serviceworker
|
2018-06-06 17:54:07 +02:00 |
|
yflory
|
598d56c75e
|
Fix cache issues
|
2018-06-06 17:45:43 +02:00 |
|
yflory
|
cefe19b0e1
|
Merge branch 'echidna' into serviceworker
|
2018-06-06 17:25:24 +02:00 |
|
yflory
|
953d98be96
|
Fix reconnect
|
2018-06-06 17:25:06 +02:00 |
|
yflory
|
6ab29f8f3a
|
Test service worker and shared worker store
|
2018-06-06 15:58:43 +02:00 |
|
yflory
|
3f8b6d3b8a
|
Fix default title issues when using a template
|
2018-06-04 16:02:58 +02:00 |
|
yflory
|
b9f5a0f52b
|
Move async store in a webworker!
|
2018-05-31 18:22:16 +02:00 |
|
yflory
|
85e5c495d9
|
Remove owned file
|
2018-05-30 14:36:29 +02:00 |
|
yflory
|
93ecc06964
|
Upload owned files
|
2018-05-29 19:42:20 +02:00 |
|
yflory
|
586193d6a1
|
Password-protected files: upload files with hashes V2
|
2018-05-28 15:31:18 +02:00 |
|
yflory
|
c7e08fedfb
|
Password-protected files
|
2018-05-25 18:00:10 +02:00 |
|
yflory
|
914da83b46
|
Fix missing edit hash in share modal when opening a pad in read-only mode
|
2018-05-23 16:55:23 +02:00 |
|
ansuz
|
bd66c8fee8
|
hacks to handle weird entries in drive
|
2018-05-18 10:28:31 +02:00 |
|
yflory
|
ef735d6fe6
|
Fix an issue when trying to create a pad with a password from a template
|
2018-05-17 18:15:10 +02:00 |
|
yflory
|
2d2701596a
|
Loading message and loading bar for migration
|
2018-05-04 18:41:54 +02:00 |
|
yflory
|
64c85fe548
|
Don't return channel in parsePadUrl
|
2018-04-27 17:23:23 +02:00 |
|
yflory
|
43d046406f
|
Store the channel id as pad attribute
|
2018-04-27 11:54:23 +02:00 |
|
yflory
|
b26ae67df5
|
Fix issues with channel ID when using a password
|
2018-04-26 15:10:31 +02:00 |
|
yflory
|
1879c1829c
|
Add passwod prompt to access protected pads
|
2018-04-25 19:03:58 +02:00 |
|
yflory
|
811463b870
|
Add support for version 2 hashes needed for password-protected pads
|
2018-04-24 17:22:33 +02:00 |
|
yflory
|
ec0fc85b9f
|
Sort templates by usage in the PCS
|
2018-04-13 18:52:55 +02:00 |
|
yflory
|
a718603b36
|
Automatic account deletion
|
2018-03-21 18:27:20 +01:00 |
|
yflory
|
07e361b88d
|
Account deletion button
|
2018-03-19 14:04:44 +01:00 |
|
yflory
|
c9ed6d6bf8
|
New pad creation screen
|
2018-03-13 11:31:08 +01:00 |
|
yflory
|
728a6a868d
|
Manage expired channels
|
2018-02-13 18:20:13 +01:00 |
|
yflory
|
bdafc101c9
|
Ability to remove owned channels from the drive
|
2018-01-29 15:17:53 +01:00 |
|
yflory
|
36550b781f
|
Don't check for stronger hash if we have an edit hash
|
2018-01-26 15:44:38 +01:00 |
|
yflory
|
9a317018e2
|
Remove deleted pads from the drive
|
2018-01-25 17:54:21 +01:00 |
|
yflory
|
c90ba890ca
|
Add more configurable options and add a new way to use custom config
|
2018-01-22 16:56:37 +01:00 |
|
yflory
|
0f02d76b56
|
Fix missing callback when uploading files to the drive
|
2018-01-03 15:08:26 +01:00 |
|
ansuz
|
869909b101
|
implement more reliable check for whether a channel on the server is new
|
2017-12-22 16:24:17 +01:00 |
|
ansuz
|
892dfb18f7
|
check if users have service workers
|
2017-12-21 17:30:54 +01:00 |
|
yflory
|
09433e0bf0
|
display existing tags in the prompt in drive
|
2017-12-19 10:16:53 +01:00 |
|
yflory
|
c18d4297e1
|
Fix friend requests from the userlist
|
2017-12-15 16:19:22 +01:00 |
|
ansuz
|
76af3b90a7
|
stub createUnpinnedWarning0
|
2017-12-12 13:47:24 +01:00 |
|
yflory
|
e96d54e655
|
Add a pad creation page
|
2017-12-07 18:51:50 +01:00 |
|
yflory
|
e72270d4a4
|
Add feedback when sharedworker is defined
|
2017-12-07 10:50:45 +01:00 |
|
yflory
|
1ac4abc482
|
Remove old code
|
2017-12-07 10:35:48 +01:00 |
|
yflory
|
64303b4090
|
Merge branch 'refactor' into staging
|
2017-12-07 10:34:15 +01:00 |
|
yflory
|
3e064e6638
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-06 18:33:16 +01:00 |
|
yflory
|
604ea1c95f
|
Feedback about webworkers
|
2017-12-06 18:32:48 +01:00 |
|
yflory
|
61935500f4
|
Lint compliance
|
2017-12-05 18:10:53 +01:00 |
|
yflory
|
9eb33e39e6
|
Enable change events in the drive
|
2017-12-05 18:09:43 +01:00 |
|
yflory
|
17636769e4
|
Remove the second network created for the drive
|
2017-12-05 16:40:04 +01:00 |
|
ansuz
|
291eb57027
|
fix auth app
|
2017-12-05 15:07:35 +01:00 |
|
yflory
|
52712c4bb9
|
Use the network from the async store for pads
|
2017-12-04 19:16:38 +01:00 |
|
yflory
|
e164edec03
|
Fix the webworker app
|
2017-12-01 18:29:59 +01:00 |
|
yflory
|
c59c6072f3
|
Remove jquery from outer
|
2017-12-01 16:05:23 +01:00 |
|
yflory
|
4903bd0757
|
Enable messenger in async store
|
2017-12-01 14:49:21 +01:00 |
|
yflory
|
bd85f1b003
|
Fix file upload and remove unnecessary dependencies
|
2017-12-01 10:16:48 +01:00 |
|
yflory
|
664625a6ef
|
Fix more async store issues
|
2017-11-30 18:22:26 +01:00 |
|
yflory
|
5c3237e093
|
Fix issues with the async store
|
2017-11-30 17:21:58 +01:00 |
|
yflory
|
b3688db202
|
Use async store
|
2017-11-30 15:01:17 +01:00 |
|
yflory
|
0840570fbf
|
Async store part 1
|
2017-11-30 10:33:09 +01:00 |
|
yflory
|
280a7c2765
|
Clean cryptpad-common
|
2017-11-23 12:28:49 +01:00 |
|
yflory
|
477f14bb8b
|
Put constants in a separate file
|
2017-11-21 16:46:19 +01:00 |
|
yflory
|
7f88d1d43a
|
Improve drive loading speed
|
2017-11-21 11:09:59 +01:00 |
|
yflory
|
c35e3d644e
|
Make sure dates are stored as numbers in the drive
|
2017-11-20 15:37:23 +01:00 |
|
yflory
|
7cfe64fc5b
|
Remove cryptpad-common dependency for some inner apps
|
2017-11-13 18:09:19 +01:00 |
|
yflory
|
1514ad5df3
|
Move the 'logged out' screen inside the sframe
|
2017-11-13 17:29:00 +01:00 |
|
yflory
|
5a2afb5c95
|
Remove Realtime and Messaging from common
|
2017-11-13 17:01:09 +01:00 |
|
yflory
|
30c8c253dd
|
Remove util and hash from common
|
2017-11-13 16:32:40 +01:00 |
|
yflory
|
c9e1de042c
|
Remove common-interface dependency from cryptpad-common
|
2017-11-13 12:00:26 +01:00 |
|
yflory
|
dc207393fd
|
Separate UI elements from cryptpad-common
|
2017-11-13 10:23:18 +01:00 |
|
yflory
|
354c63bd64
|
Clean old code
|
2017-11-09 18:17:49 +01:00 |
|
yflory
|
101482b8cc
|
Migrate settings to use a sandboxed iframe
|
2017-11-09 14:23:40 +01:00 |
|
yflory
|
0956905ca8
|
Wipe localForage on log out
|
2017-11-07 14:56:50 +01:00 |
|
yflory
|
6b9ffe8dd1
|
Make thumbnails more secure
|
2017-11-07 14:51:53 +01:00 |
|
yflory
|
c1d05a00ba
|
Improve media-tag export in pad to work with existing CSP
|
2017-10-23 10:55:40 +02:00 |
|
yflory
|
6920129126
|
Embed images from the drive in whiteboard
|
2017-10-17 12:19:57 +02:00 |
|
yflory
|
95ad25973e
|
Ability to delete a stronger pad from readonly mode
|
2017-10-12 11:41:53 +02:00 |
|
yflory
|
aa744567ed
|
Fix thumbnails in sframe apps
|
2017-10-09 11:52:34 +02:00 |
|
yflory
|
d2f1d0c0e9
|
Fix readme pad not added at registration in sframe drive
|
2017-09-25 16:09:54 +02:00 |
|
yflory
|
47fe7b1c53
|
Drive in sandboxed iframe
|
2017-09-22 19:35:06 +02:00 |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
2017-09-19 15:30:08 +02:00 |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
2017-09-18 14:26:54 +02:00 |
|
ansuz
|
47ce645897
|
implement slice
|
2017-09-14 11:51:33 +02:00 |
|
ansuz
|
6ed4f2fc64
|
fix a thing
|
2017-09-14 11:27:10 +02:00 |
|
ansuz
|
513f8e73d4
|
refactor cryptpad.ready to use nthen
|
2017-09-14 11:23:37 +02:00 |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
2017-09-12 18:40:11 +02:00 |
|
Caleb James DeLisle
|
041071e61c
|
manual merge
|
2017-09-11 15:52:14 +02:00 |
|
Caleb James DeLisle
|
7334173b4a
|
Hopefully fix infinite spinner whenever there is a disconnect (pad)
|
2017-09-11 15:46:21 +02:00 |
|
yflory
|
5bf966633c
|
Merge branch 'staging' into slide2
|
2017-09-08 18:21:38 +02:00 |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
2017-09-08 16:23:07 +02:00 |
|
ansuz
|
739903d511
|
don't check account usage if you aren't logged in
|
2017-09-08 14:00:49 +02:00 |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
2017-09-07 18:56:58 +02:00 |
|
ansuz
|
e8298f165a
|
only display first letter of name if user has no avatar
|
2017-09-07 16:35:24 +02:00 |
|
ansuz
|
85003f7a23
|
lint compliance
|
2017-09-07 14:21:54 +02:00 |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-07 12:45:18 +02:00 |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
2017-09-07 12:45:07 +02:00 |
|
yflory
|
04a04aef2b
|
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
|
2017-09-06 16:05:20 +02:00 |
|
yflory
|
0bb6698399
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 18:40:18 +02:00 |
|
yflory
|
e85b34f127
|
Add embed options in the secure pad hashes
|
2017-09-05 18:38:51 +02:00 |
|
ansuz
|
3d2a2da74e
|
add listAllTags api
|
2017-09-05 16:52:22 +02:00 |
|
ansuz
|
0e8a26e8eb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:37:02 +02:00 |
|
ansuz
|
1c50bb3f61
|
clear hung tooltips
|
2017-09-05 15:36:46 +02:00 |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
2017-09-05 15:34:38 +02:00 |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
2017-09-05 15:08:05 +02:00 |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
2017-09-05 11:38:17 +02:00 |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
2017-09-05 11:36:02 +02:00 |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
2017-09-04 15:09:54 +02:00 |
|
yflory
|
f12f4bb925
|
Integrate filepicker secure iframe in the code2 app
|
2017-09-01 15:17:14 +02:00 |
|
ansuz
|
72ef730f23
|
implement tag-related functions
|
2017-08-31 18:06:26 +02:00 |
|
ansuz
|
0302c06d0e
|
send feedback if client does not support symbols
|
2017-08-31 18:04:20 +02:00 |
|
yflory
|
89b7b644f3
|
Enable drag & upload in code2 and prepare filepicker
|
2017-08-31 16:32:26 +02:00 |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
2017-08-30 14:57:19 +02:00 |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
2017-08-30 12:26:11 +02:00 |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
2017-08-30 11:10:57 +02:00 |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
2017-08-29 11:49:10 +02:00 |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
2017-08-28 16:21:05 +02:00 |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
2017-08-28 13:53:24 +02:00 |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:22:38 +02:00 |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
2017-08-28 12:22:31 +02:00 |
|
ansuz
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
2017-08-28 11:47:01 +02:00 |
|
ansuz
|
91f6e3e543
|
remove a lot of dead code
|
2017-08-28 11:28:45 +02:00 |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
ansuz
|
b71f1860db
|
make uid function reusable
|
2017-08-24 11:31:20 +02:00 |
|
yflory
|
ec64ac485d
|
Fix 'not a function' error
|
2017-08-23 11:06:55 +02:00 |
|
Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
2017-08-23 11:04:44 +02:00 |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
2017-08-23 10:45:55 +02:00 |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
2017-08-22 18:18:58 +02:00 |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
2017-08-21 18:21:53 +02:00 |
|
yflory
|
e2d39de143
|
Forget button in pad2
|
2017-08-21 15:20:38 +02:00 |
|
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
2017-08-21 14:41:56 +02:00 |
|
yflory
|
140c6f3776
|
Add limit warning in pad2
|
2017-08-21 12:24:33 +02:00 |
|
yflory
|
30aef71603
|
Enable avatars in pad2
|
2017-08-21 12:01:38 +02:00 |
|
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
2017-08-18 16:34:41 +02:00 |
|
yflory
|
f5855a2870
|
Add account name in metadata manager
|
2017-08-17 16:25:25 +02:00 |
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
2017-08-17 15:07:34 +02:00 |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
2017-08-17 12:50:40 +02:00 |
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
2017-08-08 17:13:10 +02:00 |
|
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
2017-08-07 17:22:54 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
2017-08-04 18:07:47 +02:00 |
|
ansuz
|
9865359bb0
|
don't tell users about new versions
|
2017-08-04 14:05:00 +02:00 |
|
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
2017-08-03 15:04:29 +02:00 |
|
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
2017-08-03 14:12:07 +02:00 |
|
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
2017-08-02 16:51:41 +02:00 |
|
ansuz
|
311f709dc4
|
lint compliance
|
2017-07-31 17:15:17 +02:00 |
|
ansuz
|
542d0cd17f
|
drop support for legacy pad list
|
2017-07-31 15:34:56 +02:00 |
|
ansuz
|
3fa010027c
|
implement clearTooltips
|
2017-07-31 12:29:41 +02:00 |
|
ansuz
|
ae693ff5a7
|
lint compliance
|
2017-07-23 09:01:12 +02:00 |
|
ansuz
|
6622735db0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-22 14:15:15 +02:00 |
|
ansuz
|
55cb0734e2
|
make bad state timeout configurable
|
2017-07-22 10:56:39 +02:00 |
|
yflory
|
a80b00a765
|
Move the file picker in common
|
2017-07-20 18:32:03 +02:00 |
|
yflory
|
b9bba76b4e
|
Make the delay for tooltips configurable
|
2017-07-20 17:08:11 +02:00 |
|
yflory
|
c33d2a2db0
|
New tooltips
|
2017-07-19 17:14:10 +02:00 |
|
yflory
|
82c87144cb
|
Remove the friend request button when the request is sent
|
2017-07-19 14:14:34 +02:00 |
|
ansuz
|
c3ba7cd792
|
fix race condition
|
2017-07-13 12:55:08 +02:00 |
|
ansuz
|
d0d38aa2a3
|
feedback on first visit
|
2017-07-13 11:03:56 +02:00 |
|
ansuz
|
575d4612f9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 18:56:12 +02:00 |
|
ansuz
|
eda9908c3b
|
prevent accessing attributes of null
|
2017-07-12 18:56:04 +02:00 |
|
ansuz
|
eeb2ee2d17
|
add clear channel rpc
|
2017-07-12 18:55:29 +02:00 |
|
yflory
|
ac684a8dc7
|
Use the APP toolbar in profile
|
2017-07-12 18:34:16 +02:00 |
|
ansuz
|
0483d15b8f
|
lint compliance
|
2017-07-12 10:55:42 +02:00 |
|
ansuz
|
c0cb5c4263
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-12 10:46:15 +02:00 |
|
ansuz
|
5b3cca58bd
|
modifications to handle latest media-tag
|
2017-07-12 10:44:03 +02:00 |
|
yflory
|
a0b14faf89
|
Fix the font in settings and drive
|
2017-07-11 13:11:16 +02:00 |
|
yflory
|
e6188bfb63
|
Fix useradmin dropdown position
|
2017-07-10 12:38:54 +02:00 |
|
yflory
|
97d8d86395
|
Fix avatar in static pages
|
2017-07-10 12:03:44 +02:00 |
|
yflory
|
159d72f33b
|
Merge branch 'msg' into staging
|
2017-07-10 11:48:22 +02:00 |
|
yflory
|
8e2e8b1653
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-10 11:46:16 +02:00 |
|
yflory
|
ff10c282d4
|
Avatar in the user admin button
|
2017-07-10 11:46:06 +02:00 |
|
yflory
|
be6ee672d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-07-10 11:16:52 +02:00 |
|
yflory
|
f0523a0153
|
Avatar in the user admin menu
|
2017-07-10 11:16:44 +02:00 |
|