ansuz
|
4a37bc4a1c
|
abort the realtime session if it does not synchronize for 30 seconds
|
2017-07-10 10:34:25 +02:00 |
|
ansuz
|
c60a71e210
|
add connect button and view profile button
|
2017-07-10 09:23:58 +02:00 |
|
Caleb James DeLisle
|
fcff5fa009
|
wip
|
2017-07-02 16:51:21 +02:00 |
|
yflory
|
472a62730b
|
Fix profile creation and add a link to the profile app
|
2017-06-30 17:24:22 +02:00 |
|
yflory
|
b153dda6ff
|
Add avatars in the user list
|
2017-06-30 16:57:23 +02:00 |
|
yflory
|
b9320e6005
|
Toolbar improvements
|
2017-06-30 11:42:54 +02:00 |
|
yflory
|
56a25e1036
|
Small fixes for the new toolbar
|
2017-06-29 15:15:40 +02:00 |
|
ansuz
|
9b6790534f
|
remove grey text from ckeditor initialState
|
2017-06-27 14:26:09 +02:00 |
|
yflory
|
36ef4178dc
|
Remove the editable title from the file app
|
2017-06-26 15:16:17 +02:00 |
|
yflory
|
dcfc59c2e2
|
Translation key updated
|
2017-06-22 11:21:37 +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
|
f13d23241c
|
Upgrade CkEditor to version 4.7
|
2017-06-20 10:03:13 +02:00 |
|
ansuz
|
b80d7513aa
|
skip over the terms of service link
|
2017-06-19 18:03:39 +02:00 |
|
ansuz
|
e2ff88e4c4
|
tooltips for file upload
|
2017-06-19 17:56:19 +02:00 |
|
yflory
|
66b076111e
|
Add an upload button to the slide's file picker
|
2017-06-15 12:32:44 +02:00 |
|
yflory
|
a237eec41e
|
Add a file picker in the slide app
|
2017-06-15 11:04:58 +02:00 |
|
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
2017-06-14 15:55:03 +02:00 |
|
ansuz
|
ea79294494
|
Merge pull request #134 from pbondoer/newpoll
More poll improvements
|
2017-06-13 14:32:46 +02:00 |
|
ansuz
|
88c2c0afde
|
Merge pull request #135 from blumeva/staging
Staging
|
2017-06-13 14:23:41 +02:00 |
|
XWiki SAS
|
49370764c1
|
change whiteboard translation
|
2017-06-12 18:14:33 +02:00 |
|
yflory
|
376b60c21c
|
New toolbar temp
|
2017-06-12 15:59:24 +02:00 |
|
Pierre Bondoerffer
|
685b352db8
|
poll: Add show help button
|
2017-06-12 14:25:10 +02:00 |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +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 |
|
yflory
|
ee57458158
|
Remove the pin limit alert
|
2017-06-06 10:49:32 +02:00 |
|
yflory
|
85f1fb86d0
|
Add missing french translation keys
|
2017-06-06 10:28:00 +02:00 |
|
ansuz
|
909bc2ebf3
|
add new translation key
|
2017-05-30 15:39:13 +02:00 |
|
ansuz
|
a70014dd11
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-30 10:46:17 +02:00 |
|
ansuz
|
75874424cf
|
add 'support cryptpad' translation key
|
2017-05-30 10:41:46 +02:00 |
|
ansuz
|
92a7970eb8
|
fix merge conflicts
|
2017-05-29 19:04:47 +02:00 |
|
ansuz
|
3915b30055
|
provide a register button on login
also direct users from file to login
|
2017-05-29 13:11:07 +02:00 |
|
Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
2017-05-29 12:59:49 +02:00 |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
2017-05-26 18:09:31 +02:00 |
|
Pierre Bondoerffer
|
1092285a68
|
merge master
|
2017-05-26 16:18:51 +02:00 |
|
ansuz
|
0a646a9534
|
remove unnecessary space
|
2017-05-23 12:35:49 +02:00 |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
2017-05-22 17:56:27 +02:00 |
|
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
2017-05-22 11:43:45 +02:00 |
|
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 10:41:55 +02:00 |
|
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
2017-05-22 10:41:47 +02:00 |
|
ansuz
|
af4fd3c6d3
|
resolve merge conflicts
|
2017-05-19 19:14:08 +02:00 |
|
yflory
|
1ab6eb3c5d
|
Add a queue for multiple uploads in the file app
|
2017-05-19 18:41:34 +02:00 |
|
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
2017-05-19 18:37:31 +02:00 |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-19 09:13:38 +02:00 |
|
ansuz
|
e7a458295b
|
new translation keys for file upload
|
2017-05-19 09:10:36 +02:00 |
|
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
2017-05-18 18:51:08 +02:00 |
|
yflory
|
21f9e31e75
|
Add a placeholder for the user app
|
2017-05-18 15:56:35 +02:00 |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
2017-05-18 15:05:37 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
2017-05-16 14:01:06 +02:00 |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
2017-05-15 13:54:03 +02:00 |
|
yflory
|
601226115b
|
New anonymous drive
|
2017-05-12 18:06:29 +02:00 |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
2017-05-11 10:58:33 +02:00 |
|
ansuz
|
6909f663b6
|
modify 'log out everywhere' text
|
2017-05-05 15:18:32 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
2017-04-18 18:31:58 +02:00 |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
2017-04-14 19:34:58 +02:00 |
|
ansuz
|
eed5b1260d
|
set font-size label to match other ckeditor font sizes
|
2017-04-14 18:20:40 +02:00 |
|
ansuz
|
84dd879abb
|
add messages for settings page
|
2017-04-14 17:22:00 +02:00 |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
2017-04-10 17:03:50 +02:00 |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
2017-04-10 11:55:39 +02:00 |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
2017-04-07 14:54:02 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
7908f3b4f0
|
make sure green UI elements use the same green
|
2017-03-30 15:50:06 +02:00 |
|
ansuz
|
a3a0592e5e
|
add English and French keys for the whiteboard app
|
2017-03-29 11:54:46 +02:00 |
|
ansuz
|
b50b76bf81
|
remove unnecessary lines
|
2017-03-27 18:13:21 +02:00 |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
2017-03-27 11:34:54 +02:00 |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
2017-03-27 11:14:37 +02:00 |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
2017-03-24 14:26:36 +01:00 |
|
ansuz
|
d1c32ea1f8
|
define english, french, and spanish labels for whiteboard app
|
2017-03-23 16:50:37 +01:00 |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
ansuz
|
ef0e1d7aa0
|
add a non-breaking space to pad initialState
|
2017-03-20 18:05:07 +01:00 |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
2017-03-17 18:03:00 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +01:00 |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
2017-03-15 17:20:08 +01:00 |
|
ansuz
|
dcc4e0dc6b
|
remove extraneous translation
|
2017-03-14 14:35:27 +01:00 |
|
ansuz
|
fcbe3a5224
|
add already registered message to english translation
|
2017-03-14 12:40:19 +01:00 |
|
ansuz
|
bbe2279b9c
|
add new translations for registration
|
2017-03-14 11:02:14 +01:00 |
|
ansuz
|
a16e6850d4
|
add translation keys for the feedback page
|
2017-03-13 12:54:59 +01:00 |
|
yflory
|
c00010177d
|
Add tips in the loading screen
|
2017-03-13 12:41:15 +01:00 |
|
ansuz
|
95a51e8fe4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 12:16:06 +01:00 |
|
ansuz
|
ff3641134f
|
update pad initialState
|
2017-03-13 12:16:01 +01:00 |
|
yflory
|
4a762fec99
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 11:53:24 +01:00 |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
2017-03-13 11:52:48 +01:00 |
|
ansuz
|
1178660815
|
update code initialState string
|
2017-03-13 11:52:33 +01:00 |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
2017-03-10 16:46:36 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
2017-03-02 17:01:27 +01:00 |
|
ansuz
|
c9040997d5
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 11:07:17 +01:00 |
|
ansuz
|
9800f036c5
|
fix a typo
|
2017-03-01 17:06:18 +01:00 |
|
ansuz
|
84a4a15c46
|
fix inverted checkbox description
|
2017-02-28 18:58:20 +01:00 |
|
ansuz
|
8c87255267
|
remove any mention of piwik
|
2017-02-28 12:25:31 +01:00 |
|
ansuz
|
569d25f25f
|
update some translation keys in English
|
2017-02-28 11:50:07 +01:00 |
|
ansuz
|
b87c9d4ba6
|
fix merge conflicts with usability branch
|
2017-02-28 11:35:29 +01:00 |
|
ansuz
|
5a49e276b5
|
add settings_anonymous key
|
2017-02-28 11:32:14 +01:00 |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
2017-02-28 10:39:48 +01:00 |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 20:11:26 +01:00 |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
2017-02-27 20:11:18 +01:00 |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 17:23:40 +01:00 |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
2017-02-27 17:23:28 +01:00 |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:32:04 +01:00 |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
2017-02-27 14:31:56 +01:00 |
|
yflory
|
95853debf9
|
Update the default pad #1
|
2017-02-27 14:29:48 +01:00 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
ansuz
|
9ccb473b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
|
2017-02-24 12:06:17 +01:00 |
|
ansuz
|
252fc7a640
|
uppercase messages
|
2017-02-24 11:52:21 +01:00 |
|
ansuz
|
20689b1dec
|
update english translation for usability feedback
|
2017-02-23 16:11:39 +01:00 |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
2017-02-23 11:45:00 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
2017-02-22 11:15:29 +01:00 |
|
yflory
|
2e378564d0
|
Make the 'pad' initial state translatable
|
2017-02-21 18:43:26 +01:00 |
|
yflory
|
81fbe0fdd1
|
Add back some translation keys that shouldn't have been removed
|
2017-02-21 18:21:11 +01:00 |
|
ansuz
|
ed19c6885d
|
join array in messages.js
|
2017-02-21 17:16:56 +01:00 |
|
yflory
|
454d1c2052
|
Do not load all the translations anymore, only the needed one
|
2017-02-20 18:29:06 +01:00 |
|
yflory
|
434c3a220c
|
Remove old translation keys #2
|
2017-02-20 16:15:13 +01:00 |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
2017-02-17 17:39:27 +01:00 |
|
yflory
|
a6497f7a52
|
Add a way to show the drive tips again
|
2017-02-17 16:56:59 +01:00 |
|
yflory
|
550c65aae0
|
Add a default pad in CryptDrive after signing up
|
2017-02-16 18:10:12 +01:00 |
|
yflory
|
7497e0d1c5
|
Add a dropdown user menu to the top bar in static pages
|
2017-02-15 17:57:42 +01:00 |
|
ansuz
|
5ae65c8bc1
|
make the user confirm
|
2017-02-13 13:04:55 +01:00 |
|
ansuz
|
7d0c29513c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-13 12:42:17 +01:00 |
|
ansuz
|
7d21206cae
|
add registration introductory text
|
2017-02-13 12:42:07 +01:00 |
|
yflory
|
2807ad9dc3
|
Add spinner and translate the register page
|
2017-02-13 11:41:48 +01:00 |
|
yflory
|
3aa03225c9
|
Add a spinner when hashing the password and translate homepage
|
2017-02-13 11:09:30 +01:00 |
|
ansuz
|
3b1bd2f720
|
use additional translation keys for registration
|
2017-02-13 10:15:25 +01:00 |
|
yflory
|
6026351091
|
Improve the homepage (style and translations)
|
2017-02-09 18:53:04 +01:00 |
|
yflory
|
d54262c8df
|
Use the same disconnecter error translation key for all the apps
|
2017-02-09 15:34:14 +01:00 |
|
Caleb James DeLisle
|
2eccc6a69f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-09 12:48:14 +01:00 |
|
Caleb James DeLisle
|
9dfe3ccaac
|
Change 'jot it down' to 'write it down' in the front page
|
2017-02-09 12:48:06 +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
|
7e7d1f7a16
|
Display the error when opening a document with the wrong app
|
2017-02-06 12:43:56 +01:00 |
|
yflory
|
ad82a275bc
|
Replace the Apps button by a New button again
|
2017-02-06 11:39:04 +01:00 |
|
yflory
|
fbbf8a2829
|
Replace initialState by a placeholder in slide and code
|
2017-02-03 18:45:30 +01:00 |
|
yflory
|
9c4c378d6a
|
Add a footer to the html pages
|
2017-02-03 16:52:55 +01:00 |