c448c9035e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-19 11:03:43 +01:00
127f30df72
bump CryptPad version
2017-12-19 10:56:22 +01:00
e48f143842
Allow numbers in _getKey parameters
2017-12-19 10:51:30 +01:00
d666e9e7ee
Remove tag and filepicker buttons for anon users
2017-12-15 18:16:01 +01:00
b06b2dbafc
less lint compliance
2017-12-12 10:47:45 +01:00
b1f1aa2340
Disable pad creation screen
2017-12-11 17:54:34 +01:00
34315b4500
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-11 17:17:24 +01:00
c269929319
Fix creation page not displayed in pad and slide
2017-12-11 17:17:06 +01:00
16388a839c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-11 15:46:38 +01:00
230f9524be
new less linter rules and compliance
2017-12-11 15:05:58 +01:00
4e46d0daa5
Fix the 'New' button icon in the toolbar
2017-12-11 14:51:36 +01:00
dcfccf88cd
Merge branch 'creationpage' into staging
2017-12-11 12:21:21 +01:00
1922dbfd75
Creation page with mobile support
2017-12-11 12:19:44 +01:00
024aa741a7
Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
2017-12-08 19:12:34 +01:00
1d2119b292
Removed LESS duplicate attributes
2017-12-08 18:13:35 +01:00
bfba239770
Fixed missing semicolons in less
2017-12-08 17:35:28 +01:00
9af941741d
Fix trailing whitespace and empty selectors in less
2017-12-08 17:30:45 +01:00
dd44b4da99
Removed old /less/ directory which is nolonger used :)
2017-12-08 14:56:13 +01:00
12b0f3e201
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
2017-12-08 14:00:53 +01:00
617c4b6044
CSS refactorings and pad-is-not-pinned work
2017-12-07 19:00:13 +01:00
e96d54e655
Add a pad creation page
2017-12-07 18:51:50 +01:00
67f8031beb
Wrong usage of colortheme.less, fixed
2017-12-07 14:57:24 +01:00
64303b4090
Merge branch 'refactor' into staging
2017-12-07 10:34:15 +01:00
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-05 18:32:29 +01:00
1dabea84d9
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
2017-12-05 18:32:23 +01:00
c702a23c77
Initial work on the 'pad will expire' logic
2017-12-05 17:48:30 +01:00
087eee55f6
update 404 page
2017-12-04 18:31:07 +01:00
f95669a27a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 17:33:13 +01:00
fc4fea9c54
update 404 messages and show actual text faster
2017-12-04 17:33:06 +01:00
f52d987515
Ability to resize avatars before uploading them
2017-12-04 15:03:43 +01:00
e164edec03
Fix the webworker app
2017-12-01 18:29:59 +01:00
04e02871bc
Merge branch 'refactor2' into staging
2017-12-01 14:50:19 +01:00
4903bd0757
Enable messenger in async store
2017-12-01 14:49:21 +01:00
5acbaef28f
tweak animation parameters for faster 'decryption'
2017-12-01 14:03:13 +01:00
c80c97d7db
lint compliance
2017-12-01 13:23:23 +01:00
bcdc0d810a
make 404 page translateable, point to home page or drive
2017-12-01 11:51:04 +01:00
443eeaa407
fancy 404 page
2017-11-30 19:17:59 +01:00
acd8ab7446
Add the markdown toolbar in profile
2017-11-27 18:10:37 +01:00
74e59a513a
Add the markdown toolbar to the slide and poll apps
2017-11-27 17:55:20 +01:00
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
9795ac32cb
Ability to burn an anonymous drive from the browser
2017-11-23 14:36:42 +01:00
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
cdd8c6e110
Fix history mode not centered
2017-11-21 17:48:43 +01:00
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-21 17:37:53 +01:00
06011065d2
Add a debug app
2017-11-21 17:37:38 +01:00
60c4973d62
resolve merge conflicts
2017-11-21 17:22:06 +01:00
477f14bb8b
Put constants in a separate file
2017-11-21 16:46:19 +01:00
8150abddbe
remove dead code from pages.js
2017-11-21 15:52:37 +01:00
4ffb59dce9
bump to version 1.21.0
2017-11-21 15:47:06 +01:00
e8e90905e4
Fix assert translations
2017-11-20 14:23:56 +01:00
78e972201a
bump CryptPad version
2017-11-20 14:16:55 +01:00
ce3600b026
Update translation keys
2017-11-20 10:41:27 +01:00
cf26c4c286
Improve the toolbar UI for smaller screens
2017-11-17 18:21:45 +01:00
af8aa25228
Add an option to never rename a file during the session
2017-11-17 10:57:54 +01:00
25d3d321da
Ability to rename a file before uploading it to the server
2017-11-16 18:11:13 +01:00
1f53304ad3
Display a dropdown menu inside another one
2017-11-15 15:35:28 +01:00
014e12b5b5
Ability to update the username from the userlist
2017-11-15 11:32:54 +01:00
9184dd0ce6
Merge branch 'refactor2' into staging
2017-11-14 11:53:13 +01:00
5a2afb5c95
Remove Realtime and Messaging from common
2017-11-13 17:01:09 +01:00
af1ea4fd96
Fix typo in the French translation
2017-11-13 16:34:37 +01:00
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
2ff66e1a7c
Update french translation
2017-11-06 17:39:41 +01:00
2c9df23849
update english text for removing from trash in the drive
2017-11-06 17:37:29 +01:00
d10f752457
s/delete/move to trash
2017-11-06 17:07:37 +01:00
402fae442d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-06 15:14:21 +01:00
c5f6491c37
bump footer and package.json to latest version
2017-11-06 15:14:02 +01:00
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
2017-10-31 11:11:29 +01:00
7f9b21405b
Add missing files for profile
2017-10-31 10:27:41 +01:00
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 15:12:29 +01:00
68accaf653
Todo in sframe with less2
2017-10-30 15:12:15 +01:00
735f0a7e30
Merge branch 'theming-improvement' into staging
2017-10-26 20:44:56 +02:00
83da9cf752
Moved colours to colortheme.less to enable theming
2017-10-26 20:29:14 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
204f3e1441
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 15:17:09 +02:00
74985fd0f2
Use text for the addUser button in polls
2017-10-23 15:12:27 +02:00
7d1892546b
add missing french translation
2017-10-23 14:59:14 +02:00
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
aaef30f489
bump cryptpad version
2017-10-23 14:05:49 +02:00
ce5d24a1d3
Remove error message about Tether
2017-10-23 11:57:10 +02:00
d571f408d8
Merge pull request #185 from MacLemon/reduce-image-asset-size
...
Compressed images for faster connections
2017-10-23 11:46:56 +02:00
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
63dcfd6d18
Update French translation
2017-10-19 21:02:03 +02:00
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
e553351b79
Put the add friend button in the userlist below the name
2017-10-17 12:39:25 +02:00
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
2017-10-14 00:31:31 +02:00
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
50090a3af6
Add placeholders for the comment form in poll
2017-10-12 12:18:32 +02:00
ecb537ac7f
Move code to render.js in poll
2017-10-10 18:19:49 +02:00
c985aa60aa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 17:30:14 +02:00
f4189f883e
Add missing french translation keys
2017-10-09 17:28:56 +02:00
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
2017-10-09 17:20:23 +02:00
d046b9ce33
add missing French key
2017-10-09 17:16:48 +02:00
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
21f1a48380
changed the login in button
2017-10-09 17:17:33 +03:00
d3d6940b69
Update french translation for tags
2017-10-09 15:47:28 +02:00
3f181fa370
update loading screen tip for tags
2017-10-09 15:38:33 +02:00
f751554f82
update footer and package.json for upcoming version
2017-10-09 15:15:04 +02:00
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
080511efcd
add missing translation for hashtags
2017-10-05 17:01:39 +02:00
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
2017-10-05 12:14:03 +03:00
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +02:00
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
e2f53eaddb
add loading screen tip about hashtags
2017-10-03 18:39:03 +02:00
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03:00
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
fa6938baa8
1. Migrated /slide/ to use framework
...
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +02:00
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
767027b237
Lint
2017-09-27 10:16:24 +02:00
0df9e5ace0
Fix toolbar in polls
2017-09-27 10:09:47 +02:00
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
53b98c12c9
ignore broken stylesheet
2017-09-20 11:33:30 +02:00
95542bcdaf
Lint
2017-09-19 15:38:19 +02:00
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
f127240a2f
add poll to main.less
2017-09-19 14:23:54 +02:00
6683434c62
Fix wrong relative url
2017-09-19 12:03:45 +02:00
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
e0ae0fcd91
thanks Dima!
2017-09-13 17:47:49 +02:00
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
2017-09-13 14:47:50 +02:00
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
ad591fba50
bump version
2017-09-12 14:04:30 +02:00
8c3e2dbe61
Missing french translation keys
2017-09-12 11:45:47 +02:00
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
37dca9c155
Add missing translation keys in french
2017-09-11 14:12:06 +02:00
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
2017-09-11 14:01:05 +02:00
59d25b4c1a
use camel case, not snek case
2017-09-11 14:00:27 +02:00
5cde3fffb8
Align title for normal, readonly and page mode in the toolbar
2017-09-11 12:04:22 +02:00
7582c9cffd
Fix register button in the index dropdown menu for mobiles
2017-09-11 11:22:41 +02:00
c3a07e879c
Merge branch 'staging' into slide2
2017-09-08 16:23:07 +02:00
fc069dac48
Ask the user before loading the template picker
2017-09-08 16:21:12 +02:00
f2aaaa9751
Move slide to secure iframe
2017-09-07 18:56:58 +02:00
809b56625d
refactor ui elements
2017-09-07 18:54:58 +02:00
bca9ba66cb
enforce a configurable minimum password length when registering
2017-09-07 17:44:04 +02:00
ef30b0bc42
contribute to z-index arms race
2017-09-07 16:50:06 +02:00
a6eb1444df
add loading screen markup to register and login
2017-09-07 16:39:42 +02:00
352d504944
avoid loading unnecessary files
2017-09-07 16:39:20 +02:00
263c2eb2c2
fix overflowing title text
2017-09-07 14:17:43 +02:00
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-07 12:45:18 +02:00
15e24ebe4f
ui for hashtag picker
2017-09-07 12:45:07 +02:00
fe8b2c2556
Fix french translation
2017-09-06 15:43:30 +02:00
8f2776657b
Add translations for pad embed
2017-09-06 11:21:53 +02:00
3ca9f41290
Get embed code for pad and code
2017-09-06 10:56:27 +02:00
d22edc03b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:34:49 +02:00
53eb9bb541
Remove the logo from the filepicker loading screen
2017-09-05 15:34:38 +02:00
5c9ce0caa5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:32:31 +02:00
77bbb3add4
bump footer and package.json version string
2017-09-05 15:29:28 +02:00
01881ac469
Update loading tips in the french translation
2017-09-05 15:15:57 +02:00
729c013af7
Get mediatag embed code from the file app
2017-09-05 15:08:05 +02:00
5eb13461c0
remove anchor button
2017-09-05 12:16:49 +02:00
204e45dfae
Enable templates in pad
2017-09-05 11:57:44 +02:00
78b338c379
Merge branch 'code2' into staging
2017-09-05 11:38:17 +02:00
d2787e3eff
Make code2 the default code app
2017-09-05 11:36:02 +02:00
86e23ac19f
Use less2 in secure iframes
2017-09-04 15:09:54 +02:00
7b27b8635d
fix padding on registration button
2017-08-31 18:58:08 +02:00
6bb29e52e2
lint compliance
2017-08-31 18:45:18 +02:00
0ceb4cbbcb
Updated the contact page with the new design
2017-08-31 16:26:20 +03:00
83be769bb3
Merge branch 'master' into staging
...
updated with new version
2017-08-31 11:36:39 +03:00
1bf77cb77e
changed the icons
2017-08-31 11:27:02 +03:00
ee325c1813
Repaired the errors from lint
2017-08-31 10:20:10 +03:00
f95f3f4f24
Updated the contact page
2017-08-31 10:04:40 +03:00
0893bcc0e5
Merge branch 'staging' into code2
2017-08-30 14:57:19 +02:00
d3e947f17e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 11:11:48 +02:00
7498057c89
Fix Safari iframe size
2017-08-30 11:11:43 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
2ef4ebc6ef
two new tips for the loading screen
2017-08-29 17:56:34 +02:00
570ff75a6c
update footer for latest version
2017-08-29 11:12:08 +02:00
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:22:38 +02:00
6c65e5ff72
Fix the ghost icon in the drive and add missing text
2017-08-28 12:22:31 +02:00
54eefd3d94
replace contacts with contacts2
2017-08-25 16:07:53 +02:00
57d0c6c973
Merge branch 'new-messaging' into staging
2017-08-25 14:42:34 +02:00
f9cdbe66a0
add forgotten translation string
2017-08-24 17:20:59 +02:00
35e7341f4d
Merge branch 'ui-integration' into staging2
2017-08-24 13:54:55 +02:00
7bbea28831
minor anti-xss changes...
2017-08-24 13:53:42 +02:00
2ad9fcee17
Manual merge of notify.js
2017-08-23 10:45:55 +02:00
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-22 18:19:06 +02:00
89a13d4b21
work on contacts2 until feature parity is reached
2017-08-22 15:55:49 +02:00
d9f5e3638e
Big caching improvements :D
2017-08-22 15:50:10 +02:00
1752124071
Fix Iframe height in Edge
2017-08-22 11:50:52 +02:00
b081603455
Update requirejs
2017-08-21 18:08:37 +02:00
49f7e0d63b
Changed the Social Media links to Pierre
2017-08-18 16:01:50 +03:00
48fe3ef841
add a tip about cryptdrive
2017-08-17 14:25:24 +02:00
839c6df3bb
remove invalid loading screen tips. create a new one
2017-08-17 14:16:37 +02:00
0a813b4fab
Fix limit bar overflowing when over the limit
2017-08-17 10:24:10 +02:00
744fb407ae
Updated the what is page
2017-08-16 15:53:10 +03:00
46e47b454d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:34:54 +02:00
f7b2aa85b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:36:25 +02:00
3df20760c4
Yann does not have a twitter account.
2017-08-16 11:36:14 +02:00
df8851a53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:35:56 +02:00
df0b7155f6
Add missing french translation
2017-08-16 11:35:40 +02:00
127b6dbc6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:34:35 +02:00
8b5519ad29
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:31:09 +02:00
2b7dcbe77c
remove bs class that caused poor alignment sometimes
2017-08-16 11:30:56 +02:00
4213d6de70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:29:59 +02:00
d6125d864c
Added Yann's bio
2017-08-16 11:29:50 +02:00
a39f802b4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 11:17:37 +02:00
e4d842ed08
Fix typos in the french translation
2017-08-16 10:55:15 +02:00
7537caf8fe
make footer translateable
2017-08-16 10:51:08 +02:00
8ee5e14a60
merge ui-integration
2017-08-16 10:20:05 +02:00
fd3fd945c8
Updated the Log in Page
2017-08-16 07:56:18 +03:00
1f4d0a0a56
Repaired a bug
2017-08-16 06:56:08 +03:00
dd48cf7c90
updated the register page
2017-08-15 23:47:36 +03:00
3196d4558f
repaired the responsive error at about page
2017-08-15 06:50:13 +03:00
3960cd25f8
Updated the about page with the new design
2017-08-14 16:40:09 +03:00
7c8df61f91
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
2017-08-11 17:54:15 +02:00
196ce3b3f7
Fix alertify style which made the registration popup look bad
2017-08-11 17:49:19 +02:00
f580d9a30a
*actually* fix alertify on mobile
2017-08-11 15:16:51 +02:00
8c0fe7d277
Add missing UI element translations
2017-08-11 15:10:45 +02:00
144f9f4c83
alertify fix on mobile
2017-08-11 14:46:08 +02:00
9833bd7e59
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 14:31:40 +02:00
89a8e8050c
Fix typo and also change message to explain itself better
2017-08-11 14:31:31 +02:00
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 14:26:34 +02:00
328107be4d
translation key for using tabs
2017-08-11 14:26:08 +02:00
b00d37d9e7
proper namespace for font
2017-08-11 14:14:58 +02:00
0f74dffc48
fix register button being cut off
2017-08-11 14:11:50 +02:00
92d3b1a9fc
actually pull in open-sans, move fonts to own include
2017-08-11 14:10:54 +02:00
958294f109
put code settings in their own tab
2017-08-11 13:00:50 +02:00
ae0b2ca1a8
add label for code indentation
2017-08-11 12:55:10 +02:00
7f2b7fc287
show Your CryptDrive, if logged in. fix typos
2017-08-11 11:32:21 +02:00
ef256e3849
go to homepage when on infopages
2017-08-10 15:17:34 +02:00
04b84538e1
add Open Sans font (with bower)
2017-08-10 15:05:57 +02:00
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-10 14:49:41 +02:00
baf64114a6
point to homepage in drive
2017-08-10 14:45:56 +02:00
1043e076a4
Merge branch 'ui-integration' into staging
2017-08-09 17:47:02 +02:00
41c2f9bd83
Changed the footer, a modified the about page
2017-08-09 18:35:36 +03:00
edad5deeac
fix logo not showing sometimes in chrome
2017-08-09 16:06:29 +02:00
c036bb26be
use proper bootstrap class
2017-08-09 15:46:17 +02:00
b34e252eda
improve whiteboard styles
2017-08-09 14:43:32 +02:00
8b2cb37c2f
improve poll looks
2017-08-09 12:33:40 +02:00
280c10c57d
alertify: use the right box-shadow
2017-08-09 11:48:04 +02:00
82352b422f
unhide show help button
2017-08-09 11:24:28 +02:00
ec011b15d5
remove duplicate css property
2017-08-09 10:55:36 +02:00
34ba673cd3
improve file upload UI
2017-08-09 10:54:20 +02:00
ca686f9c92
(hopefully) fix newline in lists when pasting links
2017-08-08 17:47:10 +02:00
6ca6755d02
more missing titles in toolbar
2017-08-08 16:51:23 +02:00
2cc6c636db
Add some missing titles
2017-08-08 16:20:31 +02:00
355b7f1839
change recent to local pads
2017-08-08 12:05:22 +02:00
90075cd48e
media-tag to less file
2017-08-08 12:01:39 +02:00
88be5444f0
change alertify warn color
2017-08-08 10:37:37 +02:00
c53e738054
improve file picker ui
2017-08-07 16:27:29 +02:00
996c56c242
fix label in register
2017-08-07 11:41:04 +02:00
008fa12755
alertify: add textarea + checkbox
2017-08-07 11:26:40 +02:00
e486e47aa1
alertify: fix input color + better log styles
2017-08-07 11:19:20 +02:00
e333e7903d
fix styles overlapping
2017-08-04 17:44:02 +02:00
1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 17:15:55 +02:00
dac14de18c
unify fonts
2017-08-04 17:15:45 +02:00
5afadf10aa
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 17:58:48 +03:00
3f6b234e97
Styled the general menu, footer, updated about
2017-08-04 17:58:29 +03:00
a16d4be3c4
show logged in user
2017-08-04 16:48:01 +02:00
8a56adfe53
make logos same size, compress
2017-08-04 16:25:39 +02:00
d3fb6313b6
color logo on topbar
2017-08-04 16:22:43 +02:00
865ba0731c
better colors? not sure yet...
2017-08-04 16:13:27 +02:00
1bd42f0b3e
make alertify darker
2017-08-04 16:02:35 +02:00
0f7124d673
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 15:26:59 +02:00
ecc766eb7b
remove useless margin
2017-08-04 15:24:58 +02:00
a6547d1ed0
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 15:20:14 +02:00
7310960f46
remove the hack around the hack to fix the hack
2017-08-04 15:19:59 +02:00
95c7cd3fcc
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 15:17:22 +02:00
addd91cc72
fix styles (again) copyright cjd 2017
2017-08-04 15:16:48 +02:00
930ba8aec6
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 15:13:09 +02:00
5c21a9048e
fix styles
2017-08-04 15:13:03 +02:00
b26c62714f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 15:08:21 +02:00
c953e71a18
better class generation and remove duplicate class
2017-08-04 15:06:58 +02:00
4d563af045
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 14:51:14 +02:00
10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 14:50:44 +02:00
6614f3f0e6
put the page class on html element
2017-08-04 14:50:35 +02:00
96b12d55fb
add a return
2017-08-04 14:37:21 +02:00
b79adf4177
redirect to drive if logged in
2017-08-04 14:35:47 +02:00
a10214ed2a
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-04 14:19:54 +02:00
75c0876500
Added ludovic's bio
2017-08-04 14:19:44 +02:00
043ae4280b
repaired the menu
2017-08-04 15:15:47 +03:00
250d85bb8a
Repaired the menu, clead the code
2017-08-04 15:15:35 +03:00
e2ad99ab3c
change favicon (again)
2017-08-04 14:06:10 +02:00
8831f4f91b
new favicons
2017-08-04 14:02:53 +02:00
a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
2017-08-04 12:32:26 +02:00
4018c7e0a6
move alertify stuff
2017-08-04 12:31:47 +02:00
c274a27dfb
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
2017-08-04 11:33:28 +02:00
0d1f19f5d4
Big manual merge
2017-08-04 11:20:17 +02:00
e7d09c1ddb
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
...
changed the menu
2017-08-04 12:16:33 +03:00
d4ce7d626c
Modified the menu
2017-08-04 12:16:13 +03:00
f8c7140eec
make fonts big
2017-08-04 11:10:30 +02:00
f6d45d05f6
use logo in toolbar
2017-08-04 11:01:26 +02:00
1b83e15796
sorry jpg, i forgot you existed
2017-08-04 10:49:18 +02:00
5ce7d64b2c
add pierre photo
2017-08-04 10:30:19 +02:00
1b466d250f
Add some photos
2017-08-03 18:01:48 +02:00
5d70dd93b3
Manual merge
2017-08-03 17:18:03 +02:00
15fa801bc8
work in progress
2017-08-03 18:09:25 +03:00
bc15ce7de5
Manual merge
2017-08-03 17:00:46 +02:00
52e9ba92fa
Update whitepaper link and also change whatis_zeroknowledge
2017-08-03 16:23:29 +02:00
89ab82c0e2
Changed the menu, added the logo on top bar
2017-08-03 17:19:55 +03:00
ae176b0465
about page mockup
2017-08-03 15:58:51 +02:00
cdf6345fc1
use sign up
2017-08-02 17:55:05 +02:00
ddc9c4d070
alt favicon pink
2017-08-02 17:52:48 +02:00
35867001cb
add missing messages
2017-08-02 17:38:34 +02:00
86bc14e6bb
new loading screen
2017-08-02 17:19:16 +02:00
304a29e210
Improve contact page
2017-08-02 16:34:35 +02:00
d6679e8ef3
Add screenshots to What is CryptPad
2017-08-02 15:53:04 +02:00
b3f3f1dabb
Add What is CryptPad keys
2017-08-02 14:57:27 +02:00
e2f8c9c5da
add logo to topbar
2017-08-02 12:37:56 +02:00
8a56029bfe
remove useless images
2017-08-02 11:56:00 +02:00
ea3a8932be
put the content in the right place
2017-08-02 11:50:35 +02:00
262a729ef7
use proper key name
2017-08-02 11:48:30 +02:00
db111257f0
Add translations, remove useless functions
2017-08-02 11:46:55 +02:00
de23195bd8
fix wrong css class
2017-08-02 11:26:02 +02:00
ad4aca4e5f
actually do the changes intended in previous commit
2017-08-02 11:22:52 +02:00
01b2883771
Add headers and footers, generate what-is-cryptpad
2017-08-02 11:20:07 +02:00
cd0c9cc95a
create less templates for info pages
2017-08-02 11:08:36 +02:00
f71b082aac
remove min-height globally, style footer
2017-08-02 11:00:42 +02:00
0fe49d6641
oops, sorry, back to 100% height
2017-08-01 17:26:47 +02:00
dc0a037894
turn login and register into infopages
2017-08-01 17:11:03 +02:00
549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-01 14:35:50 +02:00
775ea81504
start register page
2017-08-01 14:35:45 +02:00
69c470330f
updated the favicons, changed the menu
...
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
2017-08-01 15:21:07 +03:00
e609950977
Changed the favicon, added the boostrap js file, reconfigure the top menu
2017-08-01 15:20:29 +03:00
27aa1886b1
Move footer to pages.js and add it to the contact page
2017-08-01 14:17:02 +02:00
490e2b4d0a
work in progress on migrating styles back into the infopages.less
2017-08-01 13:49:42 +02:00
cd2b41f51e
Fix up some less for supporting the info-pages
2017-08-01 11:53:06 +02:00
896186d059
Fix some wrong less files which were breaking the UI of the apps
2017-08-01 11:19:32 +02:00
4614d6ae81
remove legacy max-width from usage bar
2017-08-01 10:05:54 +02:00
87dec4a091
Changed the font size
2017-07-31 19:24:07 +03:00
5ef0325d90
this are css rules modified -- INSERT --
2017-07-31 19:14:15 +03:00
5921073524
Updated the new font, changed the logo, changed see more
2017-07-31 19:13:45 +03:00
ba95931802
Use translation keys
2017-07-31 17:53:31 +02:00
9a733cca0e
drop support for legacy iframe
2017-07-31 17:30:19 +02:00
f2a78ddfd9
New FR/ES keys
2017-07-31 16:55:09 +02:00
6862bda454
Changed the logo, uploaded the new font, repaired responsive
2017-07-31 17:04:37 +03:00
1ca00e7e01
resolve merge conflicts
2017-07-31 16:00:45 +02:00
411c64df85
Merge branch 'master' into master
2017-07-31 15:49:54 +02:00
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
777dea2014
Merge branch 'staging' into todo
2017-07-31 11:43:56 +02:00
a458d7fa46
bump to latest version
2017-07-31 10:24:35 +02:00
428bee6306
make links clickable and make more link work
2017-07-26 15:53:10 +02:00
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:29:33 +02:00
459e0b3b16
CSS and bug fixes for todo
2017-07-26 13:30:39 +02:00
a5b19b1cdd
add missing translations
2017-07-26 13:27:34 +02:00
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:07:41 +02:00
3da76e3ae8
Update style for the todo app
2017-07-26 13:07:35 +02:00
8cfd8d3270
add translations for todo
2017-07-26 13:02:14 +02:00
5fa20836cf
Modified Register and login button
2017-07-26 10:38:01 +03:00
cab8716519
Changed the login button, repaired the hover menu and see more. Updated the logo
2017-07-25 01:08:53 +03:00
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
49c760131e
wip
2017-07-24 14:10:40 +02:00
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
2e8e44933a
Fixed spelling error in Spanish translation
2017-07-23 14:31:12 +02:00
dcf5719eaf
handle most of the boilerplate stuff
2017-07-23 14:27:47 +02:00
064e189495
Fixed spelling issues and improved translation quality.
2017-07-23 14:16:34 +02:00
6a1ec54e2a
wip
2017-07-22 17:31:40 +02:00
dc9565f22f
make buttons colorful
2017-07-22 17:30:13 +02:00
8404017af1
wip
2017-07-22 16:43:53 +02:00
76e69f0ba8
Merge pull request #127 from gustavohmsilva/master
...
Merged translated and non-translated in pt-BR
2017-07-22 16:07:44 +02:00
52fa77e961
Merge pull request #157 from MacLemon/reduce-image-asset-size
...
File size reduction and optimization of new image assets
2017-07-22 16:00:12 +02:00
6785f166fd
Merge branch 'master' into master
2017-07-22 09:18:12 -03:00
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-22 14:15:15 +02:00
55cb0734e2
make bad state timeout configurable
2017-07-22 10:56:39 +02:00
25cba8bba3
Translated missing out.presentSuccess to german
2017-07-20 20:08:30 +02:00
29bfcfa719
File size reduction and optimization of new image assets
2017-07-20 20:03:26 +02:00
a80b00a765
Move the file picker in common
2017-07-20 18:32:03 +02:00
9633025afe
CSS for the removeHistory button in contacts
2017-07-20 17:26:33 +02:00
b22127f10c
add history removal
2017-07-20 15:55:04 +02:00
ffb5e555a0
Merge branch 'staging' into front-page
2017-07-20 10:09:32 +02:00
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
82c87144cb
Remove the friend request button when the request is sent
2017-07-19 14:14:34 +02:00
1dc98dcff1
CSS for the contacts input field
2017-07-19 10:30:38 +02:00
26fa914982
Missing translation keys
2017-07-18 11:07:34 +02:00
a2c2e98060
Spanish update
2017-07-18 10:30:28 +02:00
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-18 10:24:00 +02:00
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
5716f76c91
fix typo in translations
2017-07-18 10:04:02 +02:00
743b87b70f
Add initial text in /contacts
2017-07-17 18:51:23 +02:00
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
0cd94e2ba8
add title to contacts app
2017-07-17 17:38:41 +02:00
f2320190b8
change friends url to /contacts/
2017-07-17 17:18:28 +02:00
06c971ec47
s/friend/contact/g
2017-07-17 15:52:13 +02:00
2e0aa185cd
uppercase first letter of new translation keys
2017-07-17 14:12:05 +02:00
6306de5265
set avatar border-radius to 4px
2017-07-17 13:43:51 +02:00
33dcd2ae28
drop black border from avatars in userlist
2017-07-17 11:08:20 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
7be1e249e1
add fa-share-alt to pad initialText
2017-07-13 15:48:03 +02:00
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
bf9c2b0b84
new messages
2017-07-13 12:29:49 +02:00
f6abdc2b86
manual merge of staging
2017-07-13 10:30:42 +02:00
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
3453e54357
bump footer and package.json for upcoming version
2017-07-12 10:49:05 +02:00
42075e4b5f
Make everything 16px and 32px
2017-07-11 15:34:46 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
5d5f936682
Hide the upload table in code
2017-07-11 14:38:26 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
112c4c85e5
Left menu in drive
2017-07-11 12:47:15 +02:00
59213a9c4e
Typo
2017-07-11 11:18:13 +02:00
560671ae7d
Make avatars circle
2017-07-10 18:46:26 +02:00
125018c8c3
New settings page
2017-07-10 18:29:23 +02:00
c02fa39524
Make drive search bar blue
2017-07-10 15:19:08 +02:00
0157e04b10
Fix overflowing content in the home page
2017-07-10 14:05:12 +02:00
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
086e5909dd
Merge branch 'soon' into staging
2017-07-10 10:43:41 +02:00
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
c60a71e210
add connect button and view profile button
2017-07-10 09:23:58 +02:00
6f7c60bf12
Merge pull request #154 from evalica/153
...
Issue #153 : On Register, add spacing between checkboxes and labels
2017-07-07 17:17:30 +02:00
e8e8858e44
Issue #153 : On Register, add spacing between checkboxes and labels
2017-07-07 17:26:34 +03:00
fc065a0484
Issue #151 : Spacing between "Log-in" and "Register" buttons
...
- Removed ".first" class from Register button
- Increase spacing between buttons
2017-07-07 17:04:26 +03:00
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
f02285d103
fix lowercased p
2017-07-06 10:49:33 +02:00
56ed1dd457
spanish update
2017-07-06 10:13:56 +02:00
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
d7f9ddd8d2
Fix icon colors in the new menu (/pad app)
2017-07-04 15:57:34 +02:00
cc67838786
Fix horizontal scrollbar in /pad anonymous mode
2017-07-04 15:56:18 +02:00
fa06f9d413
fix minor bugs in poll
2017-07-04 15:09:09 +02:00
43d4597f38
merge to master
2017-07-04 14:19:08 +02:00
25905d13fa
wip
2017-07-03 20:40:19 +02:00
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
1a27f11e73
Fix dropdown menus in static pages
2017-07-03 17:04:59 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
1df5e6e855
Fix toolbar buttons for Safari
2017-07-03 14:32:54 +02:00
bf414c15ee
fix logout button on home page
2017-07-03 12:26:08 +02:00
70c9f3df75
Fix avatar size
2017-07-03 12:13:37 +02:00
fcff5fa009
wip
2017-07-02 16:51:21 +02:00
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 16:57:37 +02:00
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
c2e153e8ed
more fouc fixes
2017-06-30 16:20:10 +02:00
8ffad5ece6
FOUC fixes
2017-06-30 16:10:42 +02:00
b6944e6638
Fix userlist style in apps without iframe
2017-06-30 13:13:11 +02:00
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
0b9d7d6c0b
fix color of links in poll and whiteboard
2017-06-29 16:51:44 +02:00
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
c53ebe3598
bring upload status container to the front
2017-06-28 16:33:00 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +02:00
bdca6b10c2
use templates in poll.js
2017-06-27 15:38:12 +02:00
3a9b480e4e
resolve merge conflicts in template.js
2017-06-27 14:28:28 +02:00
40f4fc2682
Add the profile app in template.js
2017-06-27 14:27:54 +02:00
9b6790534f
remove grey text from ckeditor initialState
2017-06-27 14:26:09 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
c431041e3f
Fix position of the rightside drawer with small screen
2017-06-26 15:53:29 +02:00
36ef4178dc
Remove the editable title from the file app
2017-06-26 15:16:17 +02:00
c364803406
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 11:25:06 +02:00
805e604e53
Add missing icons
2017-06-26 11:24:49 +02:00
f181e8db60
correct parentheses
2017-06-26 10:45:27 +02:00
f4fdb7040c
Optimize image assets to speedup page loading
2017-06-25 20:14:23 +02:00
6af4335ead
Translated up to page 317
...
Translated up to page 317
2017-06-23 14:28:00 -03:00
ce44a8d351
Fix the backup button in anonymous drive
2017-06-23 18:02:36 +02:00
06a0590f73
New folder icons
2017-06-23 17:58:41 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 16:15:08 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
bd1db735dd
jshint compliance
2017-06-22 16:02:20 +02:00
35bfa1dce4
test client-side templates in whiteboard app
2017-06-22 16:01:33 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
dcfc59c2e2
Translation key updated
2017-06-22 11:21:37 +02:00
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
3657e978fd
give main2.js a more sensible name
2017-06-22 11:06:11 +02:00
e86ef209a8
define loading screen markup in js
2017-06-22 11:04:21 +02:00
118b83c420
make register and login user clientside templates
2017-06-22 10:04:46 +02:00
6dacbf2bd9
add translations and some improvements
2017-06-21 21:38:56 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 18:09:57 +02:00
b80d7513aa
skip over the terms of service link
2017-06-19 18:03:39 +02:00
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 17:59:18 +02:00
f5da7ae42e
Add a new loading tip in french
2017-06-19 17:59:12 +02:00
e2ff88e4c4
tooltips for file upload
2017-06-19 17:56:19 +02:00
726302a9ee
Spanish update
2017-06-19 15:05:17 +02:00
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
9870169e03
remove a few elements from CKEditor config
2017-06-14 15:39:33 +02:00
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
0004be521c
change translation
2017-06-13 14:21:22 +02:00
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
621376b0fa
small fixes
2017-06-09 17:44:13 +02:00
cce665a18b
spanish updates
2017-06-09 17:42:25 +02:00
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
2f851ab97e
fix lint errors
2017-06-07 10:13:51 +02:00
f1271bfd03
Missing file
2017-06-06 11:56:22 +02:00
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
85f1fb86d0
Add missing french translation keys
2017-06-06 10:28:00 +02:00
f43132a63b
bump version in footer and package.json
2017-06-06 10:01:07 +02:00
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
8d4017b79e
fix parse error
2017-06-05 11:35:05 +02:00
b9b8352633
Traditional Chinese
2017-06-05 15:10:13 +08:00
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
d774f8771b
remove more unused files
2017-05-31 12:23:31 +02:00
540304807c
remove unused files
2017-05-31 12:11:33 +02:00
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +02:00
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
909bc2ebf3
add new translation key
2017-05-30 15:39:13 +02:00
81b931e56f
Update messages.pt-br.js
2017-05-30 09:45:14 -03:00
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
75874424cf
add 'support cryptpad' translation key
2017-05-30 10:41:46 +02:00
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
2d2e00b569
Merged translated and non-translated in pt-BR
...
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
2017-05-29 14:43:15 -03:00
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
0a92719763
spanish! new keys ahoy
2017-05-29 18:25:18 +02:00
6518b56945
poll: french messages
2017-05-29 16:50:25 +02:00
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +02:00
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-29 11:33:03 +02:00
6573813523
Merge branch 'soon' into staging
2017-05-29 11:32:54 +02:00
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
1092285a68
merge master
2017-05-26 16:18:51 +02:00
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
0559b8cb77
Update messages.ro.js
2017-05-26 16:47:45 +03:00
70fbbe0078
Update messages.ro.js
2017-05-25 10:23:27 +03:00
bc26f7fc4e
Merge branch 'soon' into staging
2017-05-24 15:04:40 +02:00
70c1061f47
Fix romanian translation
2017-05-24 14:49:00 +02:00
83c0a6d37d
Romanian translation
2017-05-24 14:37:13 +02:00
b281d51d90
Fix typos in the french translation
2017-05-23 15:04:18 +02:00
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 14:50:42 +02:00
964d046154
Update a french translation key
2017-05-23 14:50:28 +02:00
cf83cab596
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 12:35:54 +02:00
0a646a9534
remove unnecessary space
2017-05-23 12:35:49 +02:00
6ddfe0e901
Fix new lines in /pad userlist
2017-05-23 12:14:31 +02:00
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
2ca6277660
enable pin limits by default
2017-05-22 16:50:32 +02:00
c45f08f147
Use a download button instead of downloading a file automatically
2017-05-22 11:43:45 +02:00
0c2f84058b
Improve css for the file app
2017-05-22 11:16:01 +02:00
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
af4fd3c6d3
resolve merge conflicts
2017-05-19 19:14:08 +02:00
1ab6eb3c5d
Add a queue for multiple uploads in the file app
2017-05-19 18:41:34 +02:00
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
e7a458295b
new translation keys for file upload
2017-05-19 09:10:36 +02:00
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
21f9e31e75
Add a placeholder for the user app
2017-05-18 15:56:35 +02:00
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
3ba94a1ba2
correctly set release version number
2017-05-18 14:54:02 +02:00
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
4debec39bb
update footer with next release codename and corrected matrix link
2017-05-18 12:58:49 +02:00
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:33:34 +02:00
81af9225fc
template a Romanian translation
2017-05-16 14:32:54 +02:00
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
2017-05-16 14:23:06 +02:00
ad6217f064
file upload spanish keys
2017-05-16 14:05:36 +02:00
827233dcba
new translation keys for file upload
2017-05-16 14:01:06 +02:00
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
716245f864
Make all the buttons look the same
2017-05-15 16:16:50 +02:00
0f37d9def7
Change the button font size in the toolbar
2017-05-15 14:53:51 +02:00
48496416e7
Use the same font-size for all the toolbar buttons
2017-05-15 14:46:17 +02:00
03274c3776
Display an info message in the anonymous drive
2017-05-15 13:54:03 +02:00
ad5e18f558
Spanish update
2017-05-15 12:05:50 +02:00
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
2017-05-11 10:58:33 +02:00
5a21be8112
Improve UI on mobile
2017-05-10 15:54:09 +02:00
ca6f910f0b
Add french translations for 'log out everywhere'
2017-05-09 10:32:41 +02:00
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
6909f663b6
modify 'log out everywhere' text
2017-05-05 15:18:32 +02:00
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
c07d3e6162
update version strings for upcoming release
2017-05-05 11:51:41 +02:00
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
0ee228666b
Replace the IRC link by the Matrix one
2017-04-28 12:40:39 +02:00
ab1dc48b6d
Fix the 'limit reached' icon in the pad app
2017-04-28 12:32:49 +02:00
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
e40203480f
Merge pull request #113 from pbondoer/staging
...
Update spanish
2017-04-24 16:09:53 +02:00
a5ca461a73
update footer for new version
2017-04-24 15:41:29 +02:00
ansuz