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
ba407322e8
Update spanish
2017-04-24 15:16:30 +02:00
3e28d1b966
Add a missing key in the french translation
2017-04-24 14:41:55 +02:00
9abfadb32f
Update french translation
2017-04-24 14:39:30 +02:00
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
df9c312b7d
make new text translateable
2017-04-18 18:31:58 +02:00
8f352c8433
add justify plugin to default ckeditor config
2017-04-18 15:49:31 +02:00
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
7a05462eb3
Some more poll changes <3
2017-04-14 19:34:58 +02:00
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-14 18:44:20 +02:00
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
eed5b1260d
set font-size label to match other ckeditor font sizes
2017-04-14 18:20:40 +02:00
0db603f580
spanish pinpad
2017-04-14 17:59:08 +02:00
84dd879abb
add messages for settings page
2017-04-14 17:22:00 +02:00
4c7022ade9
Merge pull request #109 from pbondoer/spanish
...
Espanol!
2017-04-13 18:10:35 +02:00
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
2017-04-13 18:04:13 +02:00
65e848fd4d
linter linted the lints
2017-04-13 17:50:28 +02:00
40c06c4515
Spanish!
2017-04-13 17:42:38 +02:00
3e421c7289
Fix lint errors in ckeditor config
2017-04-13 17:09:35 +02:00
2ad0a65b71
Remove shortcuts that override browser actions
2017-04-13 16:43:07 +02:00
f11cf8e6ac
move poll styles to separate file
2017-04-13 14:14:12 +02:00
cde9ea9887
update footer version
2017-04-10 18:09:22 +02:00
d5e69653c0
Select opacity in draw mode in the canvas app
2017-04-10 17:03:50 +02:00
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
63a130c678
Add a button to delete the selection in canvas
2017-04-10 11:55:39 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 14:54:13 +02:00
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
2017-04-07 14:54:02 +02:00
2ecabbe6e3
add brown and pink to the palette
2017-04-06 19:05:06 +02:00
6e1ffcc18d
define better color palette
2017-04-06 18:45:40 +02:00
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
fe7f7f4e6d
Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging
2017-04-05 10:36:23 +02:00
90612bc5ba
Update messages.pt-br.js
2017-04-03 18:43:30 -03:00
5a85e4464c
fix poor visibility on green pencils
2017-03-30 18:05:08 +02:00
7908f3b4f0
make sure green UI elements use the same green
2017-03-30 15:50:06 +02:00
36b02d71f5
add ckeditor indentblock plugin.
...
closes #101
2017-03-30 10:55:22 +02:00
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
364dae2882
update templated html
2017-03-29 12:56:08 +02:00
a3a0592e5e
add English and French keys for the whiteboard app
2017-03-29 11:54:46 +02:00
6186953a12
make whiteboard a default app
2017-03-29 11:54:19 +02:00
df7363f416
regenerate templated files for new footer
2017-03-28 11:50:42 +02:00
b50b76bf81
remove unnecessary lines
2017-03-27 18:13:21 +02:00
d92a875ce5
Translate the 'wrong application' error message
2017-03-27 11:34:54 +02:00
69edce5491
remove unused translation keys
2017-03-27 11:29:19 +02:00
53c60a31f6
Set the properties and backup inputs to read-only in the drive
2017-03-27 11:14:37 +02:00
ff60dd4399
Translate settings_publicSigningKey in french
2017-03-27 10:32:13 +02:00
b176426213
increase default ckeditor font size to 16px
2017-03-24 14:55:29 +01:00
3e9eb03e5a
display a user's public signing key in settings if it exists
2017-03-24 14:26:36 +01:00
d1c32ea1f8
define english, french, and spanish labels for whiteboard app
2017-03-23 16:50:37 +01:00
f301592a83
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
2017-03-20 18:08:08 +01:00
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
ef0e1d7aa0
add a non-breaking space to pad initialState
2017-03-20 18:05:07 +01:00
29174b2922
Update the lag icon
2017-03-20 16:39:33 +01:00
26edb77cf0
Fix style and usability issues in slides
2017-03-20 15:20:42 +01:00
0efb3c993c
fixed lint :(
2017-03-17 18:10:37 +01:00
45ac3e40a2
Copy print options to present mode
2017-03-17 18:03:00 +01:00
3c60ebcc97
Update Spanish
2017-03-17 18:02:48 +01:00
a5f11d0d0d
Uniform the slides rendering in present and print mode
2017-03-17 15:30:27 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
0607c3bbf3
Add a title to the 'new' button in drive
2017-03-15 17:20:08 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
dcc4e0dc6b
remove extraneous translation
2017-03-14 14:35:27 +01:00
805e26bc07
add a version footer to main pages
2017-03-14 14:34:13 +01:00
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
bc35fc86cf
Translate the 'alreadyRegistered' error in french
2017-03-14 12:42:00 +01:00
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
fcbe3a5224
add already registered message to english translation
2017-03-14 12:40:19 +01:00
36a2eab3c3
Add French translation for the new register process
2017-03-14 12:05:12 +01:00
11ff3f5347
new styles for alertify dialogs
2017-03-14 12:02:12 +01:00
bbe2279b9c
add new translations for registration
2017-03-14 11:02:14 +01:00
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 19:32:15 +01:00
0d30a1e00f
add safe and danger classes to alertify styles
2017-03-13 19:32:10 +01:00
3ad8b4023d
Spanish update 🇪🇸
2017-03-13 15:50:20 +01:00
e761dc27c2
French translation for feedback
2017-03-13 13:04:55 +01:00
a16e6850d4
add translation keys for the feedback page
2017-03-13 12:54:59 +01:00
c00010177d
Add tips in the loading screen
2017-03-13 12:41:15 +01:00
95a51e8fe4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 12:16:06 +01:00
ff3641134f
update pad initialState
2017-03-13 12:16:01 +01:00
275900f5ff
Translate new initial states for pad and code
2017-03-13 12:15:53 +01:00
4a762fec99
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 11:53:24 +01:00
ca9faa0056
Fix wrong translation keys
2017-03-13 11:52:48 +01:00
1178660815
update code initialState string
2017-03-13 11:52:33 +01:00
2e418c1723
When the browser returns a regional language, check if the language code is available
2017-03-10 17:03:30 +01:00
f94db93897
Improve the slides layout in print mode
2017-03-10 16:46:36 +01:00
2392167996
Export slides as PDF
2017-03-09 19:05:44 +01:00
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
a8d200ef2e
Don't redirect until realtime is synced when logging in
2017-03-08 16:15:31 +01:00
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
f61f284e44
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-03 18:14:59 +01:00
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
6e72c6a51b
remove unused dependencies
2017-03-03 17:15:33 +01:00
616d265b8d
Remove unused French keys
2017-03-02 18:43:06 +01:00
30faef613a
Update Spanish
2017-03-02 18:41:14 +01:00
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:44:29 +01:00
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:09:39 +01:00
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
2017-03-02 17:01:27 +01:00
e8a82c4c10
(CSS) Toolbar buttons are now always black on white independent of system theme
2017-03-02 16:35:30 +01:00
fa59f1000e
(CSS) Fix title input in pads
2017-03-02 16:33:17 +01:00
2b20eef464
Fix userlist in /pad
2017-03-02 12:28:01 +01:00
e3f26263f4
remove red outline on images in slide
2017-03-02 11:28:20 +01:00
c9040997d5
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
2017-03-02 11:07:17 +01:00
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
9800f036c5
fix a typo
2017-03-01 17:06:18 +01:00
84a4a15c46
fix inverted checkbox description
2017-02-28 18:58:20 +01:00
f11b03c16e
Spanish translation updated 🎉
2017-02-28 18:47:58 +01:00
f130fd0598
Fix horizontal scrollbar in edge
2017-02-28 18:02:12 +01:00
345d2faab2
Fix horizontal scrollbar in Edge #3
2017-02-28 17:13:51 +01:00
d683dc499a
Fix horizontal scrollbar in Edge #2
2017-02-28 17:03:23 +01:00
7a0a87bf6c
Fix horizontal scrollbar in Edge
2017-02-28 16:38:51 +01:00
3bf85b113c
don't hide overflow, that causes worse problems
2017-02-28 16:37:34 +01:00
65202bd619
Fix french translation with the drive readme
2017-02-28 15:02:11 +01:00
3380b13c95
remove horizontal scroll on edge
2017-02-28 12:29:53 +01:00
10c41369de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 12:25:40 +01:00
8c87255267
remove any mention of piwik
2017-02-28 12:25:31 +01:00
8007f51655
Update french translation
2017-02-28 12:01:32 +01:00
1c7561f37e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 11:51:23 +01:00
6967b67485
Update french translation suing new best practices
2017-02-28 11:51:18 +01:00
569d25f25f
update some translation keys in English
2017-02-28 11:50:07 +01:00
b87c9d4ba6
fix merge conflicts with usability branch
2017-02-28 11:35:29 +01:00
5a49e276b5
add settings_anonymous key
2017-02-28 11:32:14 +01:00
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:47:23 +01:00
86adfbf27d
update cache-busting directive in all supported apps
2017-02-28 10:47:18 +01:00
96f6b5755d
Add the blog link in the header and footer
2017-02-28 10:39:48 +01:00
ccd195d318
Translate user feedback keys in french
2017-02-28 10:28:07 +01:00
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 20:11:26 +01:00
a4913f2f4b
provide UI for disabling the user feedback api
2017-02-27 20:11:18 +01:00
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 17:23:40 +01:00
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:32:04 +01:00
06f0891d21
add allowUserFeedback toggle to settigs page
2017-02-27 14:31:56 +01:00
4941674cf7
initialize allowUserFeedback to true if it is not defined
2017-02-27 14:31:00 +01:00
95853debf9
Update the default pad #1
2017-02-27 14:29:48 +01:00
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
2017-02-27 11:19:29 +01:00
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
2017-02-24 16:51:15 +01:00
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
9ccb473b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
2017-02-24 12:06:17 +01:00
252fc7a640
uppercase messages
2017-02-24 11:52:21 +01:00
20689b1dec
update english translation for usability feedback
2017-02-23 16:11:39 +01:00
2d30393243
Add support for updated translation key
2017-02-23 11:45:00 +01:00
f168433db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 17:41:06 +01:00
d0b7576d84
make slide present mode exit button clickable at all sizes
2017-02-22 17:40:44 +01:00
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 12:25:48 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
1494387c9f
ignore a line for jshint
2017-02-22 11:17:12 +01:00
e73b4a1131
Don't display 'All files' in the menu
2017-02-22 11:15:29 +01:00
33e2c8676e
assign updated key to what it should actually be
2017-02-22 11:15:25 +01:00
641c805518
unbreak ckeditor
2017-02-21 18:59:42 +01:00
fac5a043ca
Merge pull request #88 from pbondoer/staging
...
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
e5179a1b3f
Translate pad initial state in french
2017-02-21 18:48:01 +01:00
328e3e71d9
Some UI fixes for Spanish
2017-02-21 18:47:32 +01:00
2e378564d0
Make the 'pad' initial state translatable
2017-02-21 18:43:26 +01:00
c0989f64fa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 18:21:39 +01:00
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
81fbe0fdd1
Add back some translation keys that shouldn't have been removed
2017-02-21 18:21:11 +01:00
f08d43d2a0
Slight fixup
2017-02-21 18:02:12 +01:00
fc2aac2d1b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-02-21 18:00:27 +01:00
1438f6b84b
Update Spanish translation 🇪🇸
2017-02-21 17:56:02 +01:00
ed19c6885d
join array in messages.js
2017-02-21 17:16:56 +01:00
20b08a7847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 14:16:35 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
5276dac7cc
safely handle keys which aren't strings
2017-02-21 12:29:47 +01:00
b55ded454b
Update README #2
2017-02-21 11:13:10 +01:00
f17b84d7e9
Update README about translations
2017-02-21 11:11:38 +01:00
3b71c8b0b5
Missing translations are now returned as an array of arrays
2017-02-21 10:53:30 +01:00
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
454d1c2052
Do not load all the translations anymore, only the needed one
2017-02-20 18:29:06 +01:00
434c3a220c
Remove old translation keys #2
2017-02-20 16:15:13 +01:00
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
a6497f7a52
Add a way to show the drive tips again
2017-02-17 16:56:59 +01:00
8167ed9048
implement cache-busting everywhere
2017-02-17 12:39:01 +01:00
66a21bb45c
implement cache-busting everywhere
2017-02-17 12:38:10 +01:00
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
550c65aae0
Add a default pad in CryptDrive after signing up
2017-02-16 18:10:12 +01:00
b4128ee313
Fix typo
2017-02-16 17:26:51 +01:00
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
0e76b18278
Hide the links in the html topbar on small screens
2017-02-15 14:23:56 +01:00
0a43570990
Add the new files for the settings app
2017-02-14 19:07:17 +01:00
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
318cec5f91
Update french translation
2017-02-13 15:23:45 +01:00
c838fdc667
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 13:06:38 +01:00
dc9ab7af4a
Make the user confirm (french)
2017-02-13 13:06:32 +01:00
5ae65c8bc1
make the user confirm
2017-02-13 13:04:55 +01:00
25dd103f6f
Reduce font-size for register explanations
2017-02-13 12:54:34 +01:00
f93e121763
Translate register explanations in French
2017-02-13 12:54:03 +01:00
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 12:42:17 +01:00
7d21206cae
add registration introductory text
2017-02-13 12:42:07 +01:00
2807ad9dc3
Add spinner and translate the register page
2017-02-13 11:41:48 +01:00
bff9d05210
Make sure the login_name is in the object
2017-02-13 11:15:30 +01:00
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
3b1bd2f720
use additional translation keys for registration
2017-02-13 10:15:25 +01:00
438e139489
don't complete login names
2017-02-13 10:14:26 +01:00
b5b2454f0b
use bootstrap for login and register pages
2017-02-10 18:29:49 +01:00
c556f78562
log in directly from home page, sign up at /register/
2017-02-10 16:49:17 +01:00
0ee808295b
make sure jquery is imported before using it
2017-02-10 14:29:01 +01:00
6c1981c776
Fix dropdown menus
2017-02-10 12:26:47 +01:00
73e9effd32
Fix the drive button in the homepage and a:hover in dropdown
2017-02-10 11:21:10 +01:00
ae6e066ed4
Update font-size for the drive link
2017-02-09 19:00:52 +01:00
6026351091
Improve the homepage (style and translations)
2017-02-09 18:53:04 +01:00
d54262c8df
Use the same disconnecter error translation key for all the apps
2017-02-09 15:34:14 +01:00
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
37c94935f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 12:58:22 +01:00
fc3995054d
Do not expose the store methods until it is ready
2017-02-09 12:56:05 +01:00
2eccc6a69f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 12:48:14 +01:00
9dfe3ccaac
Change 'jot it down' to 'write it down' in the front page
2017-02-09 12:48:06 +01:00
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:27:28 +01:00
4aaaa2f647
Update the footer
2017-02-07 18:06:36 +01:00
4b710b418c
remove dead code from home page
2017-02-07 17:27:00 +01:00
6e730c7800
prefer to end links to apps with a trailing slash
2017-02-07 10:53:42 +01:00
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
7e7d1f7a16
Display the error when opening a document with the wrong app
2017-02-06 12:43:56 +01:00
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
fbbf8a2829
Replace initialState by a placeholder in slide and code
2017-02-03 18:45:30 +01:00
9c4c378d6a
Add a footer to the html pages
2017-02-03 16:52:55 +01:00
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
46b48df966
Don't display 'Hello null' if we can't get the account name
2017-02-03 10:48:15 +01:00
8648ff208e
dropdown links should always be black
2017-02-02 18:52:11 +01:00
0ad95142f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:49:17 +01:00
26a4b0c18f
override bootstrap colors
2017-02-02 18:48:43 +01:00
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:40:45 +01:00
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
e712025a4e
set cached styles
2017-02-02 18:39:40 +01:00
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:37:09 +01:00
9d0252e989
style links on info pages, and fix layouts
2017-02-02 18:36:30 +01:00
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
bed49d0b26
Adjust space between buttons in the home page
2017-02-02 11:46:52 +01:00
35a49ac195
Improve the connection lost message with read-only
2017-02-02 11:33:05 +01:00
4bb02b9d4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 18:48:37 +01:00
89da142204
Fix pad creation from the context menu
2017-02-01 15:52:47 +01:00
07f722fbd8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 15:47:58 +01:00
1a061c22a0
more consistent styles and improved SEO
2017-02-01 15:47:50 +01:00
3a9c1c782d
remove dead code from cryptpad.less
2017-02-01 15:21:59 +01:00
24f66b7e3f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 11:37:27 +01:00
5d499df39e
Load jQuery before bootstrap
2017-02-01 11:37:19 +01:00
eb3c58939d
correct typo
2017-02-01 11:15:09 +01:00
599e00be21
Remove unused code
2017-01-31 18:19:34 +01:00
46b5b8766d
Dropdown button to make a pad from homepage
2017-01-31 18:16:35 +01:00
d93086a92d
hitting enter in the password field should log you in
2017-01-31 17:29:32 +01:00
5e4f2ffe6a
Shrink images, change text and 'make a pad right now' button
2017-01-31 15:00:01 +01:00
11fa4493d1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-31 14:36:47 +01:00
d76e0ae0d4
Update input colors in alertify
2017-01-31 14:36:33 +01:00
5b802d6e84
replace mountain image with lock image
2017-01-31 14:23:09 +01:00
d926b69f8b
Improve the main page when javascript is disabled
2017-01-31 12:43:28 +01:00
2e247d44c7
Hide the backup icon when logged in
2017-01-31 10:59:23 +01:00
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
487650df78
Remove the remember me checkbox
2017-01-30 15:32:42 +01:00
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
29578a7400
Merge branch 'hpbs' into newtoolbar
2017-01-30 14:45:02 +01:00
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
8ccd845d52
Merge branch 'newtoolbar' into hpbs
2017-01-24 12:54:32 +01:00
ce1e792419
Merge branch 'soon' into newtoolbar
2017-01-24 12:54:07 +01:00
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
f5753cf594
Fix typo
2017-01-24 12:42:21 +01:00
141f8f776a
Fix the Noscript bug
2017-01-23 12:29:12 +01:00
fd78e4fa92
Improve homepage CSS and responsiveness
2017-01-20 18:21:51 +01:00
7d66d391fc
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:17:30 +01:00
3338000018
Add Esc and Arrow icons in the slide's present mode
2017-01-19 12:49:40 +01:00
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:14:14 +01:00
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:13:57 +01:00
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
2017-01-19 10:53:55 +01:00
9523782bf8
Make the home page responsive
2017-01-19 10:48:46 +01:00
69bee7d79a
Add data into the homepage
2017-01-18 18:02:32 +01:00
b9c4ceccd4
Change the CSS and colors
2017-01-18 13:51:11 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
82e8041054
Use bootstrap 4 in the main page
2017-01-17 18:19:45 +01:00
73d424b506
Improve the login UI (css and translations)
2017-01-17 16:21:12 +01:00
e006ed7076
Ability to log in from the main page
2017-01-17 11:52:44 +01:00
6652e9d6d9
Test new home page
2017-01-16 18:29:34 +01:00
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
51a2cfa141
Fix missing FontAwesome icon
2017-01-12 11:09:12 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
9d0d8b27cf
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil
2017-01-11 07:59:54 +01:00
5b1a45c510
Translation 100% polished.
...
I've corrected errors, replaced sentences to better translations and other small things. This version can be considered the final one.
Please notify me if new translation tokens gets added to the website, so I can keep the translation up to date.
2017-01-10 16:47:29 -02:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
dba42a90c7
Fix the username button icon not aligned
2017-01-09 16:33:12 +01:00
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
0abec4ddb3
Fix error with placeholder translations in Safari
2017-01-09 11:50:45 +01:00
4902aebe77
open home page table links in new tabs
2017-01-09 11:01:29 +01:00
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
6106f7d6ca
Make sure we never create the file store object twice
2017-01-06 14:14:13 +01:00
004d4a16fe
Fix error with placeholder translations in Safari
2017-01-06 13:52:30 +01:00
bf764d26e7
Merge branch 'staging' into workgroups
2017-01-06 11:17:17 +01:00
3836b20b08
enable the file store
2017-01-06 11:16:56 +01:00
7868a65da9
apply style patches to the correct elements
2017-01-05 15:06:08 +01:00
5c967ed09e
apply live fixes to the codebase
2017-01-05 14:45:31 +01:00
bd6f2c037e
assign the cors iframe an id
2017-01-05 14:27:40 +01:00
5a90d20cff
open pads in a new tab
2017-01-04 16:41:47 +01:00
c380ecfcd9
add the slogan which was accidentally dropped
2017-01-04 16:35:32 +01:00
05a956879a
prepare new poll app for release
...
move old poll into poll/old
2017-01-04 15:48:50 +01:00
6c4e070c82
update information pages
2017-01-03 15:25:41 +01:00
7b87213ec3
extract more constants into less variables
2017-01-03 12:19:07 +01:00
27d5559b0c
define and use flags to enable the home page table
2017-01-03 12:17:17 +01:00
4b1f9fd4f1
Revert "yank dead code"
...
This reverts commit aad442cb20
2017-01-03 11:49:44 +01:00
aad442cb20
yank dead code
2017-01-02 16:03:50 +01:00
f01c3725af
move minor links to the bottom of the home page
2016-12-30 15:56:24 +01:00
9b650362b9
rebuild css
2016-12-30 15:33:59 +01:00
d843caeb9a
remove bottom bar and move language selector to main html
2016-12-30 15:33:28 +01:00
c6499d6789
make panel styles reusable
2016-12-30 15:30:35 +01:00
773209472e
break monolithic style file into several modules
2016-12-30 15:29:45 +01:00
0abf45bdc5
better fsStore debugging
2016-12-30 12:27:58 +01:00
fefe444501
add new translation keys
2016-12-29 17:11:30 +01:00
0c9178ba46
update slide styles, comment alertify styles, updated compiled css
2016-12-28 17:33:46 +01:00
d7bdb30969
don't compile alertify.css directly
2016-12-28 17:20:29 +01:00
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
8b9d7f2357
update built html
2016-12-28 17:10:38 +01:00
6a46d6e06c
update page layout and account for about page
2016-12-28 17:09:21 +01:00
a5407e9222
rework templates and build system
2016-12-28 15:52:16 +01:00
c9d99f101a
rewrite customize/readme.md
2016-12-28 15:33:59 +01:00
13e8bf5b5e
remove old 'user' code
2016-12-28 15:33:40 +01:00
f0a4c0ccb0
sheet.js is never used
2016-12-28 15:24:04 +01:00
2be90e8858
remove Header.html
2016-12-28 15:18:39 +01:00
0a89f13498
don't need /customize/pad.js anymore
2016-12-28 15:15:25 +01:00
46024853ec
restrict cryptpad styles to descendants of .cp
2016-12-27 14:30:27 +01:00
e9376a66c2
apply 'cp' class for unified styles
2016-12-27 14:29:20 +01:00
5a4ec358b3
Merge branch 'soon' into staging
2016-12-27 13:36:23 +01:00
71488e6651
add link to markdown tutorial
2016-12-27 13:36:02 +01:00
bc49e143b8
give alertify popups their own bg var
2016-12-27 12:34:31 +01:00
db12b5e896
move text for login page into translation file
2016-12-27 12:31:16 +01:00
f9da200381
resolve merge conflicts in translations
2016-12-26 14:25:02 +01:00
4476fd4006
s/readOnly/readonly
2016-12-22 18:15:18 +01:00
25c8ea464b
Merge branch 'soon' into login
2016-12-22 17:22:42 +01:00
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 17:20:30 +01:00
81259fc25f
Refresh unsorted and templates when files data changes
2016-12-22 17:20:05 +01:00
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
21360801de
change a few english keys
2016-12-22 16:54:17 +01:00
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
3b10217fb0
fixed buttons breaking responsive layout
2016-12-22 04:54:28 +01:00
f5e7a6f0c8
Fixed up Spanish translation 🇪🇸
2016-12-22 03:34:31 +01:00
87582d41a9
Added alt tags to English translation
2016-12-22 03:34:12 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
046220f239
Add info boxes for the different categories
2016-12-21 11:46:49 +01:00
e9418af88b
Add an info box in the file manager
2016-12-20 18:59:50 +01:00
1f762ce55b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 17:27:59 +01:00
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
820537f7e3
rebuild css
2016-12-20 16:54:53 +01:00
4991bfab92
rebuild css
2016-12-20 16:54:36 +01:00
280a6c462a
implement white image correctly
2016-12-20 16:42:14 +01:00
5c46fa7c65
implement white image correctly
2016-12-20 16:41:05 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
959983cc8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:31:06 +01:00
c7e63f63fd
Use the user object in file manager if it exists
2016-12-20 11:30:04 +01:00
9dbe583f4b
Merge branch 'soon' into staging
2016-12-20 11:27:26 +01:00
835c33113e
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon
2016-12-20 11:25:09 +01:00
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:23:54 +01:00
5a39caf95a
new messages for login
2016-12-20 11:16:49 +01:00
fc19626ead
Revised TOD for better comprehension
...
Whoa, when reading the translation on live pages, it's easy to see how some things may be better presented in plain text form.
I've just finished the TOS and should deliver a better version of the Privacy Policy soon!
2016-12-19 16:43:02 -02:00
e3f484d876
File manager in the home page, lint
2016-12-19 17:53:03 +01:00
88dcd2ecc3
FP correction & revision for better comprehension
...
I've fixed some minor errors and revised some texts in order to provide better sense for the text.
Beside that, I've reduced the text (keeping it's meaning of course) of the buttons close to the bottom of the front page, since on Firefox, Chrome and Safari, the buttons seems to not be adaptive oriented as the main text divs.
2016-12-19 13:23:45 -02:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
5de926493a
Merge branch 'soon' into login
2016-12-19 12:11:18 +01:00
df9f408823
Improve French translation of index.html
2016-12-19 11:51:21 +01:00
e8f27ba7a0
Merge branch 'review-french-translation' of github.com:ProgVal/cryptpad into francais
2016-12-19 11:39:49 +01:00
3dd5748f7f
integrate brazilian portuguese translation
2016-12-19 11:32:15 +01:00
d6229e31a4
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into merge-ptbr
2016-12-19 11:20:05 +01:00
481f3a42f7
Apply corrections to the Polish translation
2016-12-16 23:18:00 +01:00
98bbe678e9
Finished translation to Brazilian Portuguese
...
Added header with contributor name and contact for future inquires regarding pt-br translation.
Legal stuff, bottom and header translated, links comments translated whenever possible.
Please inform me if new translating keys get's added, so I can maintain this translation updated.
Translation done with love from Brazil.
2016-12-16 17:56:45 -02:00
270fda6243
About 60% translated already to Brazilian Portuguese
...
lines 1 to 186
2016-12-16 16:10:58 -02:00
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
d09983ac92
s/kenntnisfreier/zero knowledge
2016-12-16 17:54:50 +01:00
2ee2ffcfac
resolve conflicts in german PR
2016-12-16 17:38:53 +01:00
2ee5ef2289
add english translations for login
2016-12-16 15:21:37 +01:00
f13eb28252
add support for translating placeholders
2016-12-16 15:20:01 +01:00
d95a3ac92e
Fix an issue when deleting a key from the proxy
2016-12-16 11:41:45 +01:00
3ee7f4e96b
Added German translation
2016-12-13 20:14:22 +01:00
2b077a8e95
add the file manager in the main page
2016-12-12 18:03:06 +01:00
fdb5c2ddb5
Fix UI issues with rename and delete actions
2016-12-12 12:03:54 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
118085b809
Review French translation.
2016-12-07 19:42:07 +01:00
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
2016-12-07 16:59:43 +01:00
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
2016-12-07 16:59:32 +01:00
ddc99cecb1
Fix lint errors
2016-12-07 12:22:27 +01:00
5979b03794
Shortened translation for Create New buttons
2016-12-07 12:20:31 +01:00
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
2016-12-07 11:44:09 +01:00
740b6e955e
Improve UI, fix issues with the table
2016-12-06 18:55:10 +01:00
f6f1bc09bb
Added options to choose Polish language
2016-12-06 18:02:43 +01:00
0b459890fd
Added polish translation
2016-12-06 18:01:41 +01:00
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
2016-12-05 18:54:46 +01:00
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
2016-12-01 18:40:09 +01:00
3632834500
Lock inputs when the user is not editing them
2016-11-30 18:39:19 +01:00
eaeaf4df40
Improve UI, add title input and forget button
2016-11-29 18:57:31 +01:00
ffedcb63f7
Display own column at the beginning, add uncommitted column
2016-11-25 18:17:03 +01:00
bdb8a2ec59
additional styles for newpoll
2016-11-25 12:04:22 +01:00
c88fa34558
Improve UI, fix issues with new file manager channels
2016-11-24 18:58:29 +01:00
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
2016-11-23 18:21:45 +01:00
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
6eb29a6962
Added German Translation
2016-11-19 01:24:23 +01:00
5fecfb99a5
Added German Translation
2016-11-19 01:23:59 +01:00
d6e1215166
Refresh the directory if needed when the object has changed
2016-11-18 17:17:48 +01:00
118829617f
Use the FS store as default store
2016-11-17 18:27:55 +01:00
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
2016-11-16 17:11:48 +01:00
7a035fa4a0
Fix drag and drop with multiple elements selected
2016-11-15 18:15:54 +01:00
d77970975c
Add translations, ability to select multiple elements, clean the code
2016-11-14 18:41:42 +01:00
e90ab105aa
display buttons according to the order in application_config.js
2016-11-07 11:43:49 +01:00
ef37dcd7e4
add note about how missing keys are treated
2016-11-04 16:11:33 +01:00
6366e95dd8
remove unnecessary translation key
2016-11-04 14:21:05 +01:00
933831a2a8
add a comment about _languageName
2016-11-04 14:11:00 +01:00
439a9981cc
add documentation for submitting a translation
2016-11-04 14:10:32 +01:00
72f284bb53
add comments so translators don't get completely lost
2016-11-04 11:51:52 +01:00
fda0f7d2e7
let javascript add language keys intead of html
2016-11-04 11:49:43 +01:00
7b63decfee
eliminate one step from the translation process by auto-adding languages to selector
2016-11-04 11:46:59 +01:00
779b3914f9
fix spanish pluralization and update howitworks
2016-11-04 10:32:20 +01:00
e52450fdc7
update english and french translations to include link to bitcoin.pdf
2016-11-04 10:31:35 +01:00
f1bb63f915
translate missing keys to spanish using google translate
2016-11-03 16:05:37 +01:00
8064b1d196
merge changes from soon
2016-11-03 16:05:02 +01:00
54615932f8
merge in some espanol commits
2016-11-03 12:41:40 +01:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
64346b72d8
Change the height of the toolbar top line
2016-10-26 15:14:54 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
901a708be6
Merge branch 'usability1' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:06 +02:00
2326526f95
correct grammatical error in French translation
2016-10-24 14:32:34 +02:00
ef17dd66fa
userButtonTitle to french translation. Thanks @yflory
2016-10-24 12:01:31 +02:00
e07cb984e5
return, don't log
2016-10-24 11:47:13 +02:00
1785516f0e
add spanish translations to map. export a function which checks completion of translations
2016-10-24 11:41:36 +02:00
7285e655c3
fix unterminated strings
2016-10-24 11:23:27 +02:00
a846463328
change localization key back to france
2016-10-24 11:18:34 +02:00
8347ab8bc6
Merge branch 'master' of github.com:heticor915/cryptpad into espanol
2016-10-24 10:37:51 +02:00
5b7d3f9d57
Add spanish translation
2016-10-21 16:36:41 -05:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
e23ac85b6d
use absolute path to css
2016-10-20 11:30:36 +02:00
f5fbebfcc9
Fix small issues with the french translation
2016-10-18 13:37:51 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
d2389a5729
Change the userlist in the toolbar
2016-10-11 18:39:43 +02:00
6c04b7967d
Remove unused library
2016-10-10 17:03:25 +02:00
d63c912af0
Use the HTML5 color picker to change the colors in slides
2016-10-10 17:01:04 +02:00
d7e170c797
Test colorpicker
2016-10-07 10:31:36 +02:00
74df38f94f
Fix race conditions that could prevent applications from being loaded
2016-10-05 11:19:18 +02:00
7d5a33512a
enable slide application listing on home page by default
2016-10-04 17:15:09 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
ee88e96baf
merge noscript
2016-10-04 11:42:06 +02:00
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
2609af2105
Use the CodeMirror editor in the slide application
2016-09-30 17:39:16 +02:00
bc73fa2074
Merge branch 'fontawesome' into soon
2016-09-29 14:52:48 +02:00
921ee128bc
deobfuscate email
2016-09-29 14:46:32 +02:00
ebae2c3bec
Fix the noscript tag
2016-09-29 11:09:06 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
1ac94105bb
Update the src of customized elements
2016-09-26 17:35:27 +02:00
d46bd1af5c
Improve the toolbar UI with the username displayed
2016-09-22 17:56:51 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
f6372ee803
add noreferrer attr to blank links as well
2016-09-21 15:02:08 +02:00
c50a0ac579
where target=blank, rel=noopener
2016-09-21 14:49:47 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
723df4880e
Merge branch 'slides' into merge-slides
2016-09-20 16:28:36 +02:00
259896a373
fix translation fragment in English messages file
2016-09-20 16:21:40 +02:00
202925302e
Display a indicator for read-only pads in the main page
2016-09-20 11:59:13 +02:00
bf8c9a2c4b
Add a button to get the read only URL
2016-09-20 11:35:57 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
63bc7e121f
remove unnecessary semicolon
2016-09-15 18:57:07 +02:00
5c63585952
Complete the French translation
2016-09-15 18:35:09 +02:00
0d9f63b977
Merge branch 'translations' - part one
2016-09-15 10:36:05 +02:00
c9ff6a519b
Merge branch 'defaultTitle'
2016-09-15 10:18:12 +02:00
f086492e50
Improve the localization system
...
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
d73fef7fe5
slightly better spacing
2016-09-14 16:00:06 +02:00
1e02e7b45b
Make the pad types displayed on the front page configurable
2016-09-13 12:24:37 +02:00
c736caceba
Use a better default pad title
2016-09-13 12:24:06 +02:00
97415d8158
Merge branch 'users'
2016-09-01 17:38:25 +02:00
f74236d729
export more, use finer granularity for methods
2016-09-01 12:15:09 +02:00
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
2016-09-01 12:03:09 +02:00
f403d8e2e2
remove table refresh button. listen for changes and refresh automatically
2016-08-30 18:15:43 +02:00
f281cf898e
add login text to translations
2016-08-30 18:12:12 +02:00
ae116d4772
emit change events for remote storage.
...
listen for those events being sent via postMessage
2016-08-30 18:11:43 +02:00
412cb680ff
prototype users
2016-08-30 18:08:36 +02:00
c641692295
standardize datatype for callback for storage change callack serialization
2016-08-30 18:02:51 +02:00
43fcb29490
listen for changes to localStorage and execute callbacks
2016-08-30 18:00:28 +02:00
ca7d2943be
test for conditions on deployed machine
2016-08-29 16:59:58 +02:00
9dc206c1ee
update tests to use correct variables
2016-08-29 16:54:03 +02:00
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
2016-08-19 11:26:48 +02:00
f8f66800d1
display a 'commit' button which locks your column
2016-08-18 17:54:17 +02:00
e7aafd2beb
factor styles a bit
2016-08-18 16:18:17 +02:00
b9946822f3
fix removal buttons on home page
2016-08-18 15:47:12 +02:00
809919cb32
minor style tweaks
2016-08-18 15:24:56 +02:00
235c0482f9
increase clickable area around editable columns' checkboxes
2016-08-18 13:25:21 +02:00
9fda1dcb76
make disabled inputs pretty again
2016-08-18 12:35:39 +02:00
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
2016-08-18 12:06:13 +02:00
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
2016-08-17 18:38:27 +02:00
55666e9f70
remember presentations, and label them correctly on the home page
2016-08-17 15:03:57 +02:00
c25ed349e2
add new generated pages
2016-08-16 17:59:28 +02:00
6b86c11b2c
implement simple build system for static html
2016-08-16 17:58:30 +02:00
653bb84064
wait longer for requirejs and fix a typo
2016-08-04 12:48:36 +02:00
7cc6902892
toolbar text should not be selectable
2016-08-03 17:00:22 +02:00
90e323394d
can't rely on unicode everywhere, so let's use an svg icon
2016-08-03 16:58:39 +02:00
c7155d582e
cursor: pointer for refresh button
2016-08-03 11:37:58 +02:00
e79d3d4d4e
add a refresh button to the home page table
2016-08-03 11:36:22 +02:00
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
792d74d541
external links should all open new tabs
2016-08-02 17:08:02 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
f2c97d8913
code for querying cross-domain
2016-08-01 15:22:04 +02:00
75170353fe
api for sharing localstorage across subdomains
2016-08-01 15:18:23 +02:00
a6fd285642
fix serialization bug
2016-08-01 15:05:25 +02:00
caf1a6f01c
remove dead code
2016-07-29 18:08:23 +02:00
551d38c930
let the abstraction take care of stringification
2016-07-29 18:05:58 +02:00
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
add84aeae6
implement asynchronous wrappers for localStorage api
2016-07-28 17:05:00 +02:00
747fb138b5
better styles for cryptpoll
2016-07-28 17:04:01 +02:00
068a3f5944
remove rows from the poll
2016-07-22 15:42:41 +02:00
f721d7b32b
oops, we need these styles too
2016-07-19 16:25:14 +02:00
29b1b060d6
Add French translation
...
Add a "backToCryptpad" translation key
2016-07-18 15:59:12 +02:00
6692b1a52e
s/en\/$//
2016-07-18 10:44:57 +02:00
cd03f6cfb9
fix broken link in bottom bar
2016-07-18 10:40:37 +02:00
518de7ab96
add missing semicolon that caused tests to fail
2016-07-17 13:42:52 +02:00
6483e83996
small style tweaks and additional translations
2016-07-16 12:35:39 +02:00
d0ce8f2ca1
add polls to home page and fix up styles just a little bit
2016-07-15 18:49:50 +02:00
ff74a67a09
translate alertify button messages
2016-07-12 16:43:33 +02:00
868c84095a
fix weird styles on firefox
2016-07-12 16:30:07 +02:00
d1154e8786
missed one
2016-07-12 15:53:58 +02:00
dea8e225db
fix double scrollbar issue
2016-07-12 15:45:49 +02:00
cdb5979752
fix unstyled back button
2016-07-11 17:37:22 +02:00
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
cde68170d4
add link to twitter
2016-07-11 12:33:13 +02:00
b82e3e5a4e
fix bad dependency path
2016-07-11 11:10:17 +02:00
88a3c4227b
de-obfuscate an obfuscated email
2016-07-11 11:07:59 +02:00
28399b0d86
modify and add less source files. commit their compiled results
2016-07-08 16:44:02 +02:00
43aba94d0d
link to irc
2016-07-07 15:26:15 +02:00
4fd718254d
fix one more bug for people trying to put html in titles
2016-07-07 14:52:00 +02:00
789bc3ecc1
keep people from derping themselves
...
localStorage XSS? yup. that happened
2016-07-07 14:17:53 +02:00
750731d3db
workaround for favicon magic
2016-07-07 14:03:06 +02:00
13bea89269
add favicon on home page
2016-07-06 22:14:07 +02:00
71f22d41aa
add a main and an alt favicon
2016-07-06 22:13:29 +02:00
a48c96c053
add alertify for prettier dialogs
2016-07-06 15:14:41 +02:00
648f64c6fc
confirm with the user before deleting pads
2016-07-04 17:35:44 +02:00
ca80736ee1
add title to the pad removal button
2016-07-04 17:31:52 +02:00
fd6d9ecaf7
github ribbon should open in a new tab
2016-07-04 17:13:08 +02:00
6b157b0edc
fix the github ribbon
2016-07-04 17:08:54 +02:00
82dfcb6bdd
apply some style fixes
2016-07-04 16:34:29 +02:00
d621bc4079
attribution for the nice github ribbon
2016-07-04 15:33:02 +02:00
6b67503dc8
add lato font metadata
2016-07-04 15:26:22 +02:00
c292f9f549
move home page scripts into an amd module
2016-07-04 15:21:23 +02:00
d3825b9644
restyle main page and bottom bar
2016-07-04 15:19:57 +02:00
e2679f1f6d
add Lato font
2016-07-04 15:19:21 +02:00
9dc23b54bf
css generated from less source files
2016-07-04 15:18:34 +02:00
f4084353a6
less source files for generating css
2016-07-04 15:18:11 +02:00
eb1809423b
bump name length limit to 48 characters
2016-06-30 16:10:15 +02:00
8a82e11306
make sure title is defined for home page usage
2016-06-30 15:53:13 +02:00
0911572031
truncate long names, replace link text with doc title
2016-06-30 15:41:24 +02:00
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
c4667505c7
style alternate rows on the table
2016-06-30 11:28:45 +02:00
45312a6fbb
restyle recent pads table
2016-06-30 11:08:31 +02:00
fa0f0e4d28
unbreak styles
2016-06-30 10:53:30 +02:00
47edccf42d
use pad titles in home page table
2016-06-30 10:52:26 +02:00
3e08ed1e26
fix lopsided bottom bar
2016-06-29 12:15:33 +02:00
34bb85799e
fix landing page styles and js a wee bit
2016-06-22 10:08:33 +02:00
1f0d0de0a8
add some padding to the bottom of the landing page
2016-06-21 17:12:27 +02:00
635ae9dfe6
improve home page formatting
2016-06-10 16:50:50 +02:00
1a5388eab9
update landing page styles and copy text
2016-06-10 12:53:37 +02:00
31052e49b8
remove note about jquery sheet
2016-05-12 14:59:45 +02:00
9330b00f02
Hide the spreadsheet button until it is fixed
2016-04-11 14:54:49 +02:00
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
2016-04-08 16:54:03 +02:00
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
2016-03-10 14:03:31 +01:00
278c4ab32f
even more jshint compliance
2016-02-15 16:47:53 +01:00
d4b7a4556d
factor landing page and add pad remove column
2016-01-31 17:15:30 +01:00
1d130d4445
index.html : correct typo.
...
s/varient/variant
2016-01-18 17:55:12 -05:00
32f44161a7
Patch Realtime into CodeMirror in CryptPad
2015-11-25 09:48:30 +01:00
05ce2695b2
Added piwik code for cryptpad.fr
2015-07-17 16:25:57 +02:00
7967631277
Make a slightly nicer version of the XWiki Labs Project badge
2015-07-16 15:53:36 +02:00
21503838ca
Revert "Add the <An XWiki labs project> badge to cryptpad.fr"
...
This reverts commit be10da95bb
2015-07-16 15:52:02 +02:00
b6aaca95b9
Revert "Add the <An XWiki labs project> badge to cryptpad.fr"
...
This reverts commit 2241261ae2
2015-07-16 15:51:44 +02:00
2241261ae2
Add the <An XWiki labs project> badge to cryptpad.fr
2015-07-16 14:31:08 +01:00
be10da95bb
Add the <An XWiki labs project> badge to cryptpad.fr
2015-07-16 11:50:31 +01:00
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
2015-02-02 17:53:10 +01:00
51544db9a2
Completed adding of customization system and bottom infobar
2015-02-02 16:01:33 +01:00
84164123b6
not quite finished
2015-01-30 18:12:20 +01:00
yflory