 yflory
|
13288ee18b
|
Update the userlist in code, slide and pad
|
2017-06-22 15:52:25 +02:00 |
|
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
2017-06-22 11:21:37 +02:00 |
|
|
yflory
|
92b6e60573
|
Small improvements for the new toolbar
|
2017-06-22 11:13:53 +02:00 |
|
|
yflory
|
8d956c3de6
|
New toolbar
|
2017-06-21 18:04:35 +02:00 |
|
|
yflory
|
503e9de07c
|
Lint errors
|
2017-06-20 18:00:57 +02:00 |
|
|
yflory
|
b7a0547b77
|
New toolbar colors
|
2017-06-20 17:59:11 +02:00 |
|
|
yflory
|
fe6a9e5d8d
|
Update bower.json
|
2017-06-20 14:59:08 +02:00 |
|
|
yflory
|
3052ec8abb
|
Merge branch 'newCk' into staging
|
2017-06-20 14:57:19 +02:00 |
|
|
yflory
|
c3f636851a
|
Fix path size width in drive
|
2017-06-20 14:56:15 +02:00 |
|
|
yflory
|
c22f610d5c
|
Fix the drive integrity check
|
2017-06-20 12:59:44 +02:00 |
|
|
yflory
|
fb388f2610
|
Fix an issue with invalid drive before migration
|
2017-06-20 12:42:30 +02:00 |
|
|
yflory
|
59fb5bd8be
|
One toolbar color per app
|
2017-06-20 12:33:50 +02:00 |
|
|
yflory
|
5a248db267
|
Merge branch 'staging' into newCk
|
2017-06-20 10:57:40 +02:00 |
|
|
yflory
|
728272d936
|
Fix undefined function
|
2017-06-20 10:29:03 +02:00 |
|
|
yflory
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
2017-06-20 10:03:13 +02:00 |
|
|
yflory
|
1275f3f3a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 17:59:18 +02:00 |
|
|
yflory
|
f5da7ae42e
|
Add a new loading tip in french
|
2017-06-19 17:59:12 +02:00 |
|
|
yflory
|
dbfad9d227
|
Lint
|
2017-06-19 16:02:27 +02:00 |
|
|
yflory
|
91d46cdee4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 15:58:26 +02:00 |
|
|
yflory
|
d3b9ac2511
|
Update the preview and present content on Ready in slides
|
2017-06-19 15:58:10 +02:00 |
|
|
yflory
|
54adb680e7
|
Hide the slide number in the title outside of present mode
|
2017-06-19 15:26:27 +02:00 |
|
|
yflory
|
a38819f5b9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 14:41:38 +02:00 |
|
|
yflory
|
1ad1b78c64
|
Fix the history mode with readOnly and old URLs
|
2017-06-19 14:41:31 +02:00 |
|
|
yflory
|
f1aef66fc9
|
Fix the drive history
|
2017-06-19 12:35:45 +02:00 |
|
|
yflory
|
008c417111
|
Context menu was not hidden after a click in the drive
|
2017-06-19 12:08:53 +02:00 |
|
|
yflory
|
377a90961b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-19 11:53:13 +02:00 |
|
|
yflory
|
e40f43bd20
|
Migrated pads were not displayed instantly in the drive
|
2017-06-19 11:52:57 +02:00 |
|
|
yflory
|
928dadcf77
|
Fix toolbar dropdown menus not visible in slide
|
2017-06-19 10:37:01 +02:00 |
|
|
yflory
|
1df11f2813
|
Update the font-size when entering/leaving present mode
|
2017-06-19 10:26:14 +02:00 |
|
|
yflory
|
66d8c0ed11
|
Add a preview mode to the slide app
|
2017-06-16 15:11:32 +02:00 |
|
|
yflory
|
a5924cb803
|
Make sure the initial title is set in the userDoc when creating a new pad
|
2017-06-15 18:50:39 +02:00 |
|
|
yflory
|
8b5f4dbd47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 18:36:35 +02:00 |
|
|
yflory
|
3a36040ba7
|
lint
|
2017-06-15 18:36:23 +02:00 |
|
|
yflory
|
24c14ffbf3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 16:31:09 +02:00 |
|
|
yflory
|
5bfd8470cb
|
Display the file size before downloading it
|
2017-06-15 16:30:50 +02:00 |
|
|
yflory
|
594405de73
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 15:36:23 +02:00 |
|
|
yflory
|
cbe21959b4
|
Update UI for the file/media app
|
2017-06-15 15:35:52 +02:00 |
|
|
yflory
|
c2c04bd5d8
|
Lint
|
2017-06-15 15:02:31 +02:00 |
|
|
yflory
|
7f25c9a8e1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 14:58:24 +02:00 |
|
|
yflory
|
2068a8b85b
|
Embed the mediatag library in the file app
|
2017-06-15 14:58:18 +02:00 |
|
|
yflory
|
cd5705b3f3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 13:54:09 +02:00 |
|
|
yflory
|
1e9bc89855
|
Fix drive icons when the name contains a long word
|
2017-06-15 13:54:02 +02:00 |
|
|
yflory
|
927f6404b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 13:35:07 +02:00 |
|
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
2017-06-15 12:32:44 +02:00 |
|
|
yflory
|
f3f1cf9e6d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-15 11:05:07 +02:00 |
|
|
yflory
|
a237eec41e
|
Add a file picker in the slide app
|
2017-06-15 11:04:58 +02:00 |
|
|
yflory
|
a4f45caebb
|
Lint
|
2017-06-14 18:25:54 +02:00 |
|
|
yflory
|
0a4e876139
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 17:52:23 +02:00 |
|
|
yflory
|
8738b42861
|
Update the drive UI to show that Upload and New are linked to a folder
|
2017-06-14 17:51:48 +02:00 |
|
|
yflory
|
1077b3b267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-14 15:55:10 +02:00 |
|
|
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
2017-06-14 15:55:03 +02:00 |
|
|
yflory
|
7e0a2abc2c
|
Fix the file name when restoring an element from the trash
|
2017-06-14 13:03:10 +02:00 |
|
|
yflory
|
5b523be171
|
Fix drag&drop for pads in the drive
|
2017-06-14 12:55:46 +02:00 |
|
|
yflory
|
e51f678bb9
|
Don't display the popup whne moving a file to the trash
|
2017-06-14 12:50:44 +02:00 |
|
|
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
2017-06-14 12:47:37 +02:00 |
|
|
yflory
|
494b44e2b1
|
fix lint errors
|
2017-06-14 10:04:54 +02:00 |
|
|
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
2017-06-13 18:38:53 +02:00 |
|
|
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
2017-06-13 17:57:27 +02:00 |
|
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
2017-06-13 17:21:22 +02:00 |
|
|
yflory
|
2032c08066
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 16:15:11 +02:00 |
|
|
yflory
|
f9c26645cf
|
Upload images using the slide app
|
2017-06-13 16:15:04 +02:00 |
|
|
yflory
|
a57f8679c5
|
Fix a race condition in the file app
|
2017-06-13 11:45:37 +02:00 |
|
|
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:38:16 +02:00 |
|
|
yflory
|
11e2226f1a
|
Fix lint errors
|
2017-06-13 11:38:04 +02:00 |
|
|
yflory
|
d7292e69c6
|
Fix undefined variable
|
2017-06-13 11:25:12 +02:00 |
|
|
yflory
|
d83d8dbeda
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:22:51 +02:00 |
|
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
2017-06-13 11:21:26 +02:00 |
|
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
2017-06-12 17:49:33 +02:00 |
|
|
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
2017-06-12 17:00:07 +02:00 |
|
|
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
2017-06-12 16:19:45 +02:00 |
|
|
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
2017-06-12 16:08:09 +02:00 |
|
|
yflory
|
376b60c21c
|
New toolbar temp
|
2017-06-12 15:59:24 +02:00 |
|
|
yflory
|
9c5bade83e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 14:37:29 +02:00 |
|
|
yflory
|
d1f4617419
|
Fix a race condition causing the preview part to be empty
|
2017-06-12 14:37:12 +02:00 |
|
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
2017-06-12 14:23:06 +02:00 |
|
|
yflory
|
298e34a9de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 12:47:47 +02:00 |
|
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +02:00 |
|
|
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
2017-06-12 12:27:24 +02:00 |
|
|
yflory
|
3ff3eac283
|
Fix a race condition causing the drive to be empty
|
2017-06-12 11:54:20 +02:00 |
|
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
2017-06-12 10:51:38 +02:00 |
|
|
yflory
|
1b671edce9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 10:50:30 +02:00 |
|
|
yflory
|
9a4a6e9b40
|
Always display the upgrade button in the drive
|
2017-06-12 10:17:52 +02:00 |
|
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
2017-06-09 17:03:01 +02:00 |
|
|
yflory
|
7134b00544
|
Add a button to display the context menu for the trash on mobiles
|
2017-06-09 17:02:50 +02:00 |
|
|
yflory
|
d24458e4b0
|
Fix the tests to work with the async migration
|
2017-06-09 16:41:51 +02:00 |
|
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
2017-06-09 16:39:44 +02:00 |
|
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
2017-06-09 15:56:45 +02:00 |
|
|
yflory
|
c1402fbb0a
|
Lint error
|
2017-06-09 15:56:18 +02:00 |
|
|
yflory
|
b36484931d
|
Lint
|
2017-06-09 15:55:46 +02:00 |
|
|
yflory
|
1fb638f519
|
clean the code
|
2017-06-09 15:50:13 +02:00 |
|
|
yflory
|
9d758a040b
|
Fix an issue with the search field not displayed properly
|
2017-06-09 15:45:46 +02:00 |
|
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:47:37 +02:00 |
|
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
2017-06-09 14:47:15 +02:00 |
|
|
yflory
|
9694272083
|
Fix html code not parsed
|
2017-06-09 14:42:55 +02:00 |
|
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:40:26 +02:00 |
|
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
2017-06-09 14:38:36 +02:00 |
|
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:38:21 +02:00 |
|
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 14:37:54 +02:00 |
|
|
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2017-06-09 14:36:38 +02:00 |
|
|
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
2017-06-09 14:36:35 +02:00 |
|