Commit Graph

3450 Commits (22d754d514354dde0fdb8ee8032d0b850462b936)

Author SHA1 Message Date
ansuz d84487ab49 Merge branch 'master' into staging 2017-08-01 13:54:04 +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
ansuz ace31c952e clear tooltips when redrawing the userlist 2017-08-01 11:51:46 +02:00
ansuz 24436c2c51 clear tooltips when redrawing the userlist 2017-08-01 11:51:43 +02:00
ansuz 35cf23ce2c clear tooltips when redrawing the userlist 2017-08-01 11:50:43 +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 4c6f8d71e1 don't invoke spinner if it does not exist 2017-08-01 11:08:25 +02:00
ansuz 0b69973c17 remove html 2017-08-01 10:32:04 +02:00
ansuz 85cfd4335d correct markdown syntax 2017-08-01 10:31:23 +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
ansuz 311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz 27c94b4437 Merge pull request #161 from pbondoer/language
New FR/ES keys
2017-07-31 16:57:35 +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 1f8449ff65 Merge pull request #139 from dtrv/master
add translations and some improvements
2017-07-31 15:50:03 +02:00
ansuz 411c64df85 Merge branch 'master' into master 2017-07-31 15:49:54 +02:00
ansuz 88c9998565 Merge pull request #159 from c4rl0sc/master
Fixed spelling issues and improved translation quality.
2017-07-31 15:48:13 +02:00
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:45:50 +02:00
ansuz eebe473f13 reenable same-origin CSP 2017-07-31 15:43:47 +02:00
ansuz 542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
Pierre Bondoerffer 93e007b52a
reduce png sizes 2017-07-31 15:11:35 +02:00
ansuz f6125415aa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:07:43 +02:00
ansuz 1c238100c8 don't throw alerts in the middle of someone's presentation 2017-07-31 15:07:34 +02:00
Caleb James DeLisle cd3f29c502 Merge branch 'readme' of git://github.com/pbondoer/cryptpad into staging 2017-07-31 15:00:47 +02:00
Pierre Bondoerffer e655ebd29e
Remove link on README 2017-07-31 14:59:26 +02:00
Pierre Bondoerffer 3f92427fdf
Polish README some mo' 2017-07-31 14:58:14 +02:00
ansuz 7cd42d5ff1 use provided clearTooltips function 2017-07-31 14:52:33 +02:00
Pierre Bondoerffer c26350c057
Improve README 2017-07-31 14:47:54 +02:00
ansuz 3fa010027c implement clearTooltips 2017-07-31 12:29:41 +02:00
ansuz a68a225d79 fix read-only synchronization bug 2017-07-31 12:21:48 +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
ansuz 99d39514a2 turn uploads on by default 2017-07-31 10:20:42 +02:00
Caleb James DeLisle 428bee6306 make links clickable and make more link work 2017-07-26 15:53:10 +02:00
ansuz 9734a4db80 append new items to the top of the todo 2017-07-26 15:37:16 +02:00
ansuz 69eaccbdef don't create empty todo entries 2017-07-26 15:22:25 +02:00
ansuz e84edb2c2b disable problematic tooltips 2017-07-26 13:46:07 +02:00
ansuz 9c07793d0d remove tips on checkbox state change 2017-07-26 13:42:12 +02:00
ansuz ba9cab762c Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 2017-07-26 13:29:33 +02:00
yflory 8e83501c72 Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo 2017-07-26 13:31:02 +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
ansuz d4ffa7903f better popup logic 2017-07-26 13:26:35 +02:00