Pierre Bondoerffer
dc0a037894
turn login and register into infopages
2017-08-01 17:11:03 +02:00
Pierre Bondoerffer
549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
2017-08-01 14:35:50 +02:00
Pierre Bondoerffer
775ea81504
start register page
2017-08-01 14:35:45 +02:00
CatalinScr
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
CatalinScr
e609950977
Changed the favicon, added the boostrap js file, reconfigure the top menu
2017-08-01 15:20:29 +03:00
Caleb James DeLisle
27aa1886b1
Move footer to pages.js and add it to the contact page
2017-08-01 14:17:02 +02:00
Caleb James DeLisle
490e2b4d0a
work in progress on migrating styles back into the infopages.less
2017-08-01 13:49:42 +02:00
Caleb James DeLisle
cd2b41f51e
Fix up some less for supporting the info-pages
2017-08-01 11:53:06 +02:00
Caleb James DeLisle
896186d059
Fix some wrong less files which were breaking the UI of the apps
2017-08-01 11:19:32 +02:00
ansuz
4614d6ae81
remove legacy max-width from usage bar
2017-08-01 10:05:54 +02:00
CatalinScr
87dec4a091
Changed the font size
2017-07-31 19:24:07 +03:00
CatalinScr
5ef0325d90
this are css rules modified -- INSERT --
2017-07-31 19:14:15 +03:00
CatalinScr
5921073524
Updated the new font, changed the logo, changed see more
2017-07-31 19:13:45 +03:00
Pierre Bondoerffer
ba95931802
Use translation keys
2017-07-31 17:53:31 +02:00
ansuz
9a733cca0e
drop support for legacy iframe
2017-07-31 17:30:19 +02:00
Pierre Bondoerffer
f2a78ddfd9
New FR/ES keys
2017-07-31 16:55:09 +02:00
CatalinScr
6862bda454
Changed the logo, uploaded the new font, repaired responsive
2017-07-31 17:04:37 +03:00
ansuz
1ca00e7e01
resolve merge conflicts
2017-07-31 16:00:45 +02:00
ansuz
411c64df85
Merge branch 'master' into master
2017-07-31 15:49:54 +02:00
Pierre Bondoerffer
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
ansuz
777dea2014
Merge branch 'staging' into todo
2017-07-31 11:43:56 +02:00
ansuz
a458d7fa46
bump to latest version
2017-07-31 10:24:35 +02:00
Caleb James DeLisle
428bee6306
make links clickable and make more link work
2017-07-26 15:53:10 +02:00
ansuz
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:29:33 +02:00
yflory
459e0b3b16
CSS and bug fixes for todo
2017-07-26 13:30:39 +02:00
ansuz
a5b19b1cdd
add missing translations
2017-07-26 13:27:34 +02:00
yflory
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:07:41 +02:00
yflory
3da76e3ae8
Update style for the todo app
2017-07-26 13:07:35 +02:00
ansuz
8cfd8d3270
add translations for todo
2017-07-26 13:02:14 +02:00
CatalinScr
5fa20836cf
Modified Register and login button
2017-07-26 10:38:01 +03:00
CatalinScr
cab8716519
Changed the login button, repaired the hover menu and see more. Updated the logo
2017-07-25 01:08:53 +03:00
CatalinScr
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
Caleb James DeLisle
49c760131e
wip
2017-07-24 14:10:40 +02:00
Nicolas Lemoine
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
c4rl0sc
2e8e44933a
Fixed spelling error in Spanish translation
2017-07-23 14:31:12 +02:00
ansuz
dcf5719eaf
handle most of the boilerplate stuff
2017-07-23 14:27:47 +02:00
c4rl0sc
064e189495
Fixed spelling issues and improved translation quality.
2017-07-23 14:16:34 +02:00
Caleb James DeLisle
6a1ec54e2a
wip
2017-07-22 17:31:40 +02:00
Pierre Bondoerffer
dc9565f22f
make buttons colorful
2017-07-22 17:30:13 +02:00
Caleb James DeLisle
8404017af1
wip
2017-07-22 16:43:53 +02:00
ansuz
76e69f0ba8
Merge pull request #127 from gustavohmsilva/master
...
Merged translated and non-translated in pt-BR
2017-07-22 16:07:44 +02:00
ansuz
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
Gustavo H M Silva
6785f166fd
Merge branch 'master' into master
2017-07-22 09:18:12 -03:00
ansuz
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-22 14:15:15 +02:00
ansuz
55cb0734e2
make bad state timeout configurable
2017-07-22 10:56:39 +02:00
MacLemon
25cba8bba3
Translated missing out.presentSuccess to german
2017-07-20 20:08:30 +02:00
MacLemon
29bfcfa719
File size reduction and optimization of new image assets
2017-07-20 20:03:26 +02:00
yflory
a80b00a765
Move the file picker in common
2017-07-20 18:32:03 +02:00
yflory
9633025afe
CSS for the removeHistory button in contacts
2017-07-20 17:26:33 +02:00
ansuz
b22127f10c
add history removal
2017-07-20 15:55:04 +02:00
Caleb James DeLisle
ffb5e555a0
Merge branch 'staging' into front-page
2017-07-20 10:09:32 +02:00
yflory
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
yflory
82c87144cb
Remove the friend request button when the request is sent
2017-07-19 14:14:34 +02:00
yflory
1dc98dcff1
CSS for the contacts input field
2017-07-19 10:30:38 +02:00
yflory
26fa914982
Missing translation keys
2017-07-18 11:07:34 +02:00
Pierre Bondoerffer
a2c2e98060
Spanish update
2017-07-18 10:30:28 +02:00
yflory
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-18 10:24:00 +02:00
yflory
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
ansuz
5716f76c91
fix typo in translations
2017-07-18 10:04:02 +02:00
yflory
743b87b70f
Add initial text in /contacts
2017-07-17 18:51:23 +02:00
yflory
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
ansuz
0cd94e2ba8
add title to contacts app
2017-07-17 17:38:41 +02:00
ansuz
f2320190b8
change friends url to /contacts/
2017-07-17 17:18:28 +02:00
ansuz
06c971ec47
s/friend/contact/g
2017-07-17 15:52:13 +02:00
ansuz
2e0aa185cd
uppercase first letter of new translation keys
2017-07-17 14:12:05 +02:00
ansuz
6306de5265
set avatar border-radius to 4px
2017-07-17 13:43:51 +02:00
ansuz
33dcd2ae28
drop black border from avatars in userlist
2017-07-17 11:08:20 +02:00
ansuz
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
yflory
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
ansuz
7be1e249e1
add fa-share-alt to pad initialText
2017-07-13 15:48:03 +02:00
ansuz
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
ansuz
bf9c2b0b84
new messages
2017-07-13 12:29:49 +02:00
Caleb James DeLisle
f6abdc2b86
manual merge of staging
2017-07-13 10:30:42 +02:00
yflory
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
yflory
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
yflory
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
ansuz
3453e54357
bump footer and package.json for upcoming version
2017-07-12 10:49:05 +02:00
yflory
42075e4b5f
Make everything 16px and 32px
2017-07-11 15:34:46 +02:00
yflory
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
yflory
5d5f936682
Hide the upload table in code
2017-07-11 14:38:26 +02:00
yflory
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
yflory
112c4c85e5
Left menu in drive
2017-07-11 12:47:15 +02:00
yflory
59213a9c4e
Typo
2017-07-11 11:18:13 +02:00
yflory
560671ae7d
Make avatars circle
2017-07-10 18:46:26 +02:00
yflory
125018c8c3
New settings page
2017-07-10 18:29:23 +02:00
yflory
c02fa39524
Make drive search bar blue
2017-07-10 15:19:08 +02:00
yflory
0157e04b10
Fix overflowing content in the home page
2017-07-10 14:05:12 +02:00
yflory
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
yflory
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
yflory
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
yflory
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
yflory
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
ansuz
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
ansuz
086e5909dd
Merge branch 'soon' into staging
2017-07-10 10:43:41 +02:00
ansuz
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
ansuz
c60a71e210
add connect button and view profile button
2017-07-10 09:23:58 +02:00
ansuz
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
Ecaterina Moraru (Valica)
e8e8858e44
Issue #153 : On Register, add spacing between checkboxes and labels
2017-07-07 17:26:34 +03:00
Ecaterina Moraru (Valica)
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
yflory
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
ansuz
f02285d103
fix lowercased p
2017-07-06 10:49:33 +02:00
Pierre Bondoerffer
56ed1dd457
spanish update
2017-07-06 10:13:56 +02:00
ansuz
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
yflory
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
yflory
d7f9ddd8d2
Fix icon colors in the new menu (/pad app)
2017-07-04 15:57:34 +02:00
yflory
cc67838786
Fix horizontal scrollbar in /pad anonymous mode
2017-07-04 15:56:18 +02:00
ansuz
fa06f9d413
fix minor bugs in poll
2017-07-04 15:09:09 +02:00
ansuz
43d4597f38
merge to master
2017-07-04 14:19:08 +02:00
Caleb James DeLisle
25905d13fa
wip
2017-07-03 20:40:19 +02:00
yflory
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
yflory
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
yflory
1a27f11e73
Fix dropdown menus in static pages
2017-07-03 17:04:59 +02:00
yflory
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
yflory
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
yflory
1df5e6e855
Fix toolbar buttons for Safari
2017-07-03 14:32:54 +02:00
ansuz
bf414c15ee
fix logout button on home page
2017-07-03 12:26:08 +02:00
yflory
70c9f3df75
Fix avatar size
2017-07-03 12:13:37 +02:00
Caleb James DeLisle
fcff5fa009
wip
2017-07-02 16:51:21 +02:00
yflory
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
yflory
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
yflory
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 16:57:37 +02:00
yflory
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
ansuz
c2e153e8ed
more fouc fixes
2017-06-30 16:20:10 +02:00
ansuz
8ffad5ece6
FOUC fixes
2017-06-30 16:10:42 +02:00
yflory
b6944e6638
Fix userlist style in apps without iframe
2017-06-30 13:13:11 +02:00
yflory
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
yflory
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
Caleb James DeLisle
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
Caleb James DeLisle
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
yflory
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
ansuz
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
yflory
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
ansuz
0b9d7d6c0b
fix color of links in poll and whiteboard
2017-06-29 16:51:44 +02:00
yflory
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
ansuz
c53ebe3598
bring upload status container to the front
2017-06-28 16:33:00 +02:00
ansuz
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
ansuz
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +02:00
ansuz
bdca6b10c2
use templates in poll.js
2017-06-27 15:38:12 +02:00
ansuz
3a9b480e4e
resolve merge conflicts in template.js
2017-06-27 14:28:28 +02:00
yflory
40f4fc2682
Add the profile app in template.js
2017-06-27 14:27:54 +02:00
ansuz
9b6790534f
remove grey text from ckeditor initialState
2017-06-27 14:26:09 +02:00
ansuz
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
yflory
c431041e3f
Fix position of the rightside drawer with small screen
2017-06-26 15:53:29 +02:00
yflory
36ef4178dc
Remove the editable title from the file app
2017-06-26 15:16:17 +02:00
yflory
c364803406
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 11:25:06 +02:00
yflory
805e604e53
Add missing icons
2017-06-26 11:24:49 +02:00
ansuz
f181e8db60
correct parentheses
2017-06-26 10:45:27 +02:00
MacLemon
f4fdb7040c
Optimize image assets to speedup page loading
2017-06-25 20:14:23 +02:00
Gustavo H M Silva
6af4335ead
Translated up to page 317
...
Translated up to page 317
2017-06-23 14:28:00 -03:00
yflory
ce44a8d351
Fix the backup button in anonymous drive
2017-06-23 18:02:36 +02:00
yflory
06a0590f73
New folder icons
2017-06-23 17:58:41 +02:00
yflory
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
yflory
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 16:15:08 +02:00
yflory
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
ansuz
bd1db735dd
jshint compliance
2017-06-22 16:02:20 +02:00
ansuz
35bfa1dce4
test client-side templates in whiteboard app
2017-06-22 16:01:33 +02:00
yflory
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
yflory
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
yflory
dcfc59c2e2
Translation key updated
2017-06-22 11:21:37 +02:00
yflory
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
ansuz
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
ansuz
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
ansuz
3657e978fd
give main2.js a more sensible name
2017-06-22 11:06:11 +02:00
ansuz
e86ef209a8
define loading screen markup in js
2017-06-22 11:04:21 +02:00
ansuz
118b83c420
make register and login user clientside templates
2017-06-22 10:04:46 +02:00
Gogs
6dacbf2bd9
add translations and some improvements
2017-06-21 21:38:56 +02:00
yflory
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
ansuz
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
yflory
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
yflory
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
yflory
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
yflory
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
ansuz
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 18:09:57 +02:00
ansuz
b80d7513aa
skip over the terms of service link
2017-06-19 18:03:39 +02:00
yflory
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 17:59:18 +02:00
yflory
f5da7ae42e
Add a new loading tip in french
2017-06-19 17:59:12 +02:00
ansuz
e2ff88e4c4
tooltips for file upload
2017-06-19 17:56:19 +02:00
Pierre Bondoerffer
726302a9ee
Spanish update
2017-06-19 15:05:17 +02:00
ansuz
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +02:00
yflory
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
yflory
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
yflory
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
yflory
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
ansuz
9870169e03
remove a few elements from CKEditor config
2017-06-14 15:39:33 +02:00
yflory
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
yflory
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
ansuz
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
ansuz
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
XWiki SAS
0004be521c
change translation
2017-06-13 14:21:22 +02:00
XWiki SAS
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
yflory
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
Pierre Bondoerffer
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
yflory
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
Pierre Bondoerffer
621376b0fa
small fixes
2017-06-09 17:44:13 +02:00
Pierre Bondoerffer
cce665a18b
spanish updates
2017-06-09 17:42:25 +02:00
yflory
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
yflory
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
ansuz
2f851ab97e
fix lint errors
2017-06-07 10:13:51 +02:00
yflory
f1271bfd03
Missing file
2017-06-06 11:56:22 +02:00
yflory
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
yflory
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
yflory
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
yflory
85f1fb86d0
Add missing french translation keys
2017-06-06 10:28:00 +02:00
ansuz
f43132a63b
bump version in footer and package.json
2017-06-06 10:01:07 +02:00
ansuz
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
ansuz
8d4017b79e
fix parse error
2017-06-05 11:35:05 +02:00
jxtsai
b9b8352633
Traditional Chinese
2017-06-05 15:10:13 +08:00
ansuz
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
ansuz
d774f8771b
remove more unused files
2017-05-31 12:23:31 +02:00
ansuz
540304807c
remove unused files
2017-05-31 12:11:33 +02:00
ansuz
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +02:00
ansuz
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
ansuz
909bc2ebf3
add new translation key
2017-05-30 15:39:13 +02:00
Gustavo H M Silva
81b931e56f
Update messages.pt-br.js
2017-05-30 09:45:14 -03:00
ansuz
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
ansuz
75874424cf
add 'support cryptpad' translation key
2017-05-30 10:41:46 +02:00
Gustavo H M Silva
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
Gustavo H M Silva
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
ansuz
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
Pierre Bondoerffer
0a92719763
spanish! new keys ahoy
2017-05-29 18:25:18 +02:00
Pierre Bondoerffer
6518b56945
poll: french messages
2017-05-29 16:50:25 +02:00
ansuz
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
Pierre Bondoerffer
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +02:00
ansuz
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-29 11:33:03 +02:00
ansuz
6573813523
Merge branch 'soon' into staging
2017-05-29 11:32:54 +02:00
Caleb James DeLisle
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
Pierre Bondoerffer
1092285a68
merge master
2017-05-26 16:18:51 +02:00
Caleb James DeLisle
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
superniko
0559b8cb77
Update messages.ro.js
2017-05-26 16:47:45 +03:00
superniko
70fbbe0078
Update messages.ro.js
2017-05-25 10:23:27 +03:00
ansuz
bc26f7fc4e
Merge branch 'soon' into staging
2017-05-24 15:04:40 +02:00
Caleb James DeLisle
70c1061f47
Fix romanian translation
2017-05-24 14:49:00 +02:00
Caleb James DeLisle
83c0a6d37d
Romanian translation
2017-05-24 14:37:13 +02:00
yflory
b281d51d90
Fix typos in the french translation
2017-05-23 15:04:18 +02:00
yflory
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 14:50:42 +02:00
yflory
964d046154
Update a french translation key
2017-05-23 14:50:28 +02:00
ansuz
cf83cab596
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 12:35:54 +02:00
ansuz
0a646a9534
remove unnecessary space
2017-05-23 12:35:49 +02:00
yflory
6ddfe0e901
Fix new lines in /pad userlist
2017-05-23 12:14:31 +02:00
ansuz
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
yflory
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
ansuz
2ca6277660
enable pin limits by default
2017-05-22 16:50:32 +02:00
yflory
c45f08f147
Use a download button instead of downloading a file automatically
2017-05-22 11:43:45 +02:00
yflory
0c2f84058b
Improve css for the file app
2017-05-22 11:16:01 +02:00
yflory
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
yflory
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
ansuz
af4fd3c6d3
resolve merge conflicts
2017-05-19 19:14:08 +02:00
yflory
1ab6eb3c5d
Add a queue for multiple uploads in the file app
2017-05-19 18:41:34 +02:00
ansuz
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
ansuz
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
ansuz
e7a458295b
new translation keys for file upload
2017-05-19 09:10:36 +02:00
yflory
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
yflory
21f9e31e75
Add a placeholder for the user app
2017-05-18 15:56:35 +02:00
yflory
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
ansuz
3ba94a1ba2
correctly set release version number
2017-05-18 14:54:02 +02:00
yflory
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
yflory
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
ansuz
4debec39bb
update footer with next release codename and corrected matrix link
2017-05-18 12:58:49 +02:00
ansuz
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:33:34 +02:00
ansuz
81af9225fc
template a Romanian translation
2017-05-16 14:32:54 +02:00
ansuz
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
2017-05-16 14:23:06 +02:00
Pierre Bondoerffer
ad6217f064
file upload spanish keys
2017-05-16 14:05:36 +02:00
ansuz
827233dcba
new translation keys for file upload
2017-05-16 14:01:06 +02:00
yflory
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
yflory
716245f864
Make all the buttons look the same
2017-05-15 16:16:50 +02:00
yflory
0f37d9def7
Change the button font size in the toolbar
2017-05-15 14:53:51 +02:00
yflory
48496416e7
Use the same font-size for all the toolbar buttons
2017-05-15 14:46:17 +02:00
yflory
03274c3776
Display an info message in the anonymous drive
2017-05-15 13:54:03 +02:00
Pierre Bondoerffer
ad5e18f558
Spanish update
2017-05-15 12:05:50 +02:00
yflory
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
yflory
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
2017-05-11 10:58:33 +02:00
yflory
5a21be8112
Improve UI on mobile
2017-05-10 15:54:09 +02:00
yflory
ca6f910f0b
Add french translations for 'log out everywhere'
2017-05-09 10:32:41 +02:00
yflory
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
yflory
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
ansuz
6909f663b6
modify 'log out everywhere' text
2017-05-05 15:18:32 +02:00
ansuz
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
ansuz
c07d3e6162
update version strings for upcoming release
2017-05-05 11:51:41 +02:00
ansuz
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
ansuz
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
ansuz
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
yflory
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
yflory
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
ansuz
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
yflory
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
yflory
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
yflory
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
yflory
0ee228666b
Replace the IRC link by the Matrix one
2017-04-28 12:40:39 +02:00
yflory
ab1dc48b6d
Fix the 'limit reached' icon in the pad app
2017-04-28 12:32:49 +02:00
yflory
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
yflory
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
yflory
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
yflory
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
ansuz
e40203480f
Merge pull request #113 from pbondoer/staging
...
Update spanish
2017-04-24 16:09:53 +02:00
ansuz
a5ca461a73
update footer for new version
2017-04-24 15:41:29 +02:00
Pierre Bondoerffer
ba407322e8
Update spanish
2017-04-24 15:16:30 +02:00
yflory
3e28d1b966
Add a missing key in the french translation
2017-04-24 14:41:55 +02:00
yflory
9abfadb32f
Update french translation
2017-04-24 14:39:30 +02:00
ansuz
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
yflory
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
yflory
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
ansuz
df9c312b7d
make new text translateable
2017-04-18 18:31:58 +02:00
ansuz
8f352c8433
add justify plugin to default ckeditor config
2017-04-18 15:49:31 +02:00
Caleb James DeLisle
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
2017-04-18 12:14:32 +02:00
Pierre Bondoerffer
7a05462eb3
Some more poll changes <3
2017-04-14 19:34:58 +02:00
ansuz
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-14 18:44:20 +02:00
yflory
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
ansuz
eed5b1260d
set font-size label to match other ckeditor font sizes
2017-04-14 18:20:40 +02:00
Pierre Bondoerffer
0db603f580
spanish pinpad
2017-04-14 17:59:08 +02:00
ansuz
84dd879abb
add messages for settings page
2017-04-14 17:22:00 +02:00
ansuz
4c7022ade9
Merge pull request #109 from pbondoer/spanish
...
Espanol!
2017-04-13 18:10:35 +02:00
ansuz
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
2017-04-13 18:04:13 +02:00
Pierre Bondoerffer
65e848fd4d
linter linted the lints
2017-04-13 17:50:28 +02:00
Pierre Bondoerffer
40c06c4515
Spanish!
2017-04-13 17:42:38 +02:00
yflory
3e421c7289
Fix lint errors in ckeditor config
2017-04-13 17:09:35 +02:00
yflory
2ad0a65b71
Remove shortcuts that override browser actions
2017-04-13 16:43:07 +02:00
Pierre Bondoerffer
f11cf8e6ac
move poll styles to separate file
2017-04-13 14:14:12 +02:00
ansuz
cde9ea9887
update footer version
2017-04-10 18:09:22 +02:00
yflory
d5e69653c0
Select opacity in draw mode in the canvas app
2017-04-10 17:03:50 +02:00
yflory
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
yflory
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
yflory
63a130c678
Add a button to delete the selection in canvas
2017-04-10 11:55:39 +02:00
yflory
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
ansuz
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
yflory
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 14:54:13 +02:00
yflory
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
2017-04-07 14:54:02 +02:00
ansuz
2ecabbe6e3
add brown and pink to the palette
2017-04-06 19:05:06 +02:00
ansuz
6e1ffcc18d
define better color palette
2017-04-06 18:45:40 +02:00
yflory
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
ansuz
fe7f7f4e6d
Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging
2017-04-05 10:36:23 +02:00
Gustavo H M Silva
90612bc5ba
Update messages.pt-br.js
2017-04-03 18:43:30 -03:00
ansuz
5a85e4464c
fix poor visibility on green pencils
2017-03-30 18:05:08 +02:00
ansuz
7908f3b4f0
make sure green UI elements use the same green
2017-03-30 15:50:06 +02:00
ansuz
36b02d71f5
add ckeditor indentblock plugin.
...
closes #101
2017-03-30 10:55:22 +02:00
ansuz
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
ansuz
364dae2882
update templated html
2017-03-29 12:56:08 +02:00
ansuz
a3a0592e5e
add English and French keys for the whiteboard app
2017-03-29 11:54:46 +02:00
ansuz
6186953a12
make whiteboard a default app
2017-03-29 11:54:19 +02:00
ansuz
df7363f416
regenerate templated files for new footer
2017-03-28 11:50:42 +02:00
ansuz
b50b76bf81
remove unnecessary lines
2017-03-27 18:13:21 +02:00
yflory
d92a875ce5
Translate the 'wrong application' error message
2017-03-27 11:34:54 +02:00
ansuz
69edce5491
remove unused translation keys
2017-03-27 11:29:19 +02:00
yflory
53c60a31f6
Set the properties and backup inputs to read-only in the drive
2017-03-27 11:14:37 +02:00
yflory
ff60dd4399
Translate settings_publicSigningKey in french
2017-03-27 10:32:13 +02:00
ansuz
b176426213
increase default ckeditor font size to 16px
2017-03-24 14:55:29 +01:00
ansuz
3e9eb03e5a
display a user's public signing key in settings if it exists
2017-03-24 14:26:36 +01:00
ansuz
d1c32ea1f8
define english, french, and spanish labels for whiteboard app
2017-03-23 16:50:37 +01:00
ansuz
f301592a83
Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish
2017-03-20 18:08:08 +01:00
ansuz
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
ansuz
ef0e1d7aa0
add a non-breaking space to pad initialState
2017-03-20 18:05:07 +01:00
