yflory
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
ansuz
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:32:04 +01:00
ansuz
06f0891d21
add allowUserFeedback toggle to settigs page
2017-02-27 14:31:56 +01:00
ansuz
4941674cf7
initialize allowUserFeedback to true if it is not defined
2017-02-27 14:31:00 +01:00
yflory
95853debf9
Update the default pad #1
2017-02-27 14:29:48 +01:00
yflory
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
2017-02-27 11:19:29 +01:00
yflory
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
yflory
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
ansuz
9ccb473b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability
2017-02-24 12:06:17 +01:00
ansuz
252fc7a640
uppercase messages
2017-02-24 11:52:21 +01:00
ansuz
20689b1dec
update english translation for usability feedback
2017-02-23 16:11:39 +01:00
yflory
2d30393243
Add support for updated translation key
2017-02-23 11:45:00 +01:00
ansuz
f168433db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 17:41:06 +01:00
ansuz
d0b7576d84
make slide present mode exit button clickable at all sizes
2017-02-22 17:40:44 +01:00
yflory
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 12:25:48 +01:00
yflory
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
ansuz
1494387c9f
ignore a line for jshint
2017-02-22 11:17:12 +01:00
yflory
e73b4a1131
Don't display 'All files' in the menu
2017-02-22 11:15:29 +01:00
ansuz
33e2c8676e
assign updated key to what it should actually be
2017-02-22 11:15:25 +01:00
ansuz
641c805518
unbreak ckeditor
2017-02-21 18:59:42 +01:00
ansuz
fac5a043ca
Merge pull request #88 from pbondoer/staging
...
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
yflory
e5179a1b3f
Translate pad initial state in french
2017-02-21 18:48:01 +01:00
Pierre Bondoerffer
328e3e71d9
Some UI fixes for Spanish
2017-02-21 18:47:32 +01:00
yflory
2e378564d0
Make the 'pad' initial state translatable
2017-02-21 18:43:26 +01:00
ansuz
c0989f64fa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 18:21:39 +01:00
ansuz
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
yflory
81fbe0fdd1
Add back some translation keys that shouldn't have been removed
2017-02-21 18:21:11 +01:00
Pierre Bondoerffer
f08d43d2a0
Slight fixup
2017-02-21 18:02:12 +01:00
Pierre Bondoerffer
fc2aac2d1b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-02-21 18:00:27 +01:00
Pierre Bondoerffer
1438f6b84b
Update Spanish translation 🇪🇸
2017-02-21 17:56:02 +01:00
ansuz
ed19c6885d
join array in messages.js
2017-02-21 17:16:56 +01:00
yflory
20b08a7847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 14:16:35 +01:00
yflory
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
ansuz
5276dac7cc
safely handle keys which aren't strings
2017-02-21 12:29:47 +01:00
yflory
b55ded454b
Update README #2
2017-02-21 11:13:10 +01:00
yflory
f17b84d7e9
Update README about translations
2017-02-21 11:11:38 +01:00
yflory
3b71c8b0b5
Missing translations are now returned as an array of arrays
2017-02-21 10:53:30 +01:00
yflory
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
yflory
454d1c2052
Do not load all the translations anymore, only the needed one
2017-02-20 18:29:06 +01:00
yflory
434c3a220c
Remove old translation keys #2
2017-02-20 16:15:13 +01:00
yflory
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
yflory
a6497f7a52
Add a way to show the drive tips again
2017-02-17 16:56:59 +01:00
ansuz
8167ed9048
implement cache-busting everywhere
2017-02-17 12:39:01 +01:00
ansuz
66a21bb45c
implement cache-busting everywhere
2017-02-17 12:38:10 +01:00
ansuz
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
ansuz
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
yflory
550c65aae0
Add a default pad in CryptDrive after signing up
2017-02-16 18:10:12 +01:00
yflory
b4128ee313
Fix typo
2017-02-16 17:26:51 +01:00
yflory
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
yflory
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
yflory
0e76b18278
Hide the links in the html topbar on small screens
2017-02-15 14:23:56 +01:00
yflory
0a43570990
Add the new files for the settings app
2017-02-14 19:07:17 +01:00
yflory
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
yflory
318cec5f91
Update french translation
2017-02-13 15:23:45 +01:00
yflory
c838fdc667
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 13:06:38 +01:00
yflory
dc9ab7af4a
Make the user confirm (french)
2017-02-13 13:06:32 +01:00
ansuz
5ae65c8bc1
make the user confirm
2017-02-13 13:04:55 +01:00
yflory
25dd103f6f
Reduce font-size for register explanations
2017-02-13 12:54:34 +01:00
yflory
f93e121763
Translate register explanations in French
2017-02-13 12:54:03 +01:00
ansuz
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 12:42:17 +01:00
ansuz
7d21206cae
add registration introductory text
2017-02-13 12:42:07 +01:00
yflory
2807ad9dc3
Add spinner and translate the register page
2017-02-13 11:41:48 +01:00
yflory
bff9d05210
Make sure the login_name is in the object
2017-02-13 11:15:30 +01:00
yflory
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
ansuz
3b1bd2f720
use additional translation keys for registration
2017-02-13 10:15:25 +01:00
ansuz
438e139489
don't complete login names
2017-02-13 10:14:26 +01:00
ansuz
b5b2454f0b
use bootstrap for login and register pages
2017-02-10 18:29:49 +01:00
ansuz
c556f78562
log in directly from home page, sign up at /register/
2017-02-10 16:49:17 +01:00
ansuz
0ee808295b
make sure jquery is imported before using it
2017-02-10 14:29:01 +01:00
yflory
6c1981c776
Fix dropdown menus
2017-02-10 12:26:47 +01:00
yflory
73e9effd32
Fix the drive button in the homepage and a:hover in dropdown
2017-02-10 11:21:10 +01:00
yflory
ae6e066ed4
Update font-size for the drive link
2017-02-09 19:00:52 +01:00
yflory
6026351091
Improve the homepage (style and translations)
2017-02-09 18:53:04 +01:00
yflory
d54262c8df
Use the same disconnecter error translation key for all the apps
2017-02-09 15:34:14 +01:00
yflory
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
yflory
37c94935f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 12:58:22 +01:00
yflory
fc3995054d
Do not expose the store methods until it is ready
2017-02-09 12:56:05 +01:00
Caleb James DeLisle
2eccc6a69f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 12:48:14 +01:00
Caleb James DeLisle
9dfe3ccaac
Change 'jot it down' to 'write it down' in the front page
2017-02-09 12:48:06 +01:00
yflory
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
ansuz
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:27:28 +01:00
yflory
4aaaa2f647
Update the footer
2017-02-07 18:06:36 +01:00
ansuz
4b710b418c
remove dead code from home page
2017-02-07 17:27:00 +01:00
ansuz
6e730c7800
prefer to end links to apps with a trailing slash
2017-02-07 10:53:42 +01:00
yflory
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
yflory
7e7d1f7a16
Display the error when opening a document with the wrong app
2017-02-06 12:43:56 +01:00
yflory
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
yflory
fbbf8a2829
Replace initialState by a placeholder in slide and code
2017-02-03 18:45:30 +01:00
yflory
9c4c378d6a
Add a footer to the html pages
2017-02-03 16:52:55 +01:00
yflory
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
yflory
46b48df966
Don't display 'Hello null' if we can't get the account name
2017-02-03 10:48:15 +01:00
ansuz
8648ff208e
dropdown links should always be black
2017-02-02 18:52:11 +01:00
ansuz
0ad95142f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:49:17 +01:00
ansuz
26a4b0c18f
override bootstrap colors
2017-02-02 18:48:43 +01:00
yflory
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:40:45 +01:00
yflory
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
ansuz
e712025a4e
set cached styles
2017-02-02 18:39:40 +01:00
ansuz
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:37:09 +01:00
ansuz
9d0252e989
style links on info pages, and fix layouts
2017-02-02 18:36:30 +01:00
yflory
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
yflory
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
yflory
bed49d0b26
Adjust space between buttons in the home page
2017-02-02 11:46:52 +01:00
yflory
35a49ac195
Improve the connection lost message with read-only
2017-02-02 11:33:05 +01:00
yflory
4bb02b9d4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 18:48:37 +01:00
yflory
89da142204
Fix pad creation from the context menu
2017-02-01 15:52:47 +01:00
ansuz
07f722fbd8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 15:47:58 +01:00
ansuz
1a061c22a0
more consistent styles and improved SEO
2017-02-01 15:47:50 +01:00
ansuz
3a9c1c782d
remove dead code from cryptpad.less
2017-02-01 15:21:59 +01:00
yflory
24f66b7e3f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-01 11:37:27 +01:00
yflory
5d499df39e
Load jQuery before bootstrap
2017-02-01 11:37:19 +01:00
ansuz
eb3c58939d
correct typo
2017-02-01 11:15:09 +01:00
yflory
599e00be21
Remove unused code
2017-01-31 18:19:34 +01:00
yflory
46b5b8766d
Dropdown button to make a pad from homepage
2017-01-31 18:16:35 +01:00
ansuz
d93086a92d
hitting enter in the password field should log you in
2017-01-31 17:29:32 +01:00
Caleb James DeLisle
5e4f2ffe6a
Shrink images, change text and 'make a pad right now' button
2017-01-31 15:00:01 +01:00
yflory
11fa4493d1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-31 14:36:47 +01:00
yflory
d76e0ae0d4
Update input colors in alertify
2017-01-31 14:36:33 +01:00
ansuz
5b802d6e84
replace mountain image with lock image
2017-01-31 14:23:09 +01:00
yflory
d926b69f8b
Improve the main page when javascript is disabled
2017-01-31 12:43:28 +01:00
yflory
2e247d44c7
Hide the backup icon when logged in
2017-01-31 10:59:23 +01:00
yflory
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
yflory
487650df78
Remove the remember me checkbox
2017-01-30 15:32:42 +01:00
yflory
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
yflory
29578a7400
Merge branch 'hpbs' into newtoolbar
2017-01-30 14:45:02 +01:00
yflory
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
yflory
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
yflory
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
yflory
8ccd845d52
Merge branch 'newtoolbar' into hpbs
2017-01-24 12:54:32 +01:00
yflory
ce1e792419
Merge branch 'soon' into newtoolbar
2017-01-24 12:54:07 +01:00
yflory
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
yflory
f5753cf594
Fix typo
2017-01-24 12:42:21 +01:00
yflory
141f8f776a
Fix the Noscript bug
2017-01-23 12:29:12 +01:00
yflory
fd78e4fa92
Improve homepage CSS and responsiveness
2017-01-20 18:21:51 +01:00
yflory
7d66d391fc
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:17:30 +01:00
yflory
3338000018
Add Esc and Arrow icons in the slide's present mode
2017-01-19 12:49:40 +01:00
yflory
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:14:14 +01:00
yflory
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:13:57 +01:00
yflory
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
2017-01-19 10:53:55 +01:00
yflory
9523782bf8
Make the home page responsive
2017-01-19 10:48:46 +01:00
yflory
69bee7d79a
Add data into the homepage
2017-01-18 18:02:32 +01:00
yflory
b9c4ceccd4
Change the CSS and colors
2017-01-18 13:51:11 +01:00
yflory
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
yflory
82e8041054
Use bootstrap 4 in the main page
2017-01-17 18:19:45 +01:00
yflory
73d424b506
Improve the login UI (css and translations)
2017-01-17 16:21:12 +01:00
yflory
e006ed7076
Ability to log in from the main page
2017-01-17 11:52:44 +01:00
yflory
6652e9d6d9
Test new home page
2017-01-16 18:29:34 +01:00
yflory
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
yflory
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
yflory
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
yflory
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
yflory
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
yflory
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
yflory
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
yflory
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
yflory
51a2cfa141
Fix missing FontAwesome icon
2017-01-12 11:09:12 +01:00
yflory
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
ansuz
9d0d8b27cf
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil
2017-01-11 07:59:54 +01:00
Gustavo H M Silva
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
yflory
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
yflory
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
yflory
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
ansuz
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
yflory
dba42a90c7
Fix the username button icon not aligned
2017-01-09 16:33:12 +01:00
yflory
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
yflory
0abec4ddb3
Fix error with placeholder translations in Safari
2017-01-09 11:50:45 +01:00
ansuz
4902aebe77
open home page table links in new tabs
2017-01-09 11:01:29 +01:00
yflory
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
yflory
6106f7d6ca
Make sure we never create the file store object twice
2017-01-06 14:14:13 +01:00
yflory
004d4a16fe
Fix error with placeholder translations in Safari
2017-01-06 13:52:30 +01:00
yflory
bf764d26e7
Merge branch 'staging' into workgroups
2017-01-06 11:17:17 +01:00
yflory
3836b20b08
enable the file store
2017-01-06 11:16:56 +01:00
ansuz
7868a65da9
apply style patches to the correct elements
2017-01-05 15:06:08 +01:00
ansuz
5c967ed09e
apply live fixes to the codebase
2017-01-05 14:45:31 +01:00
ansuz
bd6f2c037e
assign the cors iframe an id
2017-01-05 14:27:40 +01:00
ansuz
5a90d20cff
open pads in a new tab
2017-01-04 16:41:47 +01:00
ansuz
c380ecfcd9
add the slogan which was accidentally dropped
2017-01-04 16:35:32 +01:00
ansuz
05a956879a
prepare new poll app for release
...
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz
6c4e070c82
update information pages
2017-01-03 15:25:41 +01:00
ansuz
7b87213ec3
extract more constants into less variables
2017-01-03 12:19:07 +01:00
ansuz
27d5559b0c
define and use flags to enable the home page table
2017-01-03 12:17:17 +01:00
ansuz
4b1f9fd4f1
Revert "yank dead code"
...
This reverts commit aad442cb20
.
2017-01-03 11:49:44 +01:00
ansuz
aad442cb20
yank dead code
2017-01-02 16:03:50 +01:00
ansuz
f01c3725af
move minor links to the bottom of the home page
2016-12-30 15:56:24 +01:00
ansuz
9b650362b9
rebuild css
2016-12-30 15:33:59 +01:00
ansuz
d843caeb9a
remove bottom bar and move language selector to main html
2016-12-30 15:33:28 +01:00
ansuz
c6499d6789
make panel styles reusable
2016-12-30 15:30:35 +01:00
ansuz
773209472e
break monolithic style file into several modules
2016-12-30 15:29:45 +01:00
ansuz
0abf45bdc5
better fsStore debugging
2016-12-30 12:27:58 +01:00
ansuz
fefe444501
add new translation keys
2016-12-29 17:11:30 +01:00
ansuz
0c9178ba46
update slide styles, comment alertify styles, updated compiled css
2016-12-28 17:33:46 +01:00
ansuz
d7bdb30969
don't compile alertify.css directly
2016-12-28 17:20:29 +01:00
ansuz
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
ansuz
8b9d7f2357
update built html
2016-12-28 17:10:38 +01:00
ansuz
6a46d6e06c
update page layout and account for about page
2016-12-28 17:09:21 +01:00
ansuz
a5407e9222
rework templates and build system
2016-12-28 15:52:16 +01:00
ansuz
c9d99f101a
rewrite customize/readme.md
2016-12-28 15:33:59 +01:00
ansuz
13e8bf5b5e
remove old 'user' code
2016-12-28 15:33:40 +01:00
ansuz
f0a4c0ccb0
sheet.js is never used
2016-12-28 15:24:04 +01:00
ansuz
2be90e8858
remove Header.html
2016-12-28 15:18:39 +01:00
ansuz
0a89f13498
don't need /customize/pad.js anymore
2016-12-28 15:15:25 +01:00
ansuz
46024853ec
restrict cryptpad styles to descendants of .cp
2016-12-27 14:30:27 +01:00
ansuz
e9376a66c2
apply 'cp' class for unified styles
2016-12-27 14:29:20 +01:00
ansuz
5a4ec358b3
Merge branch 'soon' into staging
2016-12-27 13:36:23 +01:00
ansuz
71488e6651
add link to markdown tutorial
2016-12-27 13:36:02 +01:00
ansuz
bc49e143b8
give alertify popups their own bg var
2016-12-27 12:34:31 +01:00
ansuz
db12b5e896
move text for login page into translation file
2016-12-27 12:31:16 +01:00
ansuz
f9da200381
resolve merge conflicts in translations
2016-12-26 14:25:02 +01:00
ansuz
4476fd4006
s/readOnly/readonly
2016-12-22 18:15:18 +01:00
ansuz
25c8ea464b
Merge branch 'soon' into login
2016-12-22 17:22:42 +01:00
ansuz
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 17:20:30 +01:00
yflory
81259fc25f
Refresh unsorted and templates when files data changes
2016-12-22 17:20:05 +01:00
ansuz
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
ansuz
21360801de
change a few english keys
2016-12-22 16:54:17 +01:00
yflory
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
yflory
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
Pierre BONDOERFFER
3b10217fb0
fixed buttons breaking responsive layout
2016-12-22 04:54:28 +01:00
Pierre BONDOERFFER
f5e7a6f0c8
Fixed up Spanish translation 🇪🇸
2016-12-22 03:34:31 +01:00
Pierre BONDOERFFER
87582d41a9
Added alt tags to English translation
2016-12-22 03:34:12 +01:00
yflory
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
yflory
046220f239
Add info boxes for the different categories
2016-12-21 11:46:49 +01:00
yflory
e9418af88b
Add an info box in the file manager
2016-12-20 18:59:50 +01:00
ansuz
1f762ce55b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 17:27:59 +01:00
yflory
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
ansuz
820537f7e3
rebuild css
2016-12-20 16:54:53 +01:00
ansuz
4991bfab92
rebuild css
2016-12-20 16:54:36 +01:00
ansuz
280a6c462a
implement white image correctly
2016-12-20 16:42:14 +01:00
ansuz
5c46fa7c65
implement white image correctly
2016-12-20 16:41:05 +01:00
yflory
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
yflory
959983cc8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:31:06 +01:00
yflory
c7e63f63fd
Use the user object in file manager if it exists
2016-12-20 11:30:04 +01:00
ansuz
9dbe583f4b
Merge branch 'soon' into staging
2016-12-20 11:27:26 +01:00
ansuz
835c33113e
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into soon
2016-12-20 11:25:09 +01:00
ansuz
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:23:54 +01:00
ansuz
5a39caf95a
new messages for login
2016-12-20 11:16:49 +01:00
Gustavo H M Silva
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
yflory
e3f484d876
File manager in the home page, lint
2016-12-19 17:53:03 +01:00
gustavohmsilva
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
ansuz
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
ansuz
5de926493a
Merge branch 'soon' into login
2016-12-19 12:11:18 +01:00
Valentin Lorentz
df9f408823
Improve French translation of index.html
2016-12-19 11:51:21 +01:00
ansuz
e8f27ba7a0
Merge branch 'review-french-translation' of github.com:ProgVal/cryptpad into francais
2016-12-19 11:39:49 +01:00
ansuz
3dd5748f7f
integrate brazilian portuguese translation
2016-12-19 11:32:15 +01:00
ansuz
d6229e31a4
Merge branch 'master' of github.com:gustavohmsilva/cryptpad into merge-ptbr
2016-12-19 11:20:05 +01:00
mateon1
481f3a42f7
Apply corrections to the Polish translation
2016-12-16 23:18:00 +01:00
gustavohmsilva
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
gustavohmsilva
270fda6243
About 60% translated already to Brazilian Portuguese
...
lines 1 to 186
2016-12-16 16:10:58 -02:00
yflory
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
ansuz
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
ansuz
d09983ac92
s/kenntnisfreier/zero knowledge
2016-12-16 17:54:50 +01:00
ansuz
2ee2ffcfac
resolve conflicts in german PR
2016-12-16 17:38:53 +01:00