7509ce1cc7
Use new application icons
6 years ago
4edb1c2e0d
Set the hash to the last clicked item in the FAQ
6 years ago
ce3fef7e1c
Fix avatar not centered in the toolbar
6 years ago
226e256024
Improve markdown table style #235
6 years ago
db25d914ab
Improve default UI for small or zoomed screens
6 years ago
d3dbd0c712
Move static pages content in their own file
6 years ago
9e491ca0ab
Update footer
6 years ago
3f1a34bf12
Remove XXX comment
6 years ago
35b0f878c7
Merge branch 'backupdrive' into staging
6 years ago
fc86e5daf8
French translation
6 years ago
250677a40a
Fix margin issues in pads
6 years ago
5a6c3597db
Fix missing cursor in empty pads with Chrome and fix page mode
6 years ago
623caa9273
Change fileformat of ckeditor-content.css
6 years ago
9f0398826d
Make customized translations more maintainable
6 years ago
7d0d8352bf
Add more info on the home page
6 years ago
8261ad86ae
Update translation
6 years ago
df0ac4091c
Redirect anonymous users to login when clicking on 'subscribe to premium'
6 years ago
2a86db2001
New Features page
6 years ago
67d1347bd8
bump version to 2.9.0 in footer and package.json
6 years ago
d78a00b5e1
Ese the correct document type in the text for the store corner popup
6 years ago
930677750c
Merge branch 'anonsf' into staging
6 years ago
62880e8cd9
Fix typo
6 years ago
0a83840c9c
View a shared folder with an unregistered user
6 years ago
ad4e36015b
Merge branch 'soon' into staging
6 years ago
b27285885e
oops, try again
6 years ago
13d511d037
fix broken link
6 years ago
673dc22159
Update messenger UI
6 years ago
82b805fea6
Merge branch 'soon'
6 years ago
43e194be7e
bump footer and package.json version
6 years ago
e3907f15d1
recover keys when logging in if necessary
6 years ago
a5cffe7eb2
abort sequenced actions whenever you callback
6 years ago
874156ccf0
Prevent shared folders from being moved to the trash using the del key
6 years ago
7a93927068
Fix UI issues with the new pad modals
6 years ago
179df27e3c
Fix autostore not displaying the error message when over pin limit
6 years ago
747c7ffdc3
Improve UI for contextual chat and add warning message
6 years ago
6c27d2964c
Disable friends chat in pad messenger
6 years ago
6257b23f16
Crowdfunding config
6 years ago
003b0f7571
French translation for the crowdfunding messages
6 years ago
716159d300
Add OpenCollective links
6 years ago
1b2f47c0c0
Try a new status indicator in messaging
6 years ago
1cd1542d19
Update messaging info displayed before entering a room
6 years ago
f79a70df65
Disable 'Import recent pads' by default on login
6 years ago
10823fc124
Add toolbar notification when the messenger is closed
6 years ago
82cca49aef
French translation for the messenger
6 years ago
c38eb6588e
Fix small issues with the messenger
6 years ago
64a1f888ac
Update messages.de.js
...
typo
6 years ago
19da04664a
other typo
6 years ago
26055e5e55
Messenger messages UI
6 years ago
826b217c55
Fix 1px error
6 years ago
3acf202830
Test UI
6 years ago
8f6d0b1c3a
Merge branch 'staging' into chat
6 years ago
9eb4e2e0dc
Reorder the chat rooms in the list based on the time of the last message
6 years ago
cdce69e677
Improve messenger UI in apps
6 years ago
45097dfe69
German strings for automatic pad storage settings
6 years ago
d49cccd740
Changed strings for automatic pad storage settings
6 years ago
9e27f111cb
lint compliance
6 years ago
e6743887fc
Refactor contacts/messenger so that it is usable directly in the apps
6 years ago
4a2fa77bb7
French translation
6 years ago
a203a67a53
update another translation
6 years ago
2b2995d2c0
update a few english translations
6 years ago
2bd02ca69e
bump version to 2.7.0
6 years ago
bf9cf95292
Merge branch 'staging' into oo2
6 years ago
ee1027ceb9
Ability to import mediatags to the drive
6 years ago
264f7dc6a1
Move base64 migration prompt to corner and only when the pad is stored
6 years ago
7b06626581
Merge branch 'autostore' into staging
6 years ago
90c96bfb70
Prompt users to migrate base64 images to mediatags in the pad app
6 years ago
b1f2d287b4
Add warning for chrome 68 users on Mac
6 years ago
d201e9a0cd
Disable some toolbar features not available if the pad is not stored
6 years ago
9ebb598467
Make automatic pad storage configurable
6 years ago
62817d09cb
Merge branch 'master' into staging
6 years ago
e8a5244362
Autostore base
6 years ago
294fa38137
Add blockbase64 plugin to ckeditor
6 years ago
fddff11fae
Rename shared drive to shared folder
6 years ago
9fe78dcc5f
bump version from 2.5.0 to 2.6.0
6 years ago
2259d1b6ac
Merge branch 'soon' into staging
6 years ago
8a113d742e
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
...
#169 : First anchor test and restore of the CKEditor anchor function.
6 years ago
6f1b269230
Update to latest translations version and more cleanup of Du/Dein. Paul
6 years ago
912a9d569c
Merge branch 'revised-german' into soon
6 years ago
f5172fd05f
Merge branch 'soon' into staging
6 years ago
24c7ce57e1
apply the fix for password change recommended by @sairim
6 years ago
365d17e275
Merge branch 'master' into revised-german
6 years ago
a65e083fca
Change PCS template icons
6 years ago
37f22550fe
Use the settings spinner in the loading screen
6 years ago
f2baaf5b5b
Fix shared folders issues including disappearing folders
7 years ago
8ab786e7df
Drive restore loading screen text
7 years ago
97142b2b32
add footer to homepage
7 years ago
1e092f36ba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ae17427e00
Shared Drive text & French translation
7 years ago
a181c09a68
Merge branch 'soon' into staging
7 years ago
58332a9ce3
add french translation for password change loading screen
7 years ago
e2600e4b36
display a loading screen while users are changing their passwords
7 years ago
36480cf746
New default app colors
7 years ago
2b1ed904f7
lesshint compliance
7 years ago
ebfa2c2dc3
Merge branch 'less-less' into staging
7 years ago
aafcb1bc02
Merge branch 'sharedfolder' into staging
7 years ago
a2e096b6f3
Unfortunately, optional parameters need to be optional in both .<filename>_vars() and .<filename>_main()
7 years ago
f1642fca89
Test before pushing :|
7 years ago
83ec00d948
Added fallbacks for avatar.less
7 years ago
3fe150f936
Fix UI issues in the PCS with IE
7 years ago
08005a709e
Add a share icon in the drive when displaying a shared folder
7 years ago
38a1e5e39f
Add fallback for browsers which do not support CSS variables
7 years ago
ee16b3ab15
modified english translations
7 years ago
9157403946
Update French translation
7 years ago
6143bceabb
Fix XXX
7 years ago
4bf741e959
fix typo in translations
7 years ago
a2fd32d6a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
32d84e8f36
initialize new registrations with a v2 hash
7 years ago
e6d4bced18
clean up extraneous variables and log statements
7 years ago
ecb9f039b1
Fix pad password change not reloading with the correct URL
7 years ago
8a18698c03
initialize newly registered users with a v2 drive hash
7 years ago
05a41ad7f1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7348eca1d5
revise english translations which have been marked for review
7 years ago
930bd32f70
lint compliance
7 years ago
3830935dd9
French translation
7 years ago
8e2ab0b74a
bump version strings
7 years ago
adc54434fd
update english translation as prompted by german translation PR
7 years ago
0d5ac05866
refactoring of the less infrastructure
7 years ago
a6d3dbf94f
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
7 years ago
4a352f2ed8
Use import (reference) whenever the less file supposedly emits no CSS
7 years ago
9b37d58f95
Total revision of german translation
...
Corrected lots of typos, grammar and incomprehensible (machine?) translation. Things can still be improved but at least most of the strangeness should be gone. I also added all strings from messages.js that were not included before.
Somebody needs to check that I did not mess up code/formatting.
7 years ago
1d8943e673
support deprecation of non-owned drives
7 years ago
54bc29f28c
WIP maybe I missed something
7 years ago
4b86ed2dec
Shared folders UI
7 years ago
0a9ea95796
always set userHash in localStorage even with modern users
7 years ago
16f276a18c
fix anon pad import
7 years ago
a15e232469
complete modern user registration/login. general cleanup
7 years ago
3d4b693722
use correctly scoped variable
7 years ago
57a39258c3
WIP big commit
7 years ago
57d0738f32
Merge branch 'modern-users' into staging
7 years ago
cfc81e8c96
allocate blockSeed as Uint8Array
7 years ago
7aa7b82c60
merge staging
7 years ago
c85a551546
Merge pull request #249 from xwiki-labs/de-translation-pl
...
Translating one extra line.
7 years ago
6d8693ff8c
Fix history mode UI
7 years ago
0160ef30b7
Fix pad password change
7 years ago
4e9baff0b6
bump version
7 years ago
01614c4256
verify old user password before proceeding to change passwords
7 years ago
85bcaa51f7
export a constant for the number of required bytes at login time
...
allocate bytes for blockSeed when changing passwords
7 years ago
5c87bcf94a
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
7 years ago
a146f6acc9
Change user account password function
7 years ago
89e64a7243
dispense bytes for block location
7 years ago
10c76c6d4b
Merge branch 'staging' into modern-users
7 years ago
fc35d06c83
Merge branch 'soon' into staging
7 years ago
184708f859
fix login from register page
7 years ago
6fde027a6c
add some TODOs
7 years ago
508521664f
use nthen to sequence async events
7 years ago
36d1ae0f6c
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
7 years ago
71b085ba23
Owned drive migration UI
7 years ago
c3741f847d
resolve conflicts from merge with staging
7 years ago
a5b207d57b
Password change UI
7 years ago
29f577dfc6
Improve history to load it chunk by chunk
7 years ago
577dea4c75
clientside implementation of block signing and encryption
7 years ago
b89b033175
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
54d63df1cf
Ability to change the password of a pad
7 years ago
e9e461c4d6
Repaired some responsive issues on about page, contact and features
7 years ago
ff25929c18
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
54b52d681c
fix broken share menu resulting from adblock plus triggered by 'share'
7 years ago
01a3c13a8c
Fix CSP issues for missing files (404)
7 years ago
4304079c70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f72e14b1b9
Add/fix translatons keys for the features "table"
7 years ago
06582e06dc
update markup in de translation
7 years ago
aa51463a9a
Merge branch 'soon' into staging
7 years ago
4701a7f415
Merge branch 'features-page' into staging
7 years ago
6e6020ef0d
rename and optimize images: thanks @MacLemon
7 years ago
eb49f53884
standardize indentation
7 years ago
8def11bea3
define style by class instead of structure
7 years ago
c803b70a1a
Fix translations
7 years ago
4dec2cca5c
Translations for new version detected
7 years ago
9e4fdb7e83
prefix classes with cp
7 years ago
5a549f75a6
increment version
7 years ago
756681211b
update home page icons, allow for customization
7 years ago
5ae7cdb1e6
add missing key for french translation
7 years ago
b0039e35d0
add missing translation key for kanban
7 years ago
2e15d59081
Fix typo
7 years ago
8586d0c944
Merge branch 'staging' into donkey
7 years ago
ba0e000808
Add a file upload modal
7 years ago
fe202a92b4
Fix UI issues in kanban
7 years ago
3af997db2b
Kanban translation
7 years ago
66655b4a23
Upload a file with a password
7 years ago
0e9bd156b1
Update footer
7 years ago
6bd5d698b5
Add kanban help
7 years ago
598960d960
Disable language selector in static pages
7 years ago
95218f0fa1
Remove use of space-evenly since it is not supported by all browsers
7 years ago
7800fa2dcd
Add confirm dialog when deleting a task in kanban + add colors
7 years ago
fe27c97879
Help + tooltips + fix colors in kanban
7 years ago
365b32d378
Fix home page header colors
7 years ago
dfd7e7ed9b
Fix moving UI when hovering a link in the static pages' header
7 years ago
ff17a0aad6
Add language selector in static pages' footer
7 years ago
5887ff1a6d
Fix typo
7 years ago
090d266d31
Translations for the about page
7 years ago
2170fcb9ad
Merge branch 'kanban' into staging
7 years ago
57f2e26d8a
Merge branch 'staging' into soon
7 years ago
534d5ae006
bump version
7 years ago
73183a69fd
Improve kanban UI
7 years ago
86be9abb62
Translations for kanban
7 years ago
b6ebc583ba
Add the kanban app to the list
7 years ago
037050d16f
Merge branch 'coati' into kanban
7 years ago
65a2083afc
Suggest tags based on existing ones. Display existing tags in the drive.
7 years ago
6fde15247b
Fix UI issues in the loading screen with the loading bar
7 years ago
96a71afbc9
Translating one extra line.
7 years ago
372f1dfeb4
First anchor test and restore of the CKEditor anchor function.
7 years ago
4d5606e757
Add missing file for password inputs
7 years ago
2d2701596a
Loading message and loading bar for migration
7 years ago
d6d53e4068
Bump drive version for new users
7 years ago
2b8e734cae
Add revealable password input to display or prompt the password
7 years ago
cfe8b67142
Fix overflowing words in tippy
7 years ago
cfcf791efc
Break long words in tooltips
7 years ago
10ce95087a
Merge branch 'password' into staging
7 years ago
09e549971b
repaired a small bug
7 years ago
3f071d87ea
Design for the pages Features, FAQ and Privacy
7 years ago
3eb199bca7
bump version to 2.0.0
7 years ago
123612b893
Merge branch 'de-translation-pl' into staging
7 years ago
8b13bd0be5
lint compliance and merge
7 years ago
de768869eb
add missing semicolons
7 years ago
eefa70ffa4
Fix typo in the french translation
7 years ago
009eb13fc3
Merge branch 'master' into staging
7 years ago
b21f42747d
Fix color and scroll issues in the PCS
7 years ago
389c197441
Fix color issue in file upload table
7 years ago
64c85fe548
Don't return channel in parsePadUrl
7 years ago
662f69eb0c
Usage of the informal form mainstreamed. paul
7 years ago
1879c1829c
Add passwod prompt to access protected pads
7 years ago
26124791a1
First stab at updating the German translation.
...
More proofreading and discussion is needed to polish it.
paul
7 years ago
a773c47950
Fix loading screen in login and register
7 years ago
9f5e5786f3
Merge branch 'pcs' into staging
7 years ago
e1d59db30d
Fonts issues on Windows
7 years ago
206ac14438
Prevent users from creating a pad when visiting a deleted profile (read-only mode)
7 years ago
caf86dd9b7
Improve static pages UI
7 years ago
5c2ee778ad
Initialize new users' drive to the latest version
7 years ago
c190a38a6b
Fix UI issues
7 years ago
e21e9b9d9f
Trigger change event when using keyboard shortcut on custom checkbox
7 years ago
24dfaf766d
View more templates
7 years ago
842952fe1f
New checkboxes and radio input everywhere
7 years ago
68c26f3164
Custom radio inputs
7 years ago
7870dc05ca
Fix notification timeout
7 years ago
54dd339826
Fix invisible selection in the pad creation modal
7 years ago
881c36214f
Lint compliance
7 years ago
e2b9cf1c40
Fix small UI issues with the new colortheme
7 years ago
52d6c9d468
New colortheme for alertify logs and modals
7 years ago
5ee5a93513
New tippy everywhere
7 years ago
9d57548f1d
New tooltips
7 years ago
a4674e40e1
fix bug in register page which locks up the registration form
7 years ago
4a23b57655
New loading screen
7 years ago
92fe555cb5
update footer and package.json
7 years ago
0dfae72f88
Lock the UI for unregistered users
7 years ago
cf22c58e39
Missing translations
7 years ago
ee8651c74e
Kanban styles and color updating
7 years ago
035a56fdab
Kanban application using the cryptpad framework
7 years ago
4b83f2991a
Kanban prototype on cryptpad
7 years ago
1a950319a1
Fix broken links
7 years ago
0c2987a6d1
Import template in existing pads
7 years ago
d4dfbddaa6
Add icons in the user menu
7 years ago
9e711e4cd4
Remove Bootstrap's JS in static pages
7 years ago
4288f536f1
Use requireCSS to load FontAwesome
7 years ago
a718603b36
Automatic account deletion
7 years ago
a794efe931
Merge branch 'staging' into oo
7 years ago
bc3fe4f32c
update version in footer and package.json
7 years ago
28d13186af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
44cd235f48
Fix CSS with Bootstrap 4
7 years ago
11b0781717
delete unused code
7 years ago
2704ee1ed7
Account deletion translations
7 years ago
8970bae647
Center pad type in the creation screen
7 years ago
4f2a91b82d
Pad creation screen UI improvements
7 years ago
ab8306f5d4
Merge branch 'soon' into staging
7 years ago
ebef99e5cf
Owned drive
7 years ago
03bcd2f00d
Lint compliance
7 years ago
3eec812aff
Merge branch 'staging' into creation
7 years ago
e977b14c1b
Update French translation
7 years ago
b1d5beca6f
Translations + UI for pad creation screen v2
7 years ago
e56d762409
Catch chainpad errors and display it in the UI
7 years ago
c9ed6d6bf8
New pad creation screen
7 years ago
7dc7d5d950
lint compliance
7 years ago
7944bc1a82
merge staging branch
7 years ago
7c99397e60
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
5f08ad2ea1
fix mangled 404 translation
7 years ago
643fcc4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
2f262b12c6
Fix help box issues
7 years ago
34d5c04eb4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7091dfb669
standardize naming for the drawer, and reorder poll description
7 years ago
442f15df98
Add help text in all the apps + french translation
7 years ago
82329dbe70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ec19b82609
add new help text
7 years ago
b1b9683141
Add links to FAQ and Privacy in static pages
7 years ago
2bcf28bb34
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
eac10321ba
Reduce toolbar height on mobiles
7 years ago
71f519f982
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4262c8e6e4
correct french grammar
7 years ago
c7e4db7f38
transcribe english faq
7 years ago
f45023ed1f
Remove connection lost popup when websocket connection is lost
7 years ago
6a7c86aee7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8cdad27ec4
French FAQ
7 years ago
1452d65bd4
fix missing section in privacy policy
7 years ago
3fcdbcdbc5
Faq questions
7 years ago
b0dba481d8
Fix small UI issues and IE issues
7 years ago
12bfcbe701
Add fixed order for rightside icons in the toolbar
7 years ago
2c90cb5907
Move help button in drawer and fix drawer style
7 years ago
753b7550ca
Save button in the pad creation screen
7 years ago
a4a6385e86
Add keyboard shortcuts for the Ctrl+E or Cmd+E modal
7 years ago
f0bc1cfe99
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
60b2384885
Move initial state into a help block
7 years ago
66d83dc045
update version
7 years ago
5c53868c3b
Delete pads after 3 months of inactivity
7 years ago
22f130d948
Remove lag when displaying loading screen in login and register
7 years ago
7cb3282634
New apps for text, slide and spreadsheet
7 years ago
831c23b259
Merge branch 'staging' into oo
7 years ago
5d584625e4
FAQ pages
7 years ago
5c1e5a3f49
Merge branch 'staging' into oo
7 years ago
299a2f4c08
FAQ placeholder
7 years ago
91437c558e
fix weird messages
7 years ago
11fabea327
update footer and package.json version
7 years ago
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
7 years ago
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
7 years ago
728a6a868d
Manage expired channels
7 years ago
223ed73ae1
French translation for the pad creation screen
7 years ago
0b022af5db
Fix style issues in IE and mobiles
7 years ago
ea7a3c75fa
Fix hidden content in the pad creation screen with smaller screen or zoom
7 years ago
81ea3b14d7
Fix usage bar position in the settings app
7 years ago
f18917f0ac
Fix race condition at registration
7 years ago
b5bb83b700
lint compliance
7 years ago
c210f097c0
Refactor login part two
7 years ago
ff151869de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7ebfa43408
Improve assert translations to detect issues in objects (tips, type, etc.)
7 years ago
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
7 years ago
a0ff3370a2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
218b1fb328
set messages.el.js to non-executable
7 years ago
a1f05e4bf1
update pad creation screen text
7 years ago
5bba9b6c39
Refactor login to remove duplicate code
7 years ago
4df4c48fbd
Improve UI for pad creation screen
7 years ago
a281869bba
make things actually work
7 years ago
0672c2f41a
implement a running diff
7 years ago
f6926699bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ad2cde4705
Add warning about anonymous drive in localStorage
7 years ago
e80e8339c2
Typo in translation
7 years ago
de838a3184
fix usage bar styles
7 years ago
8294686f80
Fix assert translations for deprecated keys
7 years ago
8a1c04ff58
Missing french translation keys
7 years ago
bdafc101c9
Ability to remove owned channels from the drive
7 years ago
a1d9f44bbd
Delete owned pads from server when removed from the owner's drive
7 years ago
5089f1206d
Pad creation screen translations and link to settings
7 years ago
462c229b17
Add links to features table
7 years ago
86144eda22
Display a message about pads deleted from the server
7 years ago
4d0312115a
Add a link to the account server for subscribers in settings
7 years ago
5827905dbd
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
7 years ago
166a9e71cf
Add a features comparison page
7 years ago
2995782079
Different colors for ok and cancel in alertify
7 years ago
8628f2831e
Fix 404 page inside iframe
7 years ago
30c6ab4717
Add meta description tag
7 years ago
c90ba890ca
Add more configurable options and add a new way to use custom config
7 years ago
02dbe9e458
enforce maxUploadSize
7 years ago
fc8847dae4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
04b862352f
update style for usage bar
7 years ago
08ae327386
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c5ebbe1a56
New share menu
7 years ago
4f42e8a282
bump to version 1.25.0
7 years ago
3858aa976a
better warning in case of errors in /file/
7 years ago
4fc1079d67
translate some stuff
7 years ago
f3d8fd3590
Ability to import local pads on login
7 years ago
a5b75e0164
Fix default config for anynymous drive
7 years ago
8ced81d8d7
lint compliance
7 years ago
b630fb95e2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a018b7db9e
only show availablePadTypes on the home page
7 years ago
dffa117f4d
lint compliance
7 years ago
d59bc4612d
Ability to disable the drive for anonymous users
7 years ago
db0d2e161c
Hide pad creation screen features if it is disabled in app config
7 years ago
daef08a9b3
Add an advanced new pad modal
7 years ago
c460e2820e
Fix a 1px offset for the userlist in Firefox/Windows
7 years ago
bd9c44dbb2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ef480fea79
Add a settings category for the pad creation screen
7 years ago
5346afe51f
step towards customizable login functionality
7 years ago
ae2517fcc6
remove dead code from home page
7 years ago
8c9490868b
improve owned pads management in the drive
7 years ago
73126ed597
Display the owner and expiration time of a pad in the properties modal
7 years ago
65ccfe39ef
Add a 'properties' button in pads to display pad data
7 years ago
e06cb29c4f
bump version
7 years ago
0cea5f4596
Create an owned pad and view owned pads in the drive
7 years ago
1ec41f4e09
Ability to pick a background image in slides
7 years ago
65e66dea08
resolve bad merge
7 years ago
e3c7e96d71
Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek
7 years ago
e460d9c36c
bump version
7 years ago
f329d65bc8
Ability to reduce the width of ckeditor
7 years ago
7f3a08f0c2
Greek translation
7 years ago
888739e333
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fa6106a6bb
Use CSS to remove the loading screen
7 years ago
c0b5dc7536
make loading screen tip presence configurable
7 years ago
158ef58c6c
Enable print plugin in ckeditor
7 years ago
c448c9035e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
127f30df72
bump CryptPad version
7 years ago
e48f143842
Allow numbers in _getKey parameters
7 years ago
d666e9e7ee
Remove tag and filepicker buttons for anon users
7 years ago
b06b2dbafc
less lint compliance
7 years ago
b1f1aa2340
Disable pad creation screen
7 years ago
34315b4500
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c269929319
Fix creation page not displayed in pad and slide
7 years ago
16388a839c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
230f9524be
new less linter rules and compliance
7 years ago
4e46d0daa5
Fix the 'New' button icon in the toolbar
7 years ago
dcfccf88cd
Merge branch 'creationpage' into staging
7 years ago
1922dbfd75
Creation page with mobile support
7 years ago
024aa741a7
Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
7 years ago
1d2119b292
Removed LESS duplicate attributes
7 years ago
bfba239770
Fixed missing semicolons in less
7 years ago
9af941741d
Fix trailing whitespace and empty selectors in less
7 years ago
dd44b4da99
Removed old /less/ directory which is nolonger used :)
7 years ago
12b0f3e201
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
7 years ago
617c4b6044
CSS refactorings and pad-is-not-pinned work
7 years ago
e96d54e655
Add a pad creation page
7 years ago
67f8031beb
Wrong usage of colortheme.less, fixed
7 years ago
64303b4090
Merge branch 'refactor' into staging
7 years ago
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1dabea84d9
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
7 years ago
c702a23c77
Initial work on the 'pad will expire' logic
7 years ago
087eee55f6
update 404 page
7 years ago
f95669a27a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fc4fea9c54
update 404 messages and show actual text faster
7 years ago
f52d987515
Ability to resize avatars before uploading them
7 years ago
e164edec03
Fix the webworker app
7 years ago
04e02871bc
Merge branch 'refactor2' into staging
7 years ago
4903bd0757
Enable messenger in async store
7 years ago
5acbaef28f
tweak animation parameters for faster 'decryption'
7 years ago
c80c97d7db
lint compliance
7 years ago
bcdc0d810a
make 404 page translateable, point to home page or drive
7 years ago
443eeaa407
fancy 404 page
7 years ago
acd8ab7446
Add the markdown toolbar in profile
7 years ago
74e59a513a
Add the markdown toolbar to the slide and poll apps
7 years ago
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
9795ac32cb
Ability to burn an anonymous drive from the browser
7 years ago
280a7c2765
Clean cryptpad-common
7 years ago
cdd8c6e110
Fix history mode not centered
7 years ago
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
06011065d2
Add a debug app
7 years ago
60c4973d62
resolve merge conflicts
7 years ago
477f14bb8b
Put constants in a separate file
7 years ago
8150abddbe
remove dead code from pages.js
7 years ago
4ffb59dce9
bump to version 1.21.0
7 years ago
e8e90905e4
Fix assert translations
7 years ago
78e972201a
bump CryptPad version
7 years ago
ce3600b026
Update translation keys
7 years ago
cf26c4c286
Improve the toolbar UI for smaller screens
7 years ago
af8aa25228
Add an option to never rename a file during the session
7 years ago
25d3d321da
Ability to rename a file before uploading it to the server
7 years ago
1f53304ad3
Display a dropdown menu inside another one
7 years ago
014e12b5b5
Ability to update the username from the userlist
7 years ago
9184dd0ce6
Merge branch 'refactor2' into staging
7 years ago
5a2afb5c95
Remove Realtime and Messaging from common
7 years ago
af1ea4fd96
Fix typo in the French translation
7 years ago
c9e1de042c
Remove common-interface dependency from cryptpad-common
7 years ago
dc207393fd
Separate UI elements from cryptpad-common
7 years ago
354c63bd64
Clean old code
7 years ago
101482b8cc
Migrate settings to use a sandboxed iframe
7 years ago
2ff66e1a7c
Update french translation
7 years ago
2c9df23849
update english text for removing from trash in the drive
7 years ago
d10f752457
s/delete/move to trash
7 years ago
402fae442d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c5f6491c37
bump footer and package.json to latest version
7 years ago
2a3a5c4342
Ability to disable thumbnails
7 years ago
1871749b6f
Fix -1 viewer in the userlist when disconnected
7 years ago
cf3024ef5b
Ability to display an error in the toolbar state
7 years ago
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
7 years ago
7f9b21405b
Add missing files for profile
7 years ago
4250688856
Migrate profile to use sframe
7 years ago
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
68accaf653
Todo in sframe with less2
7 years ago
735f0a7e30
Merge branch 'theming-improvement' into staging
7 years ago
83da9cf752
Moved colours to colortheme.less to enable theming
7 years ago
6f020b67ca
Add thumbnails to framework apps
7 years ago
69f9a7ebf3
make userlist change notifications configurable
7 years ago
204f3e1441
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
74985fd0f2
Use text for the addUser button in polls
7 years ago
7d1892546b
add missing french translation
7 years ago
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
aaef30f489
bump cryptpad version
7 years ago
ce5d24a1d3
Remove error message about Tether
7 years ago
d571f408d8
Merge pull request #185 from MacLemon/reduce-image-asset-size
...
Compressed images for faster connections
7 years ago
3e4faf1be1
Add new state messages in the toolbar
7 years ago
63dcfd6d18
Update French translation
7 years ago
a149152f11
Merge branch 'staging' into framework
7 years ago
e553351b79
Put the add friend button in the userlist below the name
7 years ago
6920129126
Embed images from the drive in whiteboard
7 years ago
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.
7 years ago
2fd120100a
Merge branch 'wb' into staging
7 years ago
15337603bb
Merge branch 'staging' into framework
7 years ago
753e2d797e
Merge branch 'staging' into framework
7 years ago
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
50090a3af6
Add placeholders for the comment form in poll
7 years ago
ecb537ac7f
Move code to render.js in poll
7 years ago
c985aa60aa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f4189f883e
Add missing french translation keys
7 years ago
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
7 years ago
d046b9ce33
add missing French key
7 years ago
f0bdc3b26f
second try
7 years ago
d50a692986
add note about tags to prompt
7 years ago
21f1a48380
changed the login in button
7 years ago
d3d6940b69
Update french translation for tags
7 years ago
3f181fa370
update loading screen tip for tags
7 years ago
f751554f82
update footer and package.json for upcoming version
7 years ago
dd141b5c9f
Disable comments when a poll is not published
7 years ago
5e7bf0cfb8
Embed an image in whiteboard
7 years ago
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
1c4f1c785d
Improve stability and UI in poll and its comments
7 years ago
080511efcd
add missing translation for hashtags
7 years ago
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
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.
7 years ago
26dfc65c25
Comments in polls
7 years ago
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
7 years ago
68bda92291
Use codemirror for description in poll
7 years ago
e2f53eaddb
add loading screen tip about hashtags
7 years ago
b8ce149db6
add hint about tag usage
7 years ago
5cf86bf74a
Update UI in poll and remove old code
7 years ago
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
7 years ago
351b95d6a9
resolve merge conflicts
7 years ago
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/
7 years ago
66da349ee4
Sandboxed Poll app with less2
7 years ago
e02a779c14
Use secure drive as default drive
7 years ago
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
767027b237
Lint
7 years ago
0df9e5ace0
Fix toolbar in polls
7 years ago
b3e066eaca
show loading screen tips during loading screen
7 years ago
cdeac00633
Merge branch 'staging' into newdrive
7 years ago
1d7683503f
Fix link origin in sframe upload table
7 years ago
92c808812a
Fix missing style in toolbar/less2
7 years ago
c364377d7c
Use less2 in sframe drive
7 years ago
dfdeb7b113
Fix style and race condition for history mode
7 years ago
a810d7bd85
Fix style and race condition for history mode
7 years ago
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
95302366d1
lint compliance
7 years ago
53b98c12c9
ignore broken stylesheet
7 years ago
95542bcdaf
Lint
7 years ago
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8a09e39f46
Enable tags in pads
7 years ago
d2b27f3588
resolve merge conflicts
7 years ago
f127240a2f
add poll to main.less
7 years ago
6683434c62
Fix wrong relative url
7 years ago
35a313d6ee
Make palette realtime
7 years ago
3023e8c855
Fix templates in whiteboard
7 years ago
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
f9d27d2783
WIP secure contacts
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
c00d295466
Add missing translations
7 years ago
974658453c
Mediatag integration in pads
7 years ago
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e0ae0fcd91
thanks Dima!
7 years ago
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ab64bf9e59
Use less2 for the loading screen
7 years ago
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
244e3ecba7
support forefront flag in alert config
7 years ago
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
ad591fba50
bump version
7 years ago
8c3e2dbe61
Missing french translation keys
7 years ago
306fec2d0e
improve messages for template picker confirm
7 years ago
37dca9c155
Add missing translation keys in french
7 years ago
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
59d25b4c1a
use camel case, not snek case
7 years ago
5cde3fffb8
Align title for normal, readonly and page mode in the toolbar
7 years ago
7582c9cffd
Fix register button in the index dropdown menu for mobiles
7 years ago
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
fc069dac48
Ask the user before loading the template picker
7 years ago
f2aaaa9751
Move slide to secure iframe
7 years ago
809b56625d
refactor ui elements
7 years ago
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
ef30b0bc42
contribute to z-index arms race
7 years ago
a6eb1444df
add loading screen markup to register and login
7 years ago
352d504944
avoid loading unnecessary files
7 years ago
263c2eb2c2
fix overflowing title text
7 years ago
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
15e24ebe4f
ui for hashtag picker
7 years ago
fe8b2c2556
Fix french translation
7 years ago
8f2776657b
Add translations for pad embed
7 years ago
3ca9f41290
Get embed code for pad and code
7 years ago
d22edc03b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
5c9ce0caa5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
77bbb3add4
bump footer and package.json version string
7 years ago
01881ac469
Update loading tips in the french translation
7 years ago
729c013af7
Get mediatag embed code from the file app
7 years ago
5eb13461c0
remove anchor button
7 years ago
204e45dfae
Enable templates in pad
7 years ago
78b338c379
Merge branch 'code2' into staging
7 years ago
d2787e3eff
Make code2 the default code app
7 years ago
86e23ac19f
Use less2 in secure iframes
7 years ago
7b27b8635d
fix padding on registration button
7 years ago
6bb29e52e2
lint compliance
7 years ago
0ceb4cbbcb
Updated the contact page with the new design
7 years ago
83be769bb3
Merge branch 'master' into staging
...
updated with new version
7 years ago
1bf77cb77e
changed the icons
7 years ago
ee325c1813
Repaired the errors from lint
7 years ago
f95f3f4f24
Updated the contact page
7 years ago
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
d3e947f17e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7498057c89
Fix Safari iframe size
7 years ago
a2ed266048
Move the code app in a secure iframe
7 years ago
a34d1793e0
drop 'loading' text from loading screen
7 years ago
2ef4ebc6ef
two new tips for the loading screen
7 years ago
570ff75a6c
update footer for latest version
7 years ago
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
54eefd3d94
replace contacts with contacts2
7 years ago
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
f9cdbe66a0
add forgotten translation string
7 years ago
35e7341f4d
Merge branch 'ui-integration' into staging2
7 years ago
7bbea28831
minor anti-xss changes...
7 years ago
2ad9fcee17
Manual merge of notify.js
7 years ago
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
89a13d4b21
work on contacts2 until feature parity is reached
7 years ago
d9f5e3638e
Big caching improvements :D
7 years ago
1752124071
Fix Iframe height in Edge
7 years ago
b081603455
Update requirejs
7 years ago
49f7e0d63b
Changed the Social Media links to Pierre
7 years ago
48fe3ef841
add a tip about cryptdrive
7 years ago
839c6df3bb
remove invalid loading screen tips. create a new one
7 years ago
0a813b4fab
Fix limit bar overflowing when over the limit
7 years ago
744fb407ae
Updated the what is page
7 years ago
46e47b454d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f7b2aa85b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
3df20760c4
Yann does not have a twitter account.
7 years ago
df8851a53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
df0b7155f6
Add missing french translation
7 years ago
127b6dbc6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8b5519ad29
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
2b7dcbe77c
remove bs class that caused poor alignment sometimes
7 years ago
4213d6de70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d6125d864c
Added Yann's bio
7 years ago
a39f802b4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e4d842ed08
Fix typos in the french translation
7 years ago
7537caf8fe
make footer translateable
7 years ago
8ee5e14a60
merge ui-integration
7 years ago
fd3fd945c8
Updated the Log in Page
7 years ago
1f4d0a0a56
Repaired a bug
7 years ago
dd48cf7c90
updated the register page
7 years ago
3196d4558f
repaired the responsive error at about page
7 years ago
3960cd25f8
Updated the about page with the new design
7 years ago
7c8df61f91
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
7 years ago
196ce3b3f7
Fix alertify style which made the registration popup look bad
7 years ago
f580d9a30a
*actually* fix alertify on mobile
7 years ago
8c0fe7d277
Add missing UI element translations
7 years ago
144f9f4c83
alertify fix on mobile
7 years ago
9833bd7e59
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
89a8e8050c
Fix typo and also change message to explain itself better
7 years ago
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
328107be4d
translation key for using tabs
7 years ago
b00d37d9e7
proper namespace for font
7 years ago
0f74dffc48
fix register button being cut off
7 years ago
92d3b1a9fc
actually pull in open-sans, move fonts to own include
7 years ago
958294f109
put code settings in their own tab
7 years ago
ae0b2ca1a8
add label for code indentation
7 years ago
7f2b7fc287
show Your CryptDrive, if logged in. fix typos
7 years ago
ef256e3849
go to homepage when on infopages
7 years ago
04b84538e1
add Open Sans font (with bower)
7 years ago
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
baf64114a6
point to homepage in drive
7 years ago
1043e076a4
Merge branch 'ui-integration' into staging
7 years ago
41c2f9bd83
Changed the footer, a modified the about page
7 years ago
edad5deeac
fix logo not showing sometimes in chrome
7 years ago
c036bb26be
use proper bootstrap class
7 years ago
b34e252eda
improve whiteboard styles
7 years ago
8b2cb37c2f
improve poll looks
7 years ago
280c10c57d
alertify: use the right box-shadow
7 years ago
82352b422f
unhide show help button
7 years ago
ec011b15d5
remove duplicate css property
7 years ago
34ba673cd3
improve file upload UI
7 years ago
ca686f9c92
(hopefully) fix newline in lists when pasting links
7 years ago
6ca6755d02
more missing titles in toolbar
7 years ago
2cc6c636db
Add some missing titles
7 years ago
355b7f1839
change recent to local pads
7 years ago
90075cd48e
media-tag to less file
7 years ago
88be5444f0
change alertify warn color
7 years ago
c53e738054
improve file picker ui
7 years ago
996c56c242
fix label in register
7 years ago
008fa12755
alertify: add textarea + checkbox
7 years ago
e486e47aa1
alertify: fix input color + better log styles
7 years ago
e333e7903d
fix styles overlapping
7 years ago
1db41dd17b
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
dac14de18c
unify fonts
7 years ago
5afadf10aa
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
3f6b234e97
Styled the general menu, footer, updated about
7 years ago
a16d4be3c4
show logged in user
7 years ago
8a56adfe53
make logos same size, compress
7 years ago
d3fb6313b6
color logo on topbar
7 years ago
865ba0731c
better colors? not sure yet...
7 years ago
1bd42f0b3e
make alertify darker
7 years ago
0f7124d673
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
ecc766eb7b
remove useless margin
7 years ago
a6547d1ed0
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
7310960f46
remove the hack around the hack to fix the hack
7 years ago
95c7cd3fcc
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
addd91cc72
fix styles (again) copyright cjd 2017
7 years ago
930ba8aec6
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
5c21a9048e
fix styles
7 years ago
b26c62714f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
c953e71a18
better class generation and remove duplicate class
7 years ago
4d563af045
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
10e50fc5c7
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
6614f3f0e6
put the page class on html element
7 years ago
96b12d55fb
add a return
7 years ago
b79adf4177
redirect to drive if logged in
7 years ago
a10214ed2a
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
75c0876500
Added ludovic's bio
7 years ago
043ae4280b
repaired the menu
7 years ago
250d85bb8a
Repaired the menu, clead the code
7 years ago
e2ad99ab3c
change favicon (again)
7 years ago
8831f4f91b
new favicons
7 years ago
a70c527482
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
7 years ago
4018c7e0a6
move alertify stuff
7 years ago
c274a27dfb
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
7 years ago
0d1f19f5d4
Big manual merge
7 years ago
e7d09c1ddb
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
...
changed the menu
7 years ago
d4ce7d626c
Modified the menu
7 years ago
f8c7140eec
make fonts big
7 years ago
f6d45d05f6
use logo in toolbar
7 years ago
1b83e15796
sorry jpg, i forgot you existed
7 years ago
5ce7d64b2c
add pierre photo
7 years ago
1b466d250f
Add some photos
7 years ago
5d70dd93b3
Manual merge
7 years ago
15fa801bc8
work in progress
7 years ago
bc15ce7de5
Manual merge
7 years ago
52e9ba92fa
Update whitepaper link and also change whatis_zeroknowledge
7 years ago
89ab82c0e2
Changed the menu, added the logo on top bar
7 years ago
ae176b0465
about page mockup
7 years ago
cdf6345fc1
use sign up
7 years ago
ddc9c4d070
alt favicon pink
7 years ago
35867001cb
add missing messages
7 years ago
86bc14e6bb
new loading screen
7 years ago
304a29e210
Improve contact page
7 years ago
d6679e8ef3
Add screenshots to What is CryptPad
7 years ago
b3f3f1dabb
Add What is CryptPad keys
7 years ago
e2f8c9c5da
add logo to topbar
7 years ago
8a56029bfe
remove useless images
7 years ago
ea3a8932be
put the content in the right place
7 years ago
262a729ef7
use proper key name
7 years ago
db111257f0
Add translations, remove useless functions
7 years ago
de23195bd8
fix wrong css class
7 years ago
ad4aca4e5f
actually do the changes intended in previous commit
7 years ago
01b2883771
Add headers and footers, generate what-is-cryptpad
7 years ago
cd0c9cc95a
create less templates for info pages
7 years ago
f71b082aac
remove min-height globally, style footer
7 years ago
0fe49d6641
oops, sorry, back to 100% height
7 years ago
dc0a037894
turn login and register into infopages
7 years ago
549b1b2c4f
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
7 years ago
775ea81504
start register page
7 years ago
69c470330f
updated the favicons, changed the menu
...
PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,
7 years ago
e609950977
Changed the favicon, added the boostrap js file, reconfigure the top menu
7 years ago
27aa1886b1
Move footer to pages.js and add it to the contact page
7 years ago
490e2b4d0a
work in progress on migrating styles back into the infopages.less
7 years ago
cd2b41f51e
Fix up some less for supporting the info-pages
7 years ago
896186d059
Fix some wrong less files which were breaking the UI of the apps
7 years ago
4614d6ae81
remove legacy max-width from usage bar
7 years ago
87dec4a091
Changed the font size
7 years ago
5ef0325d90
this are css rules modified -- INSERT --
7 years ago
5921073524
Updated the new font, changed the logo, changed see more
7 years ago
ba95931802
Use translation keys
7 years ago
9a733cca0e
drop support for legacy iframe
7 years ago
f2a78ddfd9
New FR/ES keys
7 years ago
6862bda454
Changed the logo, uploaded the new font, repaired responsive
7 years ago
1ca00e7e01
resolve merge conflicts
7 years ago
411c64df85
Merge branch 'master' into master
7 years ago
93e007b52a
reduce png sizes
7 years ago
777dea2014
Merge branch 'staging' into todo
7 years ago
a458d7fa46
bump to latest version
7 years ago
428bee6306
make links clickable and make more link work
8 years ago
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
459e0b3b16
CSS and bug fixes for todo
8 years ago
a5b19b1cdd
add missing translations
8 years ago
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
3da76e3ae8
Update style for the todo app
8 years ago
8cfd8d3270
add translations for todo
8 years ago
5fa20836cf
Modified Register and login button
8 years ago
cab8716519
Changed the login button, repaired the hover menu and see more. Updated the logo
8 years ago
796bf89491
Update of the front-page
8 years ago
49c760131e
wip
8 years ago
658b00814b
TodoApp - Style and translations
8 years ago
2e8e44933a
Fixed spelling error in Spanish translation
8 years ago
dcf5719eaf
handle most of the boilerplate stuff
8 years ago
064e189495
Fixed spelling issues and improved translation quality.
8 years ago
6a1ec54e2a
wip
8 years ago
dc9565f22f
make buttons colorful
8 years ago
8404017af1
wip
8 years ago
76e69f0ba8
Merge pull request #127 from gustavohmsilva/master
...
Merged translated and non-translated in pt-BR
8 years ago
52fa77e961
Merge pull request #157 from MacLemon/reduce-image-asset-size
...
File size reduction and optimization of new image assets
8 years ago
6785f166fd
Merge branch 'master' into master
8 years ago
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
55cb0734e2
make bad state timeout configurable
8 years ago
25cba8bba3
Translated missing out.presentSuccess to german
8 years ago
29bfcfa719
File size reduction and optimization of new image assets
8 years ago
a80b00a765
Move the file picker in common
8 years ago
9633025afe
CSS for the removeHistory button in contacts
8 years ago
b22127f10c
add history removal
8 years ago
ffb5e555a0
Merge branch 'staging' into front-page
8 years ago
c33d2a2db0
New tooltips
8 years ago
82c87144cb
Remove the friend request button when the request is sent
8 years ago
1dc98dcff1
CSS for the contacts input field
8 years ago
26fa914982
Missing translation keys
8 years ago
a2c2e98060
Spanish update
8 years ago
6aab1c94b2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
baf439648e
Add the contacts app in the dropdown menu
8 years ago
5716f76c91
fix typo in translations
8 years ago
743b87b70f
Add initial text in /contacts
8 years ago
aa8181ab2b
Contacts app translations
8 years ago
0cd94e2ba8
add title to contacts app
8 years ago
f2320190b8
change friends url to /contacts/
8 years ago
06c971ec47
s/friend/contact/g
8 years ago
2e0aa185cd
uppercase first letter of new translation keys
8 years ago
6306de5265
set avatar border-radius to 4px
8 years ago
33dcd2ae28
drop black border from avatars in userlist
8 years ago
e2c17dbeb4
resolve conflicts
8 years ago
557f13f796
Unfriend and update username - beta
8 years ago
7be1e249e1
add fa-share-alt to pad initialText
8 years ago
96d2ff67e1
user-plus as icon for add-friend
8 years ago
bf9c2b0b84
new messages
8 years ago
f6abdc2b86
manual merge of staging
8 years ago
ac684a8dc7
Use the APP toolbar in profile
8 years ago
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b3e225cb3b
Replace spinner by text and fix mobile UI
8 years ago
3453e54357
bump footer and package.json for upcoming version
8 years ago
42075e4b5f
Make everything 16px and 32px
8 years ago
16d0527e92
Add a page title in drive, settings and file
8 years ago
5d5f936682
Hide the upload table in code
8 years ago
a0b14faf89
Fix the font in settings and drive
8 years ago
112c4c85e5
Left menu in drive
8 years ago
59213a9c4e
Typo
8 years ago
560671ae7d
Make avatars circle
8 years ago
125018c8c3
New settings page
8 years ago
c02fa39524
Make drive search bar blue
8 years ago
0157e04b10
Fix overflowing content in the home page
8 years ago
e6188bfb63
Fix useradmin dropdown position
8 years ago
e8f3df5a46
Clean less
8 years ago
159d72f33b
Merge branch 'msg' into staging
8 years ago
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ff10c282d4
Avatar in the user admin button
8 years ago
52eb8e307c
feedback for language used
8 years ago
086e5909dd
Merge branch 'soon' into staging
8 years ago
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
8 years ago
c60a71e210
add connect button and view profile button
8 years ago
6f7c60bf12
Merge pull request #154 from evalica/153
...
Issue #153 : On Register, add spacing between checkboxes and labels
8 years ago
e8e8858e44
Issue #153 : On Register, add spacing between checkboxes and labels
8 years ago
fc065a0484
Issue #151 : Spacing between "Log-in" and "Register" buttons
...
- Removed ".first" class from Register button
- Increase spacing between buttons
8 years ago
a5e8f6ae81
Add friend app and fix avatar size
8 years ago
f02285d103
fix lowercased p
8 years ago
56ed1dd457
spanish update
8 years ago
4016a95540
prototype invite app
8 years ago
bf17ad3f1e
Friend button in the userlist
8 years ago
d7f9ddd8d2
Fix icon colors in the new menu (/pad app)
8 years ago
cc67838786
Fix horizontal scrollbar in /pad anonymous mode
8 years ago
fa06f9d413
fix minor bugs in poll
8 years ago
43d4597f38
merge to master
8 years ago
25905d13fa
wip
8 years ago
47c6c64b8a
Allow emojis in default avatars
8 years ago
ffd184d50e
Fix overflowing names in the new userlist
8 years ago
1a27f11e73
Fix dropdown menus in static pages
8 years ago
fa2d857d70
Fix css issues with Safari
8 years ago
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1df5e6e855
Fix toolbar buttons for Safari
8 years ago
bf414c15ee
fix logout button on home page
8 years ago
70c9f3df75
Fix avatar size
8 years ago
fcff5fa009
wip
8 years ago
335898a4c7
Hack the drawer to close it when clicking outside
8 years ago
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b153dda6ff
Add avatars in the user list
8 years ago
c2e153e8ed
more fouc fixes
8 years ago
8ffad5ece6
FOUC fixes
8 years ago
b6944e6638
Fix userlist style in apps without iframe
8 years ago
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
568ce70afd
Add a spinner for the history and update history buttons
8 years ago
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c25f2df721
Added caching versions to some of the images which are loaded by js
8 years ago
b9320e6005
Toolbar improvements
8 years ago
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
0b9d7d6c0b
fix color of links in poll and whiteboard
8 years ago
56a25e1036
Small fixes for the new toolbar
8 years ago
c53ebe3598
bring upload status container to the front
8 years ago
5e56ad912e
remove the last bit of compiled css
8 years ago
7de2683169
make all apps use clientside templates
8 years ago
bdca6b10c2
use templates in poll.js
8 years ago
3a9b480e4e
resolve merge conflicts in template.js
8 years ago
40f4fc2682
Add the profile app in template.js
8 years ago
9b6790534f
remove grey text from ckeditor initialState
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
c431041e3f
Fix position of the rightside drawer with small screen
8 years ago
36ef4178dc
Remove the editable title from the file app
8 years ago
c364803406
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
805e604e53
Add missing icons
8 years ago
f181e8db60
correct parentheses
8 years ago
f4fdb7040c
Optimize image assets to speedup page loading
8 years ago
6af4335ead
Translated up to page 317
...
Translated up to page 317
8 years ago
ce44a8d351
Fix the backup button in anonymous drive
8 years ago
06a0590f73
New folder icons
8 years ago
0d4d104e08
Mobile support for the new toolbar
8 years ago
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
684269fdda
Userlist in polls
8 years ago
bd1db735dd
jshint compliance
8 years ago
35bfa1dce4
test client-side templates in whiteboard app
8 years ago
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
13288ee18b
Update the userlist in code, slide and pad
8 years ago
dcfc59c2e2
Translation key updated
8 years ago
92b6e60573
Small improvements for the new toolbar
8 years ago
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
115813c191
Merge branch 'new-templates' into staging
8 years ago
3657e978fd
give main2.js a more sensible name
8 years ago
e86ef209a8
define loading screen markup in js
8 years ago
118b83c420
make register and login user clientside templates
8 years ago
6dacbf2bd9
add translations and some improvements
8 years ago
8d956c3de6
New toolbar
8 years ago
48f9745619
clientside templating
8 years ago
b7a0547b77
New toolbar colors
8 years ago
59fb5bd8be
One toolbar color per app
8 years ago
5a248db267
Merge branch 'staging' into newCk
8 years ago
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
9be23be5eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b80d7513aa
skip over the terms of service link
8 years ago
1275f3f3a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f5da7ae42e
Add a new loading tip in french
8 years ago
e2ff88e4c4
tooltips for file upload
8 years ago
726302a9ee
Spanish update
8 years ago
3f85471ab3
update footer and package.json for upcoming version
8 years ago
66b076111e
Add an upload button to the slide's file picker
8 years ago
a237eec41e
Add a file picker in the slide app
8 years ago
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a98353af6c
Add a button to upload a file in the drive
8 years ago
9870169e03
remove a few elements from CKEditor config
8 years ago
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f9c26645cf
Upload images using the slide app
8 years ago
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
8 years ago
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
8 years ago
0004be521c
change translation
8 years ago
49370764c1
change whiteboard translation
8 years ago
376b60c21c
New toolbar temp
8 years ago
685b352db8
poll: Add show help button
8 years ago
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
621376b0fa
small fixes
8 years ago
cce665a18b
spanish updates
8 years ago
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
2f851ab97e
fix lint errors
8 years ago
f1271bfd03
Missing file
8 years ago
5641a4a839
Add the file app in the 'new' dropdown menus
8 years ago
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
ee57458158
Remove the pin limit alert
8 years ago
85f1fb86d0
Add missing french translation keys
8 years ago
f43132a63b
bump version in footer and package.json
8 years ago
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
8d4017b79e
fix parse error
8 years ago
b9b8352633
Traditional Chinese
8 years ago
767793b5ca
fix stuck loading tip
8 years ago
d774f8771b
remove more unused files
8 years ago
540304807c
remove unused files
8 years ago
daf112a5b5
take api settings into account for upgrade button
8 years ago
ebfa228bc0
add upgrade button to all static pages
8 years ago
909bc2ebf3
add new translation key
8 years ago
81b931e56f
Update messages.pt-br.js
8 years ago
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
75874424cf
add 'support cryptpad' translation key
8 years ago
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
8 years ago
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.
8 years ago
92a7970eb8
fix merge conflicts
8 years ago
0a92719763
spanish! new keys ahoy
8 years ago
6518b56945
poll: french messages
8 years ago
3915b30055
provide a register button on login
...
also direct users from file to login
8 years ago
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
8 years ago
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6573813523
Merge branch 'soon' into staging
8 years ago
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
1092285a68
merge master
8 years ago
6c1861dbc6
Merge branch 'soon' into staging
8 years ago
0559b8cb77
Update messages.ro.js
8 years ago
70fbbe0078
Update messages.ro.js
8 years ago
bc26f7fc4e
Merge branch 'soon' into staging
8 years ago
70c1061f47
Fix romanian translation
8 years ago
83c0a6d37d
Romanian translation
8 years ago
b281d51d90
Fix typos in the french translation
8 years ago
38bd6b3808
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
964d046154
Update a french translation key
8 years ago
cf83cab596
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0a646a9534
remove unnecessary space
8 years ago
6ddfe0e901
Fix new lines in /pad userlist
8 years ago
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
2ca6277660
enable pin limits by default
8 years ago
c45f08f147
Use a download button instead of downloading a file automatically
8 years ago
0c2f84058b
Improve css for the file app
8 years ago
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
538aec6ef5
Display a message when pinPads returns an error
8 years ago
af4fd3c6d3
resolve merge conflicts
8 years ago
1ab6eb3c5d
Add a queue for multiple uploads in the file app
8 years ago
ba5ef5157e
show pretty representations of storage usage
8 years ago
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e7a458295b
new translation keys for file upload
8 years ago
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
21f9e31e75
Add a placeholder for the user app
8 years ago
620f4dc512
Add translations for the markdown preview button title
8 years ago
3ba94a1ba2
correctly set release version number
8 years ago
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d13dde856a
Add the markdown renderer file and change code's default content
8 years ago
4debec39bb
update footer with next release codename and corrected matrix link
8 years ago
517438d7c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
81af9225fc
template a Romanian translation
8 years ago
e8275c02c6
Merge pull request #115 from pbondoer/spanish
...
Spanish update
8 years ago
ad6217f064
file upload spanish keys
8 years ago
827233dcba
new translation keys for file upload
8 years ago
dc2cdb7c08
Add the usage bar in the settings page
8 years ago
716245f864
Make all the buttons look the same
8 years ago
0f37d9def7
Change the button font size in the toolbar
8 years ago
48496416e7
Use the same font-size for all the toolbar buttons
8 years ago
03274c3776
Display an info message in the anonymous drive
8 years ago
ad5e18f558
Spanish update
8 years ago
601226115b
New anonymous drive
8 years ago
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
8 years ago
5a21be8112
Improve UI on mobile
8 years ago
ca6f910f0b
Add french translations for 'log out everywhere'
8 years ago
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
6909f663b6
modify 'log out everywhere' text
8 years ago
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
c07d3e6162
update version strings for upcoming release
8 years ago
3e118c6a38
allow instance-wide custom salt for login
8 years ago
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
78b11584f8
remove unused variables
8 years ago
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a190c99426
Toolbar refactoring
8 years ago
410a9dfb17
temporary solution for testing pin limits
8 years ago
ef89451a83
Display the storage limit in the drive
8 years ago
f414d480a9
Add the history mode to the CryptDrive
8 years ago
16f6ab813c
Make it clear that the number is the history represents a version
8 years ago
0ee228666b
Replace the IRC link by the Matrix one
8 years ago
ab1dc48b6d
Fix the 'limit reached' icon in the pad app
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
e40203480f
Merge pull request #113 from pbondoer/staging
...
Update spanish
8 years ago
a5ca461a73
update footer for new version
8 years ago
ba407322e8
Update spanish
8 years ago
3e28d1b966
Add a missing key in the french translation
8 years ago
9abfadb32f
Update french translation
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
df9c312b7d
make new text translateable
8 years ago
8f352c8433
add justify plugin to default ckeditor config
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
7a05462eb3
Some more poll changes <3
8 years ago
50793f506d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
43c045721c
Get the channel history
8 years ago
eed5b1260d
set font-size label to match other ckeditor font sizes
8 years ago
0db603f580
spanish pinpad
8 years ago
84dd879abb
add messages for settings page
8 years ago
4c7022ade9
Merge pull request #109 from pbondoer/spanish
...
Espanol!
8 years ago
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
8 years ago
yflory