Commit Graph
55 Commits
Author SHA1 Message Date
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
ansuzandGitHub 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll
Poll fixes
2017-04-13 18:04:13 +02:00
ansuzandGitHub 1cc6eab871 Merge pull request #98 from pbondoer/staging
Spanish update 🇪🇸
2017-03-13 16:36:56 +01:00
ansuzandGitHub f0f94ab180 Merge pull request #95 from pbondoer/staging
Update FR and ES translations
2017-03-02 18:46:36 +01:00
ansuzandGitHub 2c9deed381 Merge pull request #94 from pbondoer/staging
Some CSS fixes
2017-03-02 18:15:30 +01:00
ansuzandGitHub e2acf15ed8 Merge pull request #91 from pbondoer/staging
Spanish translation updated 🎉
2017-02-28 18:49:51 +01:00
ansuzandGitHub fac5a043ca Merge pull request #88 from pbondoer/staging
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
ansuzandGitHub 22f926d3a5 Merge pull request #87 from pbondoer/staging
Assert translation now outputs an easy to edit diff
2017-02-21 15:01:03 +01:00
ansuzandGitHub 2a06b8137e Merge pull request #68 from mateon1/soon
Apply corrections to the Polish translation
2016-12-19 11:17:55 +01:00
ansuzandGitHub 4c5cb79c20 Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
2016-11-07 15:08:49 +01:00
ansuzandGitHub 3ce5b615d9 Merge pull request #57 from xwiki-labs/order-buttons
display buttons according to their order in application_config.js
2016-11-07 14:53:38 +01:00
ansuzandGitHub 65bc6f1a20 Merge pull request #56 from xwiki-labs/soon
Soon
2016-11-07 12:11:34 +01:00
ansuzandGitHub 5c53f172a1 Merge pull request #55 from xwiki-labs/soon
Merge 'soon' into master
2016-10-28 18:02:09 +02:00
ansuzandGitHub 5d9b81ab2f Merge pull request #53 from xwiki-labs/update
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
ansuzandGitHub a98f8944d6 Merge pull request #52 from xwiki-labs/fixTranslations
Fix translations
2016-10-18 14:07:21 +02:00
ansuzandGitHub 8eea58ecdd Merge pull request #51 from xwiki-labs/config-http-headers
Config http headers
2016-10-18 11:54:54 +02:00
ansuzandGitHub f8b65be009 Merge pull request #39 from ochronus/fix-content-type
Using express.static instead of custom handler
2016-09-27 12:19:08 +02:00
ansuzandGitHub 721cb8fed1 Merge pull request #32 from xwiki-labs/files
filesystem storage
2016-09-15 15:10:49 +02:00
ansuzandGitHub f40b798d88 Merge pull request #30 from xwiki-labs/reconnect
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
ansuzandGitHub 8297fbe954 Merge pull request #29 from ktorn/master
clarify how mitm attack is mitigated
2016-08-22 14:38:29 +02:00
ansuz c2b4b1283c Merge pull request #22 from xwiki-labs/two
Two
2016-06-09 15:39:50 +02:00
ansuz bce89b325f Merge pull request #21 from xwiki-labs/remove-channels
Remove empty channels
2016-05-17 14:41:43 +02:00
ansuz 7adc7eef22 Merge pull request #18 from xwiki-labs/integrate
Integrate
2016-04-20 14:16:53 +02:00
ansuz c8dabbd6e7 Merge pull request #17 from xwiki-labs/sortify
Merge pull request #16 from xwiki-labs/beta
2016-04-14 11:15:30 +02:00
ansuz 9a33e7cbf0 Merge pull request #16 from xwiki-labs/beta
Beta
2016-04-14 11:14:23 +02:00
ansuz 7782069dbd Merge pull request #15 from xwiki-labs/diffdom
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
ansuz 4242865abf Merge pull request #5 from ralphtheninja/CMeditor
refactor: pass in ifrw.CodeMirror into andThen()
2016-01-20 11:14:26 +01:00