 ansuzandGitHub
|
70e5532a27
|
Merge pull request #475 from xwiki-labs/fastAuth
Fast auth
|
2019-12-09 08:40:52 -05:00 |
|
|
ansuzandGitHub
|
8879c6b583
|
Merge pull request #474 from xwiki-labs/design_dialogs_passwords
Design dialogs passwords
|
2019-12-09 08:36:21 -05:00 |
|
|
ansuzandGitHub
|
9efceb2234
|
Merge pull request #470 from xwiki-labs/design_dialogs_props
remove // XXX
|
2019-11-25 11:06:10 -05:00 |
|
|
ansuzandGitHub
|
79013b27fe
|
Merge pull request #469 from xwiki-labs/design_dialogs
remove // XXX
|
2019-11-25 10:54:49 -05:00 |
|
|
ansuzandGitHub
|
8ae6ec09be
|
Merge pull request #448 from promasu/447-update-base-image-of-docker
Bump NodeJS version to 10 to fix #447
|
2019-09-24 10:09:52 +02:00 |
|
|
ansuzandGitHub
|
2aa94ca965
|
Merge pull request #437 from zertrin/patch-1
Fix link to Docker wiki page on readme.md
|
2019-09-02 10:14:38 +02:00 |
|
|
ansuzandGitHub
|
30671cd570
|
Merge pull request #430 from ClemDee/responsiveContextMenu
Make context submenus don't overflow on Y axis
|
2019-08-20 13:45:21 +02:00 |
|
|
ansuzandGitHub
|
08e9080dec
|
Merge pull request #428 from xwiki-labs/folderToSF
Folder to sf
|
2019-08-19 12:12:22 +02:00 |
|
|
ansuzandGitHub
|
32fa527dc9
|
Merge pull request #427 from xwiki-labs/exportFolder
Export folder
|
2019-08-16 15:02:02 +02:00 |
|
|
ansuzandGitHub
|
628b8866cb
|
Merge pull request #426 from xwiki-labs/responsiveContextmenu
Responsive contextmenu
|
2019-08-12 15:31:54 +02:00 |
|
|
ansuzandGitHub
|
0de0d46dd3
|
Merge pull request #425 from xwiki-labs/fixTippyInWhiteboard
Fix tippy in whiteboard
|
2019-08-12 14:27:17 +02:00 |
|
|
ansuzandGitHub
|
ecffe23c08
|
Merge pull request #424 from xwiki-labs/fixSharingSettings
Fix edit mode not default for url in drive share modal
|
2019-08-12 11:12:35 +02:00 |
|
|
ansuzandGitHub
|
c76c3130cb
|
Merge pull request #423 from xwiki-labs/downloadFilesFromPad
Download files from pad
|
2019-08-12 10:55:42 +02:00 |
|
|
ansuzandGitHub
|
da3763a14b
|
Merge pull request #422 from xwiki-labs/contextmenuIconsEverywhere
Contextmenu icons everywhere
|
2019-08-12 10:52:07 +02:00 |
|
|
ansuzandGitHub
|
2329b49678
|
Merge pull request #419 from xwiki-labs/readPlainTextFiles
Read plain text files
|
2019-08-08 17:53:03 +02:00 |
|
|
ansuzandGitHub
|
592df7e152
|
Merge pull request #418 from xwiki-labs/cryptDriveStuff
Crypt drive stuff
|
2019-08-08 17:27:31 +02:00 |
|
|
ansuzandGitHub
|
4e02135230
|
Merge pull request #417 from xwiki-labs/stripTag
Strip tags
|
2019-08-08 17:23:17 +02:00 |
|
|
ansuzandGitHub
|
20815eb725
|
Merge pull request #416 from xwiki-labs/dontClickMoreThanOnceOnTheStorePadInDriveButton
Dont click more than once on the store pad in drive button
|
2019-08-08 17:22:11 +02:00 |
|
|
ansuzandGitHub
|
24da4d8fc8
|
Merge pull request #415 from xwiki-labs/chatMarkdown
Chat markdown
|
2019-08-08 17:18:18 +02:00 |
|
|
ansuzandGitHub
|
b46f5cc1b9
|
Merge pull request #414 from xwiki-labs/fixSpinner
Change loading spinner to custom spinner
|
2019-08-08 15:55:53 +02:00 |
|
|
ansuzandGitHub
|
1a8460aa11
|
Merge pull request #413 from xwiki-labs/driveHorizontalScrollbar
Fix horizontal scrollbar in drive
|
2019-08-08 15:54:21 +02:00 |
|
|
ansuzandGitHub
|
c66e1f02c2
|
Merge pull request #412 from xwiki-labs/downloadFiles
Download files
|
2019-08-08 15:35:09 +02:00 |
|
|
ansuzandGitHub
|
a9445155c9
|
Merge pull request #411 from xwiki-labs/cursorJsColor
Cursor js color
|
2019-08-08 15:04:08 +02:00 |
|
|
ansuzandGitHub
|
1fe2d39385
|
Merge pull request #410 from xwiki-labs/ctrlE
Change ctrl+E default modal to new-pad modal in drive
|
2019-08-08 14:35:40 +02:00 |
|
|
ansuzandGitHub
|
19932e309c
|
Merge pull request #409 from xwiki-labs/codemirrorStuff
Fix indent behaviour of Codemirror
|
2019-08-08 13:37:47 +02:00 |
|
|
ansuzandGitHub
|
6c10210d29
|
Merge pull request #393 from xwiki-labs/foldersColor
Folders color
|
2019-06-19 15:10:53 +02:00 |
|
|
ansuzandGitHub
|
e7b65c5fca
|
remove duplicated word
|
2019-06-04 14:20:13 +02:00 |
|
|
ansuzandGitHub
|
416a4a2446
|
address some issues in the readme's team section
|
2019-06-04 14:17:34 +02:00 |
|
|
ansuzandGitHub
|
4c18289b40
|
Merge pull request #347 from BundesIT/slim-docker
optimize Dockerfile
|
2019-06-03 17:23:56 +02:00 |
|
|
ansuzandGitHub
|
961d385895
|
Merge pull request #373 from zimbatm/nix-packaging
Nix packaging
|
2019-06-03 10:34:49 +02:00 |
|
|
ansuzandGitHub
|
6041e1ae7c
|
Merge pull request #367 from adlerweb/patch-1
cryptpad-docker: Missing \
|
2019-06-03 10:32:48 +02:00 |
|
|
ansuzandGitHub
|
e7b0cec121
|
Fix broken link to weblate documentation
|
2019-05-29 13:52:32 +02:00 |
|
|
ansuzandGitHub
|
8e17d582f9
|
Update CODE_OF_CONDUCT.md
|
2019-04-17 13:14:48 +02:00 |
|
|
ansuzandGitHub
|
84e9c9e538
|
Merge pull request #346 from mcrosson/fix-docker-volumes
Add 2 missing volumes for blobs
|
2019-03-19 16:17:05 +01:00 |
|
|
ansuzandGitHub
|
709c652e65
|
rewrite translation guide
thanks @yflory
|
2019-03-07 15:06:16 +01:00 |
|
|
ansuzandGitHub
|
1633f49fe0
|
Merge pull request #314 from promasu/staging
Started reworking the German translation file
|
2019-01-31 05:33:11 +01:00 |
|
|
ansuzandGitHub
|
f5e0a5dc27
|
Merge pull request #312 from mcrosson/refactor-multiarch-docker
Multi arch docker file
|
2019-01-21 16:46:22 +01:00 |
|
|
ansuzandGitHub
|
6457d2219e
|
Merge pull request #309 from promasu/patch-3
Made CSP syntax in nginx example conf valid
|
2019-01-07 17:06:46 +01:00 |
|
|
ansuzandGitHub
|
9eaa03092f
|
Merge pull request #305 from interfect/patch-1
Update documentation for Docker usage
|
2018-12-17 10:34:43 +01:00 |
|
|
ansuzandGitHub
|
ef08771ffa
|
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
|
2018-10-29 12:11:16 +01:00 |
|
|
ansuzandGitHub
|
a17235dd7e
|
Merge pull request #283 from yannicka/master
Update French translation
|
2018-10-08 11:25:09 -04:00 |
|
|
ansuzandGitHub
|
8be1c6968c
|
Merge pull request #280 from ryanpcmcquen/patch-1
Typo fix: additionnal => additional
|
2018-10-05 10:22:18 -04:00 |
|
|
ansuzandGitHub
|
90c905827d
|
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
|
2018-10-05 10:22:03 -04:00 |
|
|
ansuzandGitHub
|
cb87f49b1f
|
Merge pull request #271 from Nordgedanken/fix-#254
[WIP] Partially Fix #254
|
2018-09-19 09:09:55 -04:00 |
|
|
ansuzandGitHub
|
a28193c4d0
|
Merge pull request #273 from b3yond/master
Changed the description for autostore settings (en/de)
|
2018-09-10 18:50:38 -04:00 |
|
|
ansuzandGitHub
|
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.
|
2018-08-14 17:32:16 +02:00 |
|
|
ansuzandGitHub
|
bcb8e7e573
|
Merge pull request #268 from Wikinaut/patch-1
Update readme.md
|
2018-08-14 14:45:08 +02:00 |
|
|
ansuzandGitHub
|
a773e0c44c
|
Merge pull request #265 from atallahade/fix-typo
Fix an anchor link in the readme file
|
2018-08-07 11:54:56 +02:00 |
|
|
ansuzandGitHub
|
2950f5f679
|
Merge pull request #259 from mcrosson/docker-fix-storage-var
Minor Dockerfile updates/fixes
|
2018-07-17 10:54:14 +02:00 |
|
|
ansuzandGitHub
|
c180fd9a2a
|
Merge pull request #258 from mcrosson/docker-arm64-support
Add Dockerfile for arm64 support
|
2018-07-17 10:53:31 +02:00 |
|
|
ansuzandGitHub
|
7f01694f89
|
Merge pull request #257 from mcrosson/docker-bust-cache-on-run
Update docker start script to bust the cache on each run
|
2018-07-17 10:52:53 +02:00 |
|
|
ansuzandGitHub
|
c85a551546
|
Merge pull request #249 from xwiki-labs/de-translation-pl
Translating one extra line.
|
2018-06-28 13:30:23 +02:00 |
|
|
ansuzandGitHub
|
9f9664eba1
|
Merge pull request #247 from CatalinScr/master
Repaired some responsive issues on about page, contact and features
|
2018-06-13 13:52:17 +02:00 |
|
|
ansuzandGitHub
|
6d6af30763
|
Merge pull request #238 from xshadow/CHANGELOG_for_1_29_0
added changelog.md with version tag and current changes
|
2018-04-23 12:07:58 +02:00 |
|
|
ansuzandGitHub
|
f324d33723
|
Merge pull request #234 from sairim/patch-2
Fix broken FAQ link
|
2018-03-21 11:03:58 +01:00 |
|
|
ansuzandGitHub
|
50adcc791c
|
Merge pull request #231 from sairim/patch-1
Update readme.md
|
2018-02-26 13:56:51 +01:00 |
|
|
ansuzandGitHub
|
5cc1b3c779
|
Merge pull request #229 from neuhaus/patch-1
add license to package.json
|
2018-02-22 14:11:31 +01:00 |
|
|
ansuzandGitHub
|
7cc4cca846
|
Merge branch 'master' into patch-1
|
2018-02-22 14:05:13 +01:00 |
|
|
ansuzandGitHub
|
8f7489576f
|
Merge pull request #228 from fvn-linagora/PR-logout-page
add a logout page
|
2018-02-12 16:33:07 +01:00 |
|
|
ansuzandGitHub
|
99b509b229
|
Merge pull request #227 from nparquet/fix-mainpages
Fixed customization of main pages
|
2018-02-12 10:36:25 +01:00 |
|
|
ansuzandGitHub
|
89ab37f1bf
|
Merge pull request #222 from kpcyrd/docker-fix
Fix docker build
|
2018-01-25 14:56:03 +01:00 |
|
|
ansuzandGitHub
|
ffa392a7e2
|
Merge pull request #221 from ryanpcmcquen/patch-1
Fix Org mode regex.
|
2018-01-22 10:44:33 +01:00 |
|
|
ansuzandGitHub
|
7ff02fdf03
|
Merge pull request #213 from Falgn0n/patch-1
Update example.nginx.conf
|
2018-01-02 12:09:14 +01:00 |
|
|
ansuzandGitHub
|
d571f408d8
|
Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
|
2017-10-23 11:46:56 +02:00 |
|
|
ansuzandGitHub
|
8590cf3f75
|
Merge pull request #189 from yannicka/patch-1
Update French translation
|
2017-10-23 11:46:15 +02:00 |
|
|
ansuzandGitHub
|
253e92fe33
|
Merge pull request #184 from sssemil/patch-1
Add dots
|
2017-10-11 11:01:18 +02:00 |
|
|
ansuzandGitHub
|
4242f35b51
|
Merge pull request #181 from genma/master
Cryptad version in Readme.md added
|
2017-10-10 13:27:38 +02:00 |
|
|
ansuzandGitHub
|
2aa6458039
|
Merge pull request #177 from xshadow/xshadow-cryptpad-readme-ansible
Updated Readme.md with hint for ansible setup
|
2017-09-05 10:11:34 +02:00 |
|
|
ansuzandGitHub
|
8f03919fd7
|
Merge pull request #171 from CatalinScr/master
Changed the social media links for Pierre
|
2017-08-18 15:26:24 +02:00 |
|
|
ansuzandGitHub
|
a5cd915b06
|
Merge pull request #170 from pbondoer/caps
Use CryptPad everywhere instead of Cryptpad in titles
|
2017-08-18 10:10:52 +02:00 |
|
|
ansuzandGitHub
|
23ce2ed674
|
Merge pull request #166 from coldfix/master
Properly escape sed match/replace expressions
|
2017-08-10 11:43:36 +02:00 |
|
|
ansuzandGitHub
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
2017-08-08 14:46:25 +02:00 |
|
|
ansuzandGitHub
|
27c94b4437
|
Merge pull request #161 from pbondoer/language
New FR/ES keys
|
2017-07-31 16:57:35 +02:00 |
|
|
ansuzandGitHub
|
1f8449ff65
|
Merge pull request #139 from dtrv/master
add translations and some improvements
|
2017-07-31 15:50:03 +02:00 |
|
|
ansuzandGitHub
|
411c64df85
|
Merge branch 'master' into master
|
2017-07-31 15:49:54 +02:00 |
|
|
ansuzandGitHub
|
88c9998565
|
Merge pull request #159 from c4rl0sc/master
Fixed spelling issues and improved translation quality.
|
2017-07-31 15:48:13 +02:00 |
|
|
ansuzandGitHub
|
76e69f0ba8
|
Merge pull request #127 from gustavohmsilva/master
Merged translated and non-translated in pt-BR
|
2017-07-22 16:07:44 +02:00 |
|
|
ansuzandGitHub
|
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 |
|
|
ansuzandGitHub
|
6d1e785a4b
|
Merge pull request #158 from MacLemon/improve-german-localisation
Translated missing out.presentSuccess to german
|
2017-07-22 15:58:17 +02:00 |
|
|
ansuzandGitHub
|
b2de6ac28e
|
Merge pull request #156 from pbondoer/spanish
Spanish update
|
2017-07-18 10:55:03 +02:00 |
|
|
ansuzandGitHub
|
6f7c60bf12
|
Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
|
2017-07-07 17:17:30 +02:00 |
|
|
ansuzandGitHub
|
8f32809d99
|
Merge pull request #152 from evalica/151
Issue #151: Spacing between "Log-in" and "Register" buttons
|
2017-07-07 17:16:56 +02:00 |
|
|
ansuzandGitHub
|
377f9625b5
|
Merge pull request #148 from pbondoer/master_spanish
Spanish update
|
2017-07-06 10:43:42 +02:00 |
|
|
ansuzandGitHub
|
3d2e628e57
|
Merge pull request #144 from irregulator/master
Fix readme cryptpad-docker doc link
|
2017-07-06 10:02:42 +02:00 |
|
|
ansuzandGitHub
|
1046a8e302
|
Merge pull request #141 from MacLemon/reduce-image-asset-size
Optimize image assets to speedup page loading
|
2017-06-28 11:40:24 +02:00 |
|
|
ansuzandGitHub
|
499087fd52
|
Merge pull request #137 from pbondoer/spanish
Spanish update
|
2017-06-19 15:37:06 +02:00 |
|
|
ansuzandGitHub
|
5fd4870b8b
|
Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
|
2017-06-19 15:36:35 +02:00 |
|
|
ansuzandGitHub
|
8a599eb9b1
|
Merge pull request #136 from blumeva/staging
change minimum opacity
|
2017-06-13 15:27:45 +02:00 |
|
|
ansuzandGitHub
|
ea79294494
|
Merge pull request #134 from pbondoer/newpoll
More poll improvements
|
2017-06-13 14:32:46 +02:00 |
|
|
ansuzandGitHub
|
88c2c0afde
|
Merge pull request #135 from blumeva/staging
Staging
|
2017-06-13 14:23:41 +02:00 |
|
|
ansuzandGitHub
|
70fea0467a
|
Merge pull request #133 from pbondoer/spanish
Update spanish
|
2017-06-09 17:56:29 +02:00 |
|
|
ansuzandGitHub
|
a15ef44a12
|
Merge pull request #126 from pbondoer/spanish
Spanish new keys
|
2017-05-29 18:55:04 +02:00 |
|
|
ansuzandGitHub
|
41a8604cb8
|
Merge pull request #122 from superniko/patch-2
Update messages.ro.js
|
2017-05-29 10:48:24 +02:00 |
|
|
ansuzandGitHub
|
e8275c02c6
|
Merge pull request #115 from pbondoer/spanish
Spanish update
|
2017-05-16 14:23:06 +02:00 |
|
|
ansuzandGitHub
|
31c59068d4
|
Merge pull request #114 from realitygaps/master
Adding a warning and header to delete/reset docs
|
2017-05-09 10:11:36 +02:00 |
|
|
ansuzandGitHub
|
e40203480f
|
Merge pull request #113 from pbondoer/staging
Update spanish
|
2017-04-24 16:09:53 +02:00 |
|
|
ansuzandGitHub
|
ee99310e99
|
Merge pull request #112 from xwiki-labs/jquery-require2
Jquery require2
|
2017-04-18 12:18:31 +02:00 |
|
|
ansuzandGitHub
|
853e9782e0
|
Merge pull request #111 from pbondoer/spanish
Spanish pinpad
|
2017-04-14 18:43:08 +02:00 |
|
|
ansuzandGitHub
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
2017-04-13 19:43:30 +02:00 |
|
|
ansuzandGitHub
|
4c7022ade9
|
Merge pull request #109 from pbondoer/spanish
Espanol!
|
2017-04-13 18:10:35 +02:00 |
|