Commit Graph

302 Commits (0fe62f8c751bf1b085b654362a4a217ae38379f4)

Author SHA1 Message Date
yflory 91b4446c0b Merge branch 'fix-chrome-style-bug' into soon 2016-10-10 17:07:50 +02:00
ansuz bb2317d8e6 fix chrome style bug by forcing reload of style sheet 2016-10-07 17:41:52 +02:00
yflory 765498e88e Remove the support for old.cryptpad.fr 2016-10-07 10:39:48 +02:00
yflory c322aa440e Fix the username icon hcih was not working anymore 2016-10-05 18:19:52 +02:00
yflory 8575f3f79f Fix the "rename" feature which was not working anymore in some cases 2016-10-05 17:22:56 +02:00
yflory a989b51d74 Fix race conditions with Alertify 2016-10-05 16:04:21 +02:00
yflory 74df38f94f Fix race conditions that could prevent applications from being loaded 2016-10-05 11:19:18 +02:00
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
ansuz 2ac1b02572 Merge branch 'config-sockets' into soon 2016-10-04 14:38:50 +02:00
ansuz 3dfa19b786 more flexible websocket configuration (WIP) 2016-10-03 19:19:38 +02:00
yflory 76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory 17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory 391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
yflory 8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
Yann Flory 2609af2105 Use the CodeMirror editor in the slide application 2016-09-30 17:39:16 +02:00
yflory f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
yflory 3d54413343 Improve the UI with FontAwesome icons 2016-09-27 18:33:03 +02:00
ansuz d6525087c7 jshint compliancy 2016-09-23 17:53:24 +02:00
yflory d46bd1af5c Improve the toolbar UI with the username displayed 2016-09-22 17:56:51 +02:00
yflory 79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
ansuz f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
yflory 83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz fa8199bc75 don't try to use experimental user code 2016-09-20 16:22:00 +02:00
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +02:00
Yann Flory 42f14873cd Merge branch 'translations' into newhashmerge 2016-09-19 14:53:40 +02:00
Yann Flory 391b7690e6 Set the pad to readonly mode when using a 'view' url 2016-09-19 14:52:36 +02:00
Yann Flory 368e253c9f Ability to send a read-only URL 2016-09-16 18:45:40 +02:00
yflory 5c63585952 Complete the French translation 2016-09-15 18:35:09 +02:00
yflory 0d9f63b977 Merge branch 'translations' - part one 2016-09-15 10:36:05 +02:00
yflory f086492e50 Improve the localization system
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
yflory 25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
yflory c736caceba Use a better default pad title 2016-09-13 12:24:06 +02:00
ansuz 97415d8158 Merge branch 'users' 2016-09-01 17:38:25 +02:00
ansuz 8e86be81b2 Merge branch 'better-slides' 2016-09-01 16:01:21 +02:00
ansuz fb21b4e46b fix up /render/ 2016-09-01 15:54:21 +02:00
ansuz 4941c1493e better user integration. a few more common utils 2016-09-01 12:15:30 +02:00
ansuz 30ea1b59b7 integrate users into common utilities 2016-08-30 18:09:53 +02:00
ansuz 6d775f61c6 add missing functions 2016-08-30 10:06:14 +02:00
ansuz 168338b898 add missing functions 2016-08-29 18:10:15 +02:00
ansuz f47a6f1cbb Merge branch 'master' of github.com:xwiki-labs/cryptpad 2016-08-25 17:59:37 +02:00
ansuz f40b798d88 Merge pull request #30 from xwiki-labs/reconnect
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
yflory c168ce2d1c Ability to reconnect after a connection failure 2016-08-25 17:56:17 +02:00
ansuz 1bec02239c coerce dates into strings 2016-08-25 11:19:09 +02:00
ansuz 0add01a940 remove dead code 2016-08-25 11:08:15 +02:00
ansuz 8c914dfe1f better filenames 2016-08-19 10:47:07 +02:00
ansuz 7eaa4ce733 recognize pads with the same type and hash as identical no matter their domain 2016-08-05 17:17:49 +02:00
ansuz 5131f47cca jshint compliance 2016-08-03 17:03:50 +02:00