yflory
|
5c53868c3b
|
Delete pads after 3 months of inactivity
|
2018-02-26 18:34:05 +01:00 |
|
yflory
|
22f130d948
|
Remove lag when displaying loading screen in login and register
|
2018-02-26 10:41:37 +01:00 |
|
yflory
|
7cb3282634
|
New apps for text, slide and spreadsheet
|
2018-02-19 18:52:57 +01:00 |
|
yflory
|
831c23b259
|
Merge branch 'staging' into oo
|
2018-02-19 12:11:58 +01:00 |
|
yflory
|
5d584625e4
|
FAQ pages
|
2018-02-19 12:11:45 +01:00 |
|
yflory
|
5c1e5a3f49
|
Merge branch 'staging' into oo
|
2018-02-19 12:11:06 +01:00 |
|
yflory
|
299a2f4c08
|
FAQ placeholder
|
2018-02-19 12:09:57 +01:00 |
|
ansuz
|
91437c558e
|
fix weird messages
|
2018-02-16 17:06:11 +01:00 |
|
ansuz
|
11fabea327
|
update footer and package.json version
|
2018-02-16 16:13:01 +01:00 |
|
yflory
|
70e014cdfc
|
Hide infinite spinner and disconnect modals when pad is deleted
|
2018-02-15 11:34:44 +01:00 |
|
yflory
|
e83e589cf0
|
Kick from pad when an owned channel is deleted + whiteboard and poll
|
2018-02-14 19:41:07 +01:00 |
|
yflory
|
728a6a868d
|
Manage expired channels
|
2018-02-13 18:20:13 +01:00 |
|
yflory
|
223ed73ae1
|
French translation for the pad creation screen
|
2018-02-09 15:47:52 +01:00 |
|
yflory
|
0b022af5db
|
Fix style issues in IE and mobiles
|
2018-02-09 15:45:47 +01:00 |
|
yflory
|
ea7a3c75fa
|
Fix hidden content in the pad creation screen with smaller screen or zoom
|
2018-02-08 14:06:40 +01:00 |
|
yflory
|
81ea3b14d7
|
Fix usage bar position in the settings app
|
2018-02-08 12:29:00 +01:00 |
|
yflory
|
f18917f0ac
|
Fix race condition at registration
|
2018-02-08 12:24:34 +01:00 |
|
yflory
|
b5bb83b700
|
lint compliance
|
2018-02-08 12:24:19 +01:00 |
|
yflory
|
c210f097c0
|
Refactor login part two
|
2018-02-07 17:14:15 +01:00 |
|
yflory
|
ff151869de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-02-07 13:08:12 +01:00 |
|
yflory
|
7ebfa43408
|
Improve assert translations to detect issues in objects (tips, type, etc.)
|
2018-02-07 13:08:03 +01:00 |
|
ansuz
|
d676a5e7db
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
|
2018-02-07 11:14:19 +01:00 |
|
ansuz
|
a0ff3370a2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-02-07 10:27:24 +01:00 |
|
ansuz
|
218b1fb328
|
set messages.el.js to non-executable
|
2018-02-07 10:24:40 +01:00 |
|
ansuz
|
a1f05e4bf1
|
update pad creation screen text
|
2018-02-07 10:24:04 +01:00 |
|
yflory
|
5bba9b6c39
|
Refactor login to remove duplicate code
|
2018-02-06 18:45:12 +01:00 |
|
yflory
|
4df4c48fbd
|
Improve UI for pad creation screen
|
2018-02-06 17:36:37 +01:00 |
|
ansuz
|
a281869bba
|
make things actually work
|
2018-02-01 11:43:29 +01:00 |
|
ansuz
|
0672c2f41a
|
implement a running diff
|
2018-02-01 11:09:24 +01:00 |
|
yflory
|
f6926699bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-29 19:04:14 +01:00 |
|
yflory
|
ad2cde4705
|
Add warning about anonymous drive in localStorage
|
2018-01-29 19:04:00 +01:00 |
|
yflory
|
e80e8339c2
|
Typo in translation
|
2018-01-29 16:16:50 +01:00 |
|
ansuz
|
de838a3184
|
fix usage bar styles
|
2018-01-29 16:12:35 +01:00 |
|
yflory
|
8294686f80
|
Fix assert translations for deprecated keys
|
2018-01-29 15:37:23 +01:00 |
|
yflory
|
8a1c04ff58
|
Missing french translation keys
|
2018-01-29 15:33:34 +01:00 |
|
yflory
|
bdafc101c9
|
Ability to remove owned channels from the drive
|
2018-01-29 15:17:53 +01:00 |
|
yflory
|
a1d9f44bbd
|
Delete owned pads from server when removed from the owner's drive
|
2018-01-29 12:45:38 +01:00 |
|
yflory
|
5089f1206d
|
Pad creation screen translations and link to settings
|
2018-01-29 10:38:00 +01:00 |
|
yflory
|
462c229b17
|
Add links to features table
|
2018-01-26 12:52:25 +01:00 |
|
yflory
|
86144eda22
|
Display a message about pads deleted from the server
|
2018-01-26 12:26:58 +01:00 |
|
yflory
|
4d0312115a
|
Add a link to the account server for subscribers in settings
|
2018-01-25 12:09:20 +01:00 |
|
yflory
|
5827905dbd
|
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
|
2018-01-25 11:06:58 +01:00 |
|
yflory
|
166a9e71cf
|
Add a features comparison page
|
2018-01-23 19:03:31 +01:00 |
|
yflory
|
2995782079
|
Different colors for ok and cancel in alertify
|
2018-01-23 17:02:32 +01:00 |
|
yflory
|
8628f2831e
|
Fix 404 page inside iframe
|
2018-01-23 15:53:00 +01:00 |
|
yflory
|
30c6ab4717
|
Add meta description tag
|
2018-01-23 15:17:06 +01:00 |
|
yflory
|
c90ba890ca
|
Add more configurable options and add a new way to use custom config
|
2018-01-22 16:56:37 +01:00 |
|
ansuz
|
02dbe9e458
|
enforce maxUploadSize
|
2018-01-18 12:19:58 +01:00 |
|
ansuz
|
fc8847dae4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-18 10:32:27 +01:00 |
|
ansuz
|
04b862352f
|
update style for usage bar
|
2018-01-18 10:31:56 +01:00 |
|
yflory
|
08ae327386
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-17 18:40:09 +01:00 |
|
yflory
|
c5ebbe1a56
|
New share menu
|
2018-01-17 18:39:45 +01:00 |
|
ansuz
|
4f42e8a282
|
bump to version 1.25.0
|
2018-01-17 14:28:20 +01:00 |
|
ansuz
|
3858aa976a
|
better warning in case of errors in /file/
|
2018-01-16 16:52:06 +01:00 |
|
ansuz
|
4fc1079d67
|
translate some stuff
|
2018-01-15 17:43:58 +01:00 |
|
yflory
|
f3d8fd3590
|
Ability to import local pads on login
|
2018-01-12 18:17:32 +01:00 |
|
yflory
|
a5b75e0164
|
Fix default config for anynymous drive
|
2018-01-12 18:15:15 +01:00 |
|
yflory
|
8ced81d8d7
|
lint compliance
|
2018-01-12 17:45:52 +01:00 |
|
ansuz
|
b630fb95e2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 17:39:43 +01:00 |
|
ansuz
|
a018b7db9e
|
only show availablePadTypes on the home page
|
2018-01-12 17:39:36 +01:00 |
|
yflory
|
dffa117f4d
|
lint compliance
|
2018-01-12 17:09:33 +01:00 |
|
yflory
|
d59bc4612d
|
Ability to disable the drive for anonymous users
|
2018-01-12 15:54:36 +01:00 |
|
yflory
|
db0d2e161c
|
Hide pad creation screen features if it is disabled in app config
|
2018-01-12 14:50:39 +01:00 |
|
yflory
|
daef08a9b3
|
Add an advanced new pad modal
|
2018-01-12 09:50:11 +01:00 |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
2018-01-11 16:09:29 +01:00 |
|
yflory
|
bd9c44dbb2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:02:18 +01:00 |
|
yflory
|
ef480fea79
|
Add a settings category for the pad creation screen
|
2018-01-11 16:02:05 +01:00 |
|
ansuz
|
5346afe51f
|
step towards customizable login functionality
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
ae2517fcc6
|
remove dead code from home page
|
2018-01-11 15:55:56 +01:00 |
|
yflory
|
8c9490868b
|
improve owned pads management in the drive
|
2018-01-10 17:57:40 +01:00 |
|
yflory
|
73126ed597
|
Display the owner and expiration time of a pad in the properties modal
|
2018-01-09 18:19:24 +01:00 |
|
yflory
|
65ccfe39ef
|
Add a 'properties' button in pads to display pad data
|
2018-01-09 12:02:56 +01:00 |
|
ansuz
|
e06cb29c4f
|
bump version
|
2018-01-08 18:40:51 +01:00 |
|
yflory
|
0cea5f4596
|
Create an owned pad and view owned pads in the drive
|
2018-01-08 17:36:44 +01:00 |
|
yflory
|
1ec41f4e09
|
Ability to pick a background image in slides
|
2018-01-04 17:22:01 +01:00 |
|
ansuz
|
65e66dea08
|
resolve bad merge
|
2018-01-02 12:13:43 +01:00 |
|
ansuz
|
e3c7e96d71
|
Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek
|
2018-01-02 12:11:07 +01:00 |
|
ansuz
|
e460d9c36c
|
bump version
|
2018-01-02 10:38:49 +01:00 |
|
yflory
|
f329d65bc8
|
Ability to reduce the width of ckeditor
|
2017-12-22 18:01:15 +01:00 |
|
Christos Koulaxizis
|
7f3a08f0c2
|
Greek translation
|
2017-12-22 14:58:51 +02:00 |
|
yflory
|
888739e333
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 18:21:14 +01:00 |
|
yflory
|
fa6106a6bb
|
Use CSS to remove the loading screen
|
2017-12-21 18:21:10 +01:00 |
|
ansuz
|
c0b5dc7536
|
make loading screen tip presence configurable
|
2017-12-21 18:09:49 +01:00 |
|
yflory
|
158ef58c6c
|
Enable print plugin in ckeditor
|
2017-12-21 17:07:06 +01:00 |
|
ansuz
|
c448c9035e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-19 11:03:43 +01:00 |
|
ansuz
|
127f30df72
|
bump CryptPad version
|
2017-12-19 10:56:22 +01:00 |
|
yflory
|
e48f143842
|
Allow numbers in _getKey parameters
|
2017-12-19 10:51:30 +01:00 |
|
yflory
|
d666e9e7ee
|
Remove tag and filepicker buttons for anon users
|
2017-12-15 18:16:01 +01:00 |
|
yflory
|
b06b2dbafc
|
less lint compliance
|
2017-12-12 10:47:45 +01:00 |
|
yflory
|
b1f1aa2340
|
Disable pad creation screen
|
2017-12-11 17:54:34 +01:00 |
|
yflory
|
34315b4500
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-11 17:17:24 +01:00 |
|
yflory
|
c269929319
|
Fix creation page not displayed in pad and slide
|
2017-12-11 17:17:06 +01:00 |
|
ansuz
|
16388a839c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-11 15:46:38 +01:00 |
|
ansuz
|
230f9524be
|
new less linter rules and compliance
|
2017-12-11 15:05:58 +01:00 |
|
yflory
|
4e46d0daa5
|
Fix the 'New' button icon in the toolbar
|
2017-12-11 14:51:36 +01:00 |
|
yflory
|
dcfccf88cd
|
Merge branch 'creationpage' into staging
|
2017-12-11 12:21:21 +01:00 |
|
yflory
|
1922dbfd75
|
Creation page with mobile support
|
2017-12-11 12:19:44 +01:00 |
|
Caleb James DeLisle
|
024aa741a7
|
Added all of the filters to the lesshint rc (all explicitly enabled or disabled) and made empty line at end of file compliant
|
2017-12-08 19:12:34 +01:00 |
|
Caleb James DeLisle
|
1d2119b292
|
Removed LESS duplicate attributes
|
2017-12-08 18:13:35 +01:00 |
|
Caleb James DeLisle
|
bfba239770
|
Fixed missing semicolons in less
|
2017-12-08 17:35:28 +01:00 |
|
Caleb James DeLisle
|
9af941741d
|
Fix trailing whitespace and empty selectors in less
|
2017-12-08 17:30:45 +01:00 |
|
Caleb James DeLisle
|
dd44b4da99
|
Removed old /less/ directory which is nolonger used :)
|
2017-12-08 14:56:13 +01:00 |
|
Caleb James DeLisle
|
12b0f3e201
|
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
|
2017-12-08 14:00:53 +01:00 |
|
Caleb James DeLisle
|
617c4b6044
|
CSS refactorings and pad-is-not-pinned work
|
2017-12-07 19:00:13 +01:00 |
|
yflory
|
e96d54e655
|
Add a pad creation page
|
2017-12-07 18:51:50 +01:00 |
|
Caleb James DeLisle
|
67f8031beb
|
Wrong usage of colortheme.less, fixed
|
2017-12-07 14:57:24 +01:00 |
|
yflory
|
64303b4090
|
Merge branch 'refactor' into staging
|
2017-12-07 10:34:15 +01:00 |
|
Caleb James DeLisle
|
ba74f9d37a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-05 18:32:29 +01:00 |
|
Caleb James DeLisle
|
1dabea84d9
|
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
|
2017-12-05 18:32:23 +01:00 |
|
Caleb James DeLisle
|
c702a23c77
|
Initial work on the 'pad will expire' logic
|
2017-12-05 17:48:30 +01:00 |
|
ansuz
|
087eee55f6
|
update 404 page
|
2017-12-04 18:31:07 +01:00 |
|
ansuz
|
f95669a27a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-04 17:33:13 +01:00 |
|
ansuz
|
fc4fea9c54
|
update 404 messages and show actual text faster
|
2017-12-04 17:33:06 +01:00 |
|
yflory
|
f52d987515
|
Ability to resize avatars before uploading them
|
2017-12-04 15:03:43 +01:00 |
|
yflory
|
e164edec03
|
Fix the webworker app
|
2017-12-01 18:29:59 +01:00 |
|
yflory
|
04e02871bc
|
Merge branch 'refactor2' into staging
|
2017-12-01 14:50:19 +01:00 |
|
yflory
|
4903bd0757
|
Enable messenger in async store
|
2017-12-01 14:49:21 +01:00 |
|
ansuz
|
5acbaef28f
|
tweak animation parameters for faster 'decryption'
|
2017-12-01 14:03:13 +01:00 |
|
ansuz
|
c80c97d7db
|
lint compliance
|
2017-12-01 13:23:23 +01:00 |
|
ansuz
|
bcdc0d810a
|
make 404 page translateable, point to home page or drive
|
2017-12-01 11:51:04 +01:00 |
|
ansuz
|
443eeaa407
|
fancy 404 page
|
2017-11-30 19:17:59 +01:00 |
|
yflory
|
acd8ab7446
|
Add the markdown toolbar in profile
|
2017-11-27 18:10:37 +01:00 |
|
yflory
|
74e59a513a
|
Add the markdown toolbar to the slide and poll apps
|
2017-11-27 17:55:20 +01:00 |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
2017-11-27 12:17:35 +01:00 |
|
yflory
|
9795ac32cb
|
Ability to burn an anonymous drive from the browser
|
2017-11-23 14:36:42 +01:00 |
|
yflory
|
280a7c2765
|
Clean cryptpad-common
|
2017-11-23 12:28:49 +01:00 |
|
yflory
|
cdd8c6e110
|
Fix history mode not centered
|
2017-11-21 17:48:43 +01:00 |
|
yflory
|
30cea8888d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-21 17:37:53 +01:00 |
|
yflory
|
06011065d2
|
Add a debug app
|
2017-11-21 17:37:38 +01:00 |
|
ansuz
|
60c4973d62
|
resolve merge conflicts
|
2017-11-21 17:22:06 +01:00 |
|
yflory
|
477f14bb8b
|
Put constants in a separate file
|
2017-11-21 16:46:19 +01:00 |
|
ansuz
|
8150abddbe
|
remove dead code from pages.js
|
2017-11-21 15:52:37 +01:00 |
|
ansuz
|
4ffb59dce9
|
bump to version 1.21.0
|
2017-11-21 15:47:06 +01:00 |
|
yflory
|
e8e90905e4
|
Fix assert translations
|
2017-11-20 14:23:56 +01:00 |
|
ansuz
|
78e972201a
|
bump CryptPad version
|
2017-11-20 14:16:55 +01:00 |
|
yflory
|
ce3600b026
|
Update translation keys
|
2017-11-20 10:41:27 +01:00 |
|
yflory
|
cf26c4c286
|
Improve the toolbar UI for smaller screens
|
2017-11-17 18:21:45 +01:00 |
|
yflory
|
af8aa25228
|
Add an option to never rename a file during the session
|
2017-11-17 10:57:54 +01:00 |
|
yflory
|
25d3d321da
|
Ability to rename a file before uploading it to the server
|
2017-11-16 18:11:13 +01:00 |
|
yflory
|
1f53304ad3
|
Display a dropdown menu inside another one
|
2017-11-15 15:35:28 +01:00 |
|
yflory
|
014e12b5b5
|
Ability to update the username from the userlist
|
2017-11-15 11:32:54 +01:00 |
|
yflory
|
9184dd0ce6
|
Merge branch 'refactor2' into staging
|
2017-11-14 11:53:13 +01:00 |
|
yflory
|
5a2afb5c95
|
Remove Realtime and Messaging from common
|
2017-11-13 17:01:09 +01:00 |
|
yflory
|
af1ea4fd96
|
Fix typo in the French translation
|
2017-11-13 16:34:37 +01:00 |
|
yflory
|
c9e1de042c
|
Remove common-interface dependency from cryptpad-common
|
2017-11-13 12:00:26 +01:00 |
|
yflory
|
dc207393fd
|
Separate UI elements from cryptpad-common
|
2017-11-13 10:23:18 +01:00 |
|
yflory
|
354c63bd64
|
Clean old code
|
2017-11-09 18:17:49 +01:00 |
|
yflory
|
101482b8cc
|
Migrate settings to use a sandboxed iframe
|
2017-11-09 14:23:40 +01:00 |
|
yflory
|
2ff66e1a7c
|
Update french translation
|
2017-11-06 17:39:41 +01:00 |
|
ansuz
|
2c9df23849
|
update english text for removing from trash in the drive
|
2017-11-06 17:37:29 +01:00 |
|
ansuz
|
d10f752457
|
s/delete/move to trash
|
2017-11-06 17:07:37 +01:00 |
|
ansuz
|
402fae442d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-06 15:14:21 +01:00 |
|
ansuz
|
c5f6491c37
|
bump footer and package.json to latest version
|
2017-11-06 15:14:02 +01:00 |
|
yflory
|
2a3a5c4342
|
Ability to disable thumbnails
|
2017-11-03 18:38:27 +01:00 |
|
yflory
|
1871749b6f
|
Fix -1 viewer in the userlist when disconnected
|
2017-11-03 15:14:23 +01:00 |
|
yflory
|
cf3024ef5b
|
Ability to display an error in the toolbar state
|
2017-11-03 14:30:59 +01:00 |
|
yflory
|
e0f7df80b3
|
Fix avatar upload and use less2 everywhere in profile
|
2017-10-31 11:11:29 +01:00 |
|
yflory
|
7f9b21405b
|
Add missing files for profile
|
2017-10-31 10:27:41 +01:00 |
|
yflory
|
4250688856
|
Migrate profile to use sframe
|
2017-10-30 18:49:28 +01:00 |
|
yflory
|
abc511a56e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-30 15:12:29 +01:00 |
|
yflory
|
68accaf653
|
Todo in sframe with less2
|
2017-10-30 15:12:15 +01:00 |
|
Evilham
|
735f0a7e30
|
Merge branch 'theming-improvement' into staging
|
2017-10-26 20:44:56 +02:00 |
|
Evilham
|
83da9cf752
|
Moved colours to colortheme.less to enable theming
|
2017-10-26 20:29:14 +02:00 |
|
yflory
|
6f020b67ca
|
Add thumbnails to framework apps
|
2017-10-26 12:31:16 +02:00 |
|
ansuz
|
69f9a7ebf3
|
make userlist change notifications configurable
|
2017-10-24 17:29:58 +02:00 |
|
yflory
|
204f3e1441
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 15:17:09 +02:00 |
|
yflory
|
74985fd0f2
|
Use text for the addUser button in polls
|
2017-10-23 15:12:27 +02:00 |
|
ansuz
|
7d1892546b
|
add missing french translation
|
2017-10-23 14:59:14 +02:00 |
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
2017-10-23 14:29:01 +02:00 |
|
ansuz
|
aaef30f489
|
bump cryptpad version
|
2017-10-23 14:05:49 +02:00 |
|
yflory
|
ce5d24a1d3
|
Remove error message about Tether
|
2017-10-23 11:57:10 +02:00 |
|
ansuz
|
d571f408d8
|
Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
|
2017-10-23 11:46:56 +02:00 |
|
yflory
|
3e4faf1be1
|
Add new state messages in the toolbar
|
2017-10-20 18:12:47 +02:00 |
|
Yannick A
|
63dcfd6d18
|
Update French translation
|
2017-10-19 21:02:03 +02:00 |
|
Caleb James DeLisle
|
a149152f11
|
Merge branch 'staging' into framework
|
2017-10-18 11:42:31 +03:00 |
|
yflory
|
e553351b79
|
Put the add friend button in the userlist below the name
|
2017-10-17 12:39:25 +02:00 |
|
yflory
|
6920129126
|
Embed images from the drive in whiteboard
|
2017-10-17 12:19:57 +02:00 |
|
MacLemon
|
867b971c33
|
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
|
2017-10-14 00:31:31 +02:00 |
|
yflory
|
2fd120100a
|
Merge branch 'wb' into staging
|
2017-10-13 16:58:59 +02:00 |
|
Caleb James DeLisle
|
15337603bb
|
Merge branch 'staging' into framework
|
2017-10-13 13:41:24 +03:00 |
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
2017-10-12 17:07:10 +03:00 |
|
yflory
|
62bc72847f
|
Add an error message when trying to tag a deleted pad
|
2017-10-12 15:06:29 +02:00 |
|
yflory
|
50090a3af6
|
Add placeholders for the comment form in poll
|
2017-10-12 12:18:32 +02:00 |
|
yflory
|
ecb537ac7f
|
Move code to render.js in poll
|
2017-10-10 18:19:49 +02:00 |
|
yflory
|
c985aa60aa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-09 17:30:14 +02:00 |
|
yflory
|
f4189f883e
|
Add missing french translation keys
|
2017-10-09 17:28:56 +02:00 |
|
ansuz
|
128c9c2f4e
|
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
|
2017-10-09 17:20:23 +02:00 |
|
ansuz
|
d046b9ce33
|
add missing French key
|
2017-10-09 17:16:48 +02:00 |
|
ansuz
|
f0bdc3b26f
|
second try
|
2017-10-09 16:57:30 +02:00 |
|
ansuz
|
d50a692986
|
add note about tags to prompt
|
2017-10-09 16:51:57 +02:00 |
|
CatalinScr
|
21f1a48380
|
changed the login in button
|
2017-10-09 17:17:33 +03:00 |
|
yflory
|
d3d6940b69
|
Update french translation for tags
|
2017-10-09 15:47:28 +02:00 |
|
ansuz
|
3f181fa370
|
update loading screen tip for tags
|
2017-10-09 15:38:33 +02:00 |
|
ansuz
|
f751554f82
|
update footer and package.json for upcoming version
|
2017-10-09 15:15:04 +02:00 |
|
yflory
|
dd141b5c9f
|
Disable comments when a poll is not published
|
2017-10-09 14:08:54 +02:00 |
|
yflory
|
5e7bf0cfb8
|
Embed an image in whiteboard
|
2017-10-09 10:32:24 +02:00 |
|
Caleb James DeLisle
|
f0eb58ee95
|
Merge branch 'staging' into framework
|
2017-10-06 14:50:35 +03:00 |
|
yflory
|
ab3648a30a
|
Merge branch 'newpoll' into staging
|
2017-10-05 17:56:17 +02:00 |
|
yflory
|
1c4f1c785d
|
Improve stability and UI in poll and its comments
|
2017-10-05 17:54:07 +02:00 |
|
ansuz
|
080511efcd
|
add missing translation for hashtags
|
2017-10-05 17:01:39 +02:00 |
|
Caleb James DeLisle
|
d9e97b86e6
|
Merge branch 'staging' into framework
|
2017-10-05 12:14:37 +03:00 |
|
Caleb James DeLisle
|
383c2f54cb
|
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
|
2017-10-05 12:14:03 +03:00 |
|
yflory
|
26dfc65c25
|
Comments in polls
|
2017-10-04 19:06:16 +02:00 |
|
yflory
|
846b1a9fb3
|
Improve description UI in poll. Enable tags and mediatag
|
2017-10-04 15:39:18 +02:00 |
|
yflory
|
68bda92291
|
Use codemirror for description in poll
|
2017-10-03 19:04:29 +02:00 |
|
ansuz
|
e2f53eaddb
|
add loading screen tip about hashtags
|
2017-10-03 18:39:03 +02:00 |
|
ansuz
|
b8ce149db6
|
add hint about tag usage
|
2017-10-03 18:36:34 +02:00 |
|
yflory
|
5cf86bf74a
|
Update UI in poll and remove old code
|
2017-10-03 14:11:11 +02:00 |
|
Caleb James DeLisle
|
94d2f4472b
|
Stop using presentSuccess because it is hidden behind the modal in slide
|
2017-10-03 12:10:16 +03:00 |
|
ansuz
|
351b95d6a9
|
resolve merge conflicts
|
2017-10-02 18:59:47 +02:00 |
|
Caleb James DeLisle
|
fa6938baa8
|
1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
|
2017-10-02 17:34:37 +03:00 |
|
yflory
|
66da349ee4
|
Sandboxed Poll app with less2
|
2017-09-27 18:52:04 +02:00 |
|
yflory
|
e02a779c14
|
Use secure drive as default drive
|
2017-09-27 10:31:35 +02:00 |
|
yflory
|
b4de31c827
|
Merge branch 'newdrive' into staging
|
2017-09-27 10:28:16 +02:00 |
|
yflory
|
767027b237
|
Lint
|
2017-09-27 10:16:24 +02:00 |
|
yflory
|
0df9e5ace0
|
Fix toolbar in polls
|
2017-09-27 10:09:47 +02:00 |
|
ansuz
|
b3e066eaca
|
show loading screen tips during loading screen
|
2017-09-26 10:59:25 +02:00 |
|
yflory
|
cdeac00633
|
Merge branch 'staging' into newdrive
|
2017-09-25 17:35:06 +02:00 |
|
yflory
|
1d7683503f
|
Fix link origin in sframe upload table
|
2017-09-25 12:44:05 +02:00 |
|
yflory
|
92c808812a
|
Fix missing style in toolbar/less2
|
2017-09-25 11:59:05 +02:00 |
|
yflory
|
c364377d7c
|
Use less2 in sframe drive
|
2017-09-25 11:48:42 +02:00 |
|
yflory
|
dfdeb7b113
|
Fix style and race condition for history mode
|
2017-09-21 18:00:33 +02:00 |
|
yflory
|
a810d7bd85
|
Fix style and race condition for history mode
|
2017-09-21 18:00:11 +02:00 |
|
yflory
|
456370b1aa
|
Base for Drive in sandboxed iframe
|
2017-09-21 17:59:26 +02:00 |
|
ansuz
|
95302366d1
|
lint compliance
|
2017-09-21 11:19:23 +02:00 |
|
ansuz
|
53b98c12c9
|
ignore broken stylesheet
|
2017-09-20 11:33:30 +02:00 |
|
yflory
|
95542bcdaf
|
Lint
|
2017-09-19 15:38:19 +02:00 |
|
yflory
|
88914ec6cc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-19 15:36:38 +02:00 |
|
yflory
|
8a09e39f46
|
Enable tags in pads
|
2017-09-19 15:30:08 +02:00 |
|
ansuz
|
d2b27f3588
|
resolve merge conflicts
|
2017-09-19 14:24:26 +02:00 |
|
ansuz
|
f127240a2f
|
add poll to main.less
|
2017-09-19 14:23:54 +02:00 |
|
yflory
|
6683434c62
|
Fix wrong relative url
|
2017-09-19 12:03:45 +02:00 |
|
yflory
|
35a313d6ee
|
Make palette realtime
|
2017-09-19 11:20:20 +02:00 |
|
yflory
|
3023e8c855
|
Fix templates in whiteboard
|
2017-09-19 11:04:52 +02:00 |
|
yflory
|
732585ea7b
|
Sandboxed iframe for the whiteboard app
|
2017-09-19 10:27:31 +02:00 |
|
ansuz
|
f9d27d2783
|
WIP secure contacts
|
2017-09-18 15:09:01 +02:00 |
|
yflory
|
1131ef0172
|
Fix language selection in sandboxed iframes
|
2017-09-18 14:26:54 +02:00 |
|
yflory
|
c00d295466
|
Add missing translations
|
2017-09-15 17:33:36 +02:00 |
|
yflory
|
974658453c
|
Mediatag integration in pads
|
2017-09-15 13:21:37 +02:00 |
|
Caleb James DeLisle
|
b24e9b84af
|
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
|
2017-09-14 10:48:35 +02:00 |
|
ansuz
|
2797a77f5d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 18:18:45 +02:00 |
|
ansuz
|
e0ae0fcd91
|
thanks Dima!
|
2017-09-13 17:47:49 +02:00 |
|
ansuz
|
f039fc7ff5
|
develop a system for avoiding z-index problems
|
2017-09-13 17:43:17 +02:00 |
|
yflory
|
d360e2d0f4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 16:20:26 +02:00 |
|
yflory
|
ab64bf9e59
|
Use less2 for the loading screen
|
2017-09-13 16:19:26 +02:00 |
|
Caleb James DeLisle
|
0d8c292fef
|
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-13 14:47:55 +02:00 |
|
Caleb James DeLisle
|
789a923792
|
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
|
2017-09-13 14:47:50 +02:00 |
|
ansuz
|
244e3ecba7
|
support forefront flag in alert config
|
2017-09-13 12:32:30 +02:00 |
|
yflory
|
8c41e0bdd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-12 18:40:20 +02:00 |
|
yflory
|
437f50fd4a
|
Migrate the file to a sandboxed iframe
|
2017-09-12 18:40:11 +02:00 |
|
ansuz
|
ad591fba50
|
bump version
|
2017-09-12 14:04:30 +02:00 |
|
yflory
|
8c3e2dbe61
|
Missing french translation keys
|
2017-09-12 11:45:47 +02:00 |
|
ansuz
|
306fec2d0e
|
improve messages for template picker confirm
|
2017-09-11 16:25:58 +02:00 |
|
yflory
|
37dca9c155
|
Add missing translation keys in french
|
2017-09-11 14:12:06 +02:00 |
|
ansuz
|
134c6057c1
|
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
|
2017-09-11 14:01:05 +02:00 |
|
ansuz
|
59d25b4c1a
|
use camel case, not snek case
|
2017-09-11 14:00:27 +02:00 |
|
yflory
|
5cde3fffb8
|
Align title for normal, readonly and page mode in the toolbar
|
2017-09-11 12:04:22 +02:00 |
|
yflory
|
7582c9cffd
|
Fix register button in the index dropdown menu for mobiles
|
2017-09-11 11:22:41 +02:00 |
|
yflory
|
c3a07e879c
|
Merge branch 'staging' into slide2
|
2017-09-08 16:23:07 +02:00 |
|
yflory
|
fc069dac48
|
Ask the user before loading the template picker
|
2017-09-08 16:21:12 +02:00 |
|
yflory
|
f2aaaa9751
|
Move slide to secure iframe
|
2017-09-07 18:56:58 +02:00 |
|
ansuz
|
809b56625d
|
refactor ui elements
|
2017-09-07 18:54:58 +02:00 |
|
ansuz
|
bca9ba66cb
|
enforce a configurable minimum password length when registering
|
2017-09-07 17:44:04 +02:00 |
|
ansuz
|
ef30b0bc42
|
contribute to z-index arms race
|
2017-09-07 16:50:06 +02:00 |
|
ansuz
|
a6eb1444df
|
add loading screen markup to register and login
|
2017-09-07 16:39:42 +02:00 |
|
ansuz
|
352d504944
|
avoid loading unnecessary files
|
2017-09-07 16:39:20 +02:00 |
|
ansuz
|
263c2eb2c2
|
fix overflowing title text
|
2017-09-07 14:17:43 +02:00 |
|
ansuz
|
cca3c04d43
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-07 12:45:18 +02:00 |
|
ansuz
|
15e24ebe4f
|
ui for hashtag picker
|
2017-09-07 12:45:07 +02:00 |
|
yflory
|
fe8b2c2556
|
Fix french translation
|
2017-09-06 15:43:30 +02:00 |
|
yflory
|
8f2776657b
|
Add translations for pad embed
|
2017-09-06 11:21:53 +02:00 |
|
yflory
|
3ca9f41290
|
Get embed code for pad and code
|
2017-09-06 10:56:27 +02:00 |
|
yflory
|
d22edc03b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:34:49 +02:00 |
|
yflory
|
53eb9bb541
|
Remove the logo from the filepicker loading screen
|
2017-09-05 15:34:38 +02:00 |
|
ansuz
|
5c9ce0caa5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-09-05 15:32:31 +02:00 |
|
ansuz
|
77bbb3add4
|
bump footer and package.json version string
|
2017-09-05 15:29:28 +02:00 |
|
yflory
|
01881ac469
|
Update loading tips in the french translation
|
2017-09-05 15:15:57 +02:00 |
|
yflory
|
729c013af7
|
Get mediatag embed code from the file app
|
2017-09-05 15:08:05 +02:00 |
|
ansuz
|
5eb13461c0
|
remove anchor button
|
2017-09-05 12:16:49 +02:00 |
|
yflory
|
204e45dfae
|
Enable templates in pad
|
2017-09-05 11:57:44 +02:00 |
|
yflory
|
78b338c379
|
Merge branch 'code2' into staging
|
2017-09-05 11:38:17 +02:00 |
|
yflory
|
d2787e3eff
|
Make code2 the default code app
|
2017-09-05 11:36:02 +02:00 |
|
yflory
|
86e23ac19f
|
Use less2 in secure iframes
|
2017-09-04 15:09:54 +02:00 |
|
ansuz
|
7b27b8635d
|
fix padding on registration button
|
2017-08-31 18:58:08 +02:00 |
|
ansuz
|
6bb29e52e2
|
lint compliance
|
2017-08-31 18:45:18 +02:00 |
|
CatalinScr
|
0ceb4cbbcb
|
Updated the contact page with the new design
|
2017-08-31 16:26:20 +03:00 |
|
CatalinScr
|
83be769bb3
|
Merge branch 'master' into staging
updated with new version
|
2017-08-31 11:36:39 +03:00 |
|
CatalinScr
|
1bf77cb77e
|
changed the icons
|
2017-08-31 11:27:02 +03:00 |
|
CatalinScr
|
ee325c1813
|
Repaired the errors from lint
|
2017-08-31 10:20:10 +03:00 |
|
CatalinScr
|
f95f3f4f24
|
Updated the contact page
|
2017-08-31 10:04:40 +03:00 |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
2017-08-30 14:57:19 +02:00 |
|
yflory
|
d3e947f17e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-30 11:11:48 +02:00 |
|
yflory
|
7498057c89
|
Fix Safari iframe size
|
2017-08-30 11:11:43 +02:00 |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
2017-08-30 11:10:57 +02:00 |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
2017-08-29 18:15:40 +02:00 |
|
ansuz
|
2ef4ebc6ef
|
two new tips for the loading screen
|
2017-08-29 17:56:34 +02:00 |
|
ansuz
|
570ff75a6c
|
update footer for latest version
|
2017-08-29 11:12:08 +02:00 |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:22:38 +02:00 |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
2017-08-28 12:22:31 +02:00 |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
2017-08-25 16:07:53 +02:00 |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
ansuz
|
f9cdbe66a0
|
add forgotten translation string
|
2017-08-24 17:20:59 +02:00 |
|
Caleb James DeLisle
|
35e7341f4d
|
Merge branch 'ui-integration' into staging2
|
2017-08-24 13:54:55 +02:00 |
|
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
2017-08-24 13:53:42 +02:00 |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
2017-08-23 10:45:55 +02:00 |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-22 18:19:06 +02:00 |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
2017-08-22 15:55:49 +02:00 |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
2017-08-22 15:50:10 +02:00 |
|
yflory
|
1752124071
|
Fix Iframe height in Edge
|
2017-08-22 11:50:52 +02:00 |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
2017-08-21 18:08:37 +02:00 |
|
CatalinScr
|
49f7e0d63b
|
Changed the Social Media links to Pierre
|
2017-08-18 16:01:50 +03:00 |
|
ansuz
|
48fe3ef841
|
add a tip about cryptdrive
|
2017-08-17 14:25:24 +02:00 |
|
ansuz
|
839c6df3bb
|
remove invalid loading screen tips. create a new one
|
2017-08-17 14:16:37 +02:00 |
|
yflory
|
0a813b4fab
|
Fix limit bar overflowing when over the limit
|
2017-08-17 10:24:10 +02:00 |
|
CatalinScr
|
744fb407ae
|
Updated the what is page
|
2017-08-16 15:53:10 +03:00 |
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:54 +02:00 |
|
Caleb James DeLisle
|
f7b2aa85b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:36:25 +02:00 |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
2017-08-16 11:36:14 +02:00 |
|
yflory
|
df8851a53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:35:56 +02:00 |
|
yflory
|
df0b7155f6
|
Add missing french translation
|
2017-08-16 11:35:40 +02:00 |
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:35 +02:00 |
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:31:09 +02:00 |
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
2017-08-16 11:30:56 +02:00 |
|
Caleb James DeLisle
|
4213d6de70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:29:59 +02:00 |
|
Caleb James DeLisle
|
d6125d864c
|
Added Yann's bio
|
2017-08-16 11:29:50 +02:00 |
|
yflory
|
a39f802b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:17:37 +02:00 |
|
yflory
|
e4d842ed08
|
Fix typos in the french translation
|
2017-08-16 10:55:15 +02:00 |
|
ansuz
|
7537caf8fe
|
make footer translateable
|
2017-08-16 10:51:08 +02:00 |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
2017-08-16 10:20:05 +02:00 |
|
CatalinScr
|
fd3fd945c8
|
Updated the Log in Page
|
2017-08-16 07:56:18 +03:00 |
|
CatalinScr
|
1f4d0a0a56
|
Repaired a bug
|
2017-08-16 06:56:08 +03:00 |
|
CatalinScr
|
dd48cf7c90
|
updated the register page
|
2017-08-15 23:47:36 +03:00 |
|
CatalinScr
|
3196d4558f
|
repaired the responsive error at about page
|
2017-08-15 06:50:13 +03:00 |
|
CatalinScr
|
3960cd25f8
|
Updated the about page with the new design
|
2017-08-14 16:40:09 +03:00 |
|
Caleb James DeLisle
|
7c8df61f91
|
sed majik to switch 'What is CryptDrive' to 'What is CryptPad'
|
2017-08-11 17:54:15 +02:00 |
|
Caleb James DeLisle
|
196ce3b3f7
|
Fix alertify style which made the registration popup look bad
|
2017-08-11 17:49:19 +02:00 |
|
Pierre Bondoerffer
|
f580d9a30a
|
*actually* fix alertify on mobile
|
2017-08-11 15:16:51 +02:00 |
|
Pierre Bondoerffer
|
8c0fe7d277
|
Add missing UI element translations
|
2017-08-11 15:10:45 +02:00 |
|
Pierre Bondoerffer
|
144f9f4c83
|
alertify fix on mobile
|
2017-08-11 14:46:08 +02:00 |
|
Caleb James DeLisle
|
9833bd7e59
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:31:40 +02:00 |
|
Caleb James DeLisle
|
89a8e8050c
|
Fix typo and also change message to explain itself better
|
2017-08-11 14:31:31 +02:00 |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
ansuz
|
328107be4d
|
translation key for using tabs
|
2017-08-11 14:26:08 +02:00 |
|
Pierre Bondoerffer
|
b00d37d9e7
|
proper namespace for font
|
2017-08-11 14:14:58 +02:00 |
|
Pierre Bondoerffer
|
0f74dffc48
|
fix register button being cut off
|
2017-08-11 14:11:50 +02:00 |
|
Pierre Bondoerffer
|
92d3b1a9fc
|
actually pull in open-sans, move fonts to own include
|
2017-08-11 14:10:54 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02:00 |
|
ansuz
|
7f2b7fc287
|
show Your CryptDrive, if logged in. fix typos
|
2017-08-11 11:32:21 +02:00 |
|
Pierre Bondoerffer
|
ef256e3849
|
go to homepage when on infopages
|
2017-08-10 15:17:34 +02:00 |
|
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
2017-08-10 15:05:57 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +02:00 |
|
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
2017-08-09 17:47:02 +02:00 |
|
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
2017-08-09 18:35:36 +03:00 |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02:00 |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
2017-08-09 15:46:17 +02:00 |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
2017-08-09 14:43:32 +02:00 |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
2017-08-09 12:33:40 +02:00 |
|
Pierre Bondoerffer
|
280c10c57d
|
alertify: use the right box-shadow
|
2017-08-09 11:48:04 +02:00 |
|
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
2017-08-09 11:24:28 +02:00 |
|
Pierre Bondoerffer
|
ec011b15d5
|
remove duplicate css property
|
2017-08-09 10:55:36 +02:00 |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
2017-08-09 10:54:20 +02:00 |
|
Pierre Bondoerffer
|
ca686f9c92
|
(hopefully) fix newline in lists when pasting links
|
2017-08-08 17:47:10 +02:00 |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
2017-08-08 16:51:23 +02:00 |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
2017-08-08 16:20:31 +02:00 |
|
Pierre Bondoerffer
|
355b7f1839
|
change recent to local pads
|
2017-08-08 12:05:22 +02:00 |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
2017-08-08 12:01:39 +02:00 |
|
Pierre Bondoerffer
|
88be5444f0
|
change alertify warn color
|
2017-08-08 10:37:37 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
Pierre Bondoerffer
|
996c56c242
|
fix label in register
|
2017-08-07 11:41:04 +02:00 |
|
Pierre Bondoerffer
|
008fa12755
|
alertify: add textarea + checkbox
|
2017-08-07 11:26:40 +02:00 |
|
Pierre Bondoerffer
|
e486e47aa1
|
alertify: fix input color + better log styles
|
2017-08-07 11:19:20 +02:00 |
|
Pierre Bondoerffer
|
e333e7903d
|
fix styles overlapping
|
2017-08-04 17:44:02 +02:00 |
|
Pierre Bondoerffer
|
1db41dd17b
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 17:15:55 +02:00 |
|
Pierre Bondoerffer
|
dac14de18c
|
unify fonts
|
2017-08-04 17:15:45 +02:00 |
|
CatalinScr
|
5afadf10aa
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 17:58:48 +03:00 |
|
CatalinScr
|
3f6b234e97
|
Styled the general menu, footer, updated about
|
2017-08-04 17:58:29 +03:00 |
|
Pierre Bondoerffer
|
a16d4be3c4
|
show logged in user
|
2017-08-04 16:48:01 +02:00 |
|
Pierre Bondoerffer
|
8a56adfe53
|
make logos same size, compress
|
2017-08-04 16:25:39 +02:00 |
|
Pierre Bondoerffer
|
d3fb6313b6
|
color logo on topbar
|
2017-08-04 16:22:43 +02:00 |
|
Pierre Bondoerffer
|
865ba0731c
|
better colors? not sure yet...
|
2017-08-04 16:13:27 +02:00 |
|
Pierre Bondoerffer
|
1bd42f0b3e
|
make alertify darker
|
2017-08-04 16:02:35 +02:00 |
|
Caleb James DeLisle
|
0f7124d673
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:26:59 +02:00 |
|
Pierre Bondoerffer
|
ecc766eb7b
|
remove useless margin
|
2017-08-04 15:24:58 +02:00 |
|
Caleb James DeLisle
|
a6547d1ed0
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:20:14 +02:00 |
|
Pierre Bondoerffer
|
7310960f46
|
remove the hack around the hack to fix the hack
|
2017-08-04 15:19:59 +02:00 |
|
Caleb James DeLisle
|
95c7cd3fcc
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:17:22 +02:00 |
|
Pierre Bondoerffer
|
addd91cc72
|
fix styles (again) copyright cjd 2017
|
2017-08-04 15:16:48 +02:00 |
|
Caleb James DeLisle
|
930ba8aec6
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:13:09 +02:00 |
|
Pierre Bondoerffer
|
5c21a9048e
|
fix styles
|
2017-08-04 15:13:03 +02:00 |
|
Caleb James DeLisle
|
b26c62714f
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 15:08:21 +02:00 |
|
Pierre Bondoerffer
|
c953e71a18
|
better class generation and remove duplicate class
|
2017-08-04 15:06:58 +02:00 |
|
Caleb James DeLisle
|
4d563af045
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:51:14 +02:00 |
|
Pierre Bondoerffer
|
10e50fc5c7
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:50:44 +02:00 |
|
Pierre Bondoerffer
|
6614f3f0e6
|
put the page class on html element
|
2017-08-04 14:50:35 +02:00 |
|
ansuz
|
96b12d55fb
|
add a return
|
2017-08-04 14:37:21 +02:00 |
|
ansuz
|
b79adf4177
|
redirect to drive if logged in
|
2017-08-04 14:35:47 +02:00 |
|
Caleb James DeLisle
|
a10214ed2a
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 14:19:54 +02:00 |
|
Caleb James DeLisle
|
75c0876500
|
Added ludovic's bio
|
2017-08-04 14:19:44 +02:00 |
|
CatalinScr
|
043ae4280b
|
repaired the menu
|
2017-08-04 15:15:47 +03:00 |
|
CatalinScr
|
250d85bb8a
|
Repaired the menu, clead the code
|
2017-08-04 15:15:35 +03:00 |
|
Pierre Bondoerffer
|
e2ad99ab3c
|
change favicon (again)
|
2017-08-04 14:06:10 +02:00 |
|
Pierre Bondoerffer
|
8831f4f91b
|
new favicons
|
2017-08-04 14:02:53 +02:00 |
|
Pierre Bondoerffer
|
a70c527482
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into front-page
|
2017-08-04 12:32:26 +02:00 |
|
Pierre Bondoerffer
|
4018c7e0a6
|
move alertify stuff
|
2017-08-04 12:31:47 +02:00 |
|
Caleb James DeLisle
|
c274a27dfb
|
Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js
|
2017-08-04 11:33:28 +02:00 |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
2017-08-04 11:20:17 +02:00 |
|
CatalinScr
|
e7d09c1ddb
|
Merge branch 'front-page' of https://git.xwikisas.com/xwiki-labs/cryptpad into front-page
changed the menu
|
2017-08-04 12:16:33 +03:00 |
|
CatalinScr
|
d4ce7d626c
|
Modified the menu
|
2017-08-04 12:16:13 +03:00 |
|
Pierre Bondoerffer
|
f8c7140eec
|
make fonts big
|
2017-08-04 11:10:30 +02:00 |
|
Pierre Bondoerffer
|
f6d45d05f6
|
use logo in toolbar
|
2017-08-04 11:01:26 +02:00 |
|
Pierre Bondoerffer
|
1b83e15796
|
sorry jpg, i forgot you existed
|
2017-08-04 10:49:18 +02:00 |
|
Pierre Bondoerffer
|
5ce7d64b2c
|
add pierre photo
|
2017-08-04 10:30:19 +02:00 |
|
Caleb James DeLisle
|
1b466d250f
|
Add some photos
|
2017-08-03 18:01:48 +02:00 |
|
Caleb James DeLisle
|
5d70dd93b3
|
Manual merge
|
2017-08-03 17:18:03 +02:00 |
|
CatalinScr
|
15fa801bc8
|
work in progress
|
2017-08-03 18:09:25 +03:00 |
|
Caleb James DeLisle
|
bc15ce7de5
|
Manual merge
|
2017-08-03 17:00:46 +02:00 |
|
Caleb James DeLisle
|
52e9ba92fa
|
Update whitepaper link and also change whatis_zeroknowledge
|
2017-08-03 16:23:29 +02:00 |
|
CatalinScr
|
89ab82c0e2
|
Changed the menu, added the logo on top bar
|
2017-08-03 17:19:55 +03:00 |
|
Pierre Bondoerffer
|
ae176b0465
|
about page mockup
|
2017-08-03 15:58:51 +02:00 |
|
Pierre Bondoerffer
|
cdf6345fc1
|
use sign up
|
2017-08-02 17:55:05 +02:00 |
|
Pierre Bondoerffer
|
ddc9c4d070
|
alt favicon pink
|
2017-08-02 17:52:48 +02:00 |
|
ansuz
|
35867001cb
|
add missing messages
|
2017-08-02 17:38:34 +02:00 |
|
Pierre Bondoerffer
|
86bc14e6bb
|
new loading screen
|
2017-08-02 17:19:16 +02:00 |
|
Pierre Bondoerffer
|
304a29e210
|
Improve contact page
|
2017-08-02 16:34:35 +02:00 |
|
Pierre Bondoerffer
|
d6679e8ef3
|
Add screenshots to What is CryptPad
|
2017-08-02 15:53:04 +02:00 |
|
Pierre Bondoerffer
|
b3f3f1dabb
|
Add What is CryptPad keys
|
2017-08-02 14:57:27 +02:00 |
|
Pierre Bondoerffer
|
e2f8c9c5da
|
add logo to topbar
|
2017-08-02 12:37:56 +02:00 |
|
Pierre Bondoerffer
|
8a56029bfe
|
remove useless images
|
2017-08-02 11:56:00 +02:00 |
|
Pierre Bondoerffer
|
ea3a8932be
|
put the content in the right place
|
2017-08-02 11:50:35 +02:00 |
|
Pierre Bondoerffer
|
262a729ef7
|
use proper key name
|
2017-08-02 11:48:30 +02:00 |
|
Pierre Bondoerffer
|
db111257f0
|
Add translations, remove useless functions
|
2017-08-02 11:46:55 +02:00 |
|
Pierre Bondoerffer
|
de23195bd8
|
fix wrong css class
|
2017-08-02 11:26:02 +02:00 |
|
Pierre Bondoerffer
|
ad4aca4e5f
|
actually do the changes intended in previous commit
|
2017-08-02 11:22:52 +02:00 |
|
Pierre Bondoerffer
|
01b2883771
|
Add headers and footers, generate what-is-cryptpad
|
2017-08-02 11:20:07 +02:00 |
|
Pierre Bondoerffer
|
cd0c9cc95a
|
create less templates for info pages
|
2017-08-02 11:08:36 +02:00 |
|
Pierre Bondoerffer
|
f71b082aac
|
remove min-height globally, style footer
|
2017-08-02 11:00:42 +02:00 |
|
Pierre Bondoerffer
|
0fe49d6641
|
oops, sorry, back to 100% height
|
2017-08-01 17:26:47 +02:00 |
|
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 |