ansuz
|
f43132a63b
|
bump version in footer and package.json
|
2017-06-06 10:01:07 +02:00 |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
2017-06-05 11:43:26 +02:00 |
|
ansuz
|
8d4017b79e
|
fix parse error
|
2017-06-05 11:35:05 +02:00 |
|
jxtsai
|
b9b8352633
|
Traditional Chinese
|
2017-06-05 15:10:13 +08:00 |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
2017-06-02 12:13:11 +02:00 |
|
ansuz
|
d774f8771b
|
remove more unused files
|
2017-05-31 12:23:31 +02:00 |
|
ansuz
|
540304807c
|
remove unused files
|
2017-05-31 12:11:33 +02:00 |
|
ansuz
|
daf112a5b5
|
take api settings into account for upgrade button
|
2017-05-30 20:11:15 +02:00 |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
2017-05-30 18:39:41 +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 |
|
Pierre Bondoerffer
|
0a92719763
|
spanish! new keys ahoy
|
2017-05-29 18:25:18 +02:00 |
|
Pierre Bondoerffer
|
6518b56945
|
poll: french messages
|
2017-05-29 16:50:25 +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 |
|
ansuz
|
b910915d47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-29 11:33:03 +02:00 |
|
ansuz
|
6573813523
|
Merge branch 'soon' into staging
|
2017-05-29 11:32:54 +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 |
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
2017-05-26 15:48:44 +02:00 |
|
superniko
|
0559b8cb77
|
Update messages.ro.js
|
2017-05-26 16:47:45 +03:00 |
|
superniko
|
70fbbe0078
|
Update messages.ro.js
|
2017-05-25 10:23:27 +03:00 |
|
ansuz
|
bc26f7fc4e
|
Merge branch 'soon' into staging
|
2017-05-24 15:04:40 +02:00 |
|
Caleb James DeLisle
|
70c1061f47
|
Fix romanian translation
|
2017-05-24 14:49:00 +02:00 |
|
Caleb James DeLisle
|
83c0a6d37d
|
Romanian translation
|
2017-05-24 14:37:13 +02:00 |
|
yflory
|
b281d51d90
|
Fix typos in the french translation
|
2017-05-23 15:04:18 +02:00 |
|
yflory
|
38bd6b3808
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-23 14:50:42 +02:00 |
|
yflory
|
964d046154
|
Update a french translation key
|
2017-05-23 14:50:28 +02:00 |
|
ansuz
|
cf83cab596
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-23 12:35:54 +02:00 |
|
ansuz
|
0a646a9534
|
remove unnecessary space
|
2017-05-23 12:35:49 +02:00 |
|
yflory
|
6ddfe0e901
|
Fix new lines in /pad userlist
|
2017-05-23 12:14:31 +02:00 |
|
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-22 18:43:14 +02:00 |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
2017-05-22 17:56:27 +02:00 |
|
ansuz
|
2ca6277660
|
enable pin limits by default
|
2017-05-22 16:50:32 +02:00 |
|
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
2017-05-22 11:43:45 +02:00 |
|
yflory
|
0c2f84058b
|
Improve css for the file app
|
2017-05-22 11:16:01 +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 |
|
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
2017-05-18 14:54:02 +02:00 |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:27:10 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
2017-05-18 12:58:49 +02:00 |
|
ansuz
|
517438d7c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:33:34 +02:00 |
|
ansuz
|
81af9225fc
|
template a Romanian translation
|
2017-05-16 14:32:54 +02:00 |
|
ansuz
|
e8275c02c6
|
Merge pull request #115 from pbondoer/spanish
Spanish update
|
2017-05-16 14:23:06 +02:00 |
|
Pierre Bondoerffer
|
ad6217f064
|
file upload spanish keys
|
2017-05-16 14:05:36 +02:00 |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
2017-05-16 14:01:06 +02:00 |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
2017-05-15 18:16:22 +02:00 |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
2017-05-15 16:16:50 +02:00 |
|
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
2017-05-15 14:53:51 +02:00 |
|
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
2017-05-15 14:46:17 +02:00 |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
2017-05-15 13:54:03 +02:00 |
|
Pierre Bondoerffer
|
ad5e18f558
|
Spanish update
|
2017-05-15 12:05:50 +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 |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
2017-05-10 15:54:09 +02:00 |
|
yflory
|
ca6f910f0b
|
Add french translations for 'log out everywhere'
|
2017-05-09 10:32:41 +02:00 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +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 |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
2017-05-05 11:51:41 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +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
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
2017-04-28 12:40:39 +02:00 |
|
yflory
|
ab1dc48b6d
|
Fix the 'limit reached' icon in the pad app
|
2017-04-28 12:32:49 +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
|
e40203480f
|
Merge pull request #113 from pbondoer/staging
Update spanish
|
2017-04-24 16:09:53 +02:00 |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
2017-04-24 15:41:29 +02:00 |
|
Pierre Bondoerffer
|
ba407322e8
|
Update spanish
|
2017-04-24 15:16:30 +02:00 |
|
yflory
|
3e28d1b966
|
Add a missing key in the french translation
|
2017-04-24 14:41:55 +02:00 |
|
yflory
|
9abfadb32f
|
Update french translation
|
2017-04-24 14:39:30 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +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 |
|
ansuz
|
8f352c8433
|
add justify plugin to default ckeditor config
|
2017-04-18 15:49:31 +02:00 |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
2017-04-14 19:34:58 +02:00 |
|
ansuz
|
50793f506d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-14 18:44:20 +02:00 |