Commit Graph

1008 Commits (7537caf8fea9ad7d455fc9e97c57ac83cb3b5e37)

Author SHA1 Message Date
yflory 6ddfe0e901 Fix new lines in /pad userlist 2017-05-23 12:14:31 +02:00
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 18:43:14 +02:00
yflory d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz 2ca6277660 enable pin limits by default 2017-05-22 16:50:32 +02:00
yflory c45f08f147 Use a download button instead of downloading a file automatically 2017-05-22 11:43:45 +02:00
yflory 0c2f84058b Improve css for the file app 2017-05-22 11:16:01 +02:00
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 10:41:55 +02:00
yflory 538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
ansuz af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 2017-05-19 18:41:34 +02:00
ansuz ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz e7a458295b new translation keys for file upload 2017-05-19 09:10:36 +02:00
yflory 814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
yflory 21f9e31e75 Add a placeholder for the user app 2017-05-18 15:56:35 +02:00
yflory 620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
ansuz 3ba94a1ba2 correctly set release version number 2017-05-18 14:54:02 +02:00
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 14:27:10 +02:00
yflory d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +02:00
ansuz 4debec39bb update footer with next release codename and corrected matrix link 2017-05-18 12:58:49 +02:00
ansuz 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:33:34 +02:00
ansuz 81af9225fc template a Romanian translation 2017-05-16 14:32:54 +02:00
ansuz e8275c02c6 Merge pull request #115 from pbondoer/spanish
Spanish update
2017-05-16 14:23:06 +02:00
Pierre Bondoerffer ad6217f064
file upload spanish keys 2017-05-16 14:05:36 +02:00
ansuz 827233dcba new translation keys for file upload 2017-05-16 14:01:06 +02:00
yflory dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
yflory 716245f864 Make all the buttons look the same 2017-05-15 16:16:50 +02:00
yflory 0f37d9def7 Change the button font size in the toolbar 2017-05-15 14:53:51 +02:00
yflory 48496416e7 Use the same font-size for all the toolbar buttons 2017-05-15 14:46:17 +02:00
yflory 03274c3776 Display an info message in the anonymous drive 2017-05-15 13:54:03 +02:00
Pierre Bondoerffer ad5e18f558
Spanish update 2017-05-15 12:05:50 +02:00
yflory 601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 2017-05-11 10:58:33 +02:00
yflory 5a21be8112 Improve UI on mobile 2017-05-10 15:54:09 +02:00
yflory ca6f910f0b Add french translations for 'log out everywhere' 2017-05-09 10:32:41 +02:00
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +02:00
yflory 6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz 6909f663b6 modify 'log out everywhere' text 2017-05-05 15:18:32 +02:00
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
ansuz c07d3e6162 update version strings for upcoming release 2017-05-05 11:51:41 +02:00
ansuz 3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +02:00
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:16:16 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:08:21 +02:00
yflory a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
ansuz 410a9dfb17 temporary solution for testing pin limits 2017-05-04 11:20:52 +02:00
yflory ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
yflory f414d480a9 Add the history mode to the CryptDrive 2017-04-28 18:23:41 +02:00
yflory 16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory 0ee228666b Replace the IRC link by the Matrix one 2017-04-28 12:40:39 +02:00
yflory ab1dc48b6d Fix the 'limit reached' icon in the pad app 2017-04-28 12:32:49 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
yflory f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory 9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
ansuz e40203480f Merge pull request #113 from pbondoer/staging
Update spanish
2017-04-24 16:09:53 +02:00
ansuz a5ca461a73 update footer for new version 2017-04-24 15:41:29 +02:00
Pierre Bondoerffer ba407322e8
Update spanish 2017-04-24 15:16:30 +02:00
yflory 3e28d1b966 Add a missing key in the french translation 2017-04-24 14:41:55 +02:00
yflory 9abfadb32f Update french translation 2017-04-24 14:39:30 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
yflory 92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz 8f352c8433 add justify plugin to default ckeditor config 2017-04-18 15:49:31 +02:00
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
Pierre Bondoerffer 7a05462eb3
Some more poll changes <3 2017-04-14 19:34:58 +02:00
ansuz 50793f506d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-14 18:44:20 +02:00
yflory 43c045721c Get the channel history 2017-04-14 18:36:36 +02:00
ansuz eed5b1260d set font-size label to match other ckeditor font sizes 2017-04-14 18:20:40 +02:00
Pierre Bondoerffer 0db603f580
spanish pinpad 2017-04-14 17:59:08 +02:00
ansuz 84dd879abb add messages for settings page 2017-04-14 17:22:00 +02:00
ansuz 4c7022ade9 Merge pull request #109 from pbondoer/spanish
Espanol!
2017-04-13 18:10:35 +02:00
ansuz 5a7eea08c8 Merge pull request #108 from pbondoer/newpoll
Poll fixes
2017-04-13 18:04:13 +02:00
Pierre Bondoerffer 65e848fd4d
linter linted the lints 2017-04-13 17:50:28 +02:00
Pierre Bondoerffer 40c06c4515
Spanish! 2017-04-13 17:42:38 +02:00
yflory 3e421c7289 Fix lint errors in ckeditor config 2017-04-13 17:09:35 +02:00
yflory 2ad0a65b71 Remove shortcuts that override browser actions 2017-04-13 16:43:07 +02:00
Pierre Bondoerffer f11cf8e6ac
move poll styles to separate file 2017-04-13 14:14:12 +02:00
ansuz cde9ea9887 update footer version 2017-04-10 18:09:22 +02:00
yflory d5e69653c0 Select opacity in draw mode in the canvas app 2017-04-10 17:03:50 +02:00
yflory cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory 63a130c678 Add a button to delete the selection in canvas 2017-04-10 11:55:39 +02:00
yflory 84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 2017-04-07 17:24:25 +02:00
yflory a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-07 14:54:13 +02:00
yflory dedf2b3c69 Display selected color and button to turn off draw mode in canvas 2017-04-07 14:54:02 +02:00
ansuz 2ecabbe6e3 add brown and pink to the palette 2017-04-06 19:05:06 +02:00
ansuz 6e1ffcc18d define better color palette 2017-04-06 18:45:40 +02:00
yflory 46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +02:00
ansuz fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging 2017-04-05 10:36:23 +02:00
Gustavo H M Silva 90612bc5ba Update messages.pt-br.js 2017-04-03 18:43:30 -03:00
ansuz 5a85e4464c fix poor visibility on green pencils 2017-03-30 18:05:08 +02:00
ansuz 7908f3b4f0 make sure green UI elements use the same green 2017-03-30 15:50:06 +02:00
ansuz 36b02d71f5 add ckeditor indentblock plugin.
closes #101
2017-03-30 10:55:22 +02:00
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 2017-03-29 16:02:04 +02:00
ansuz 364dae2882 update templated html 2017-03-29 12:56:08 +02:00
ansuz a3a0592e5e add English and French keys for the whiteboard app 2017-03-29 11:54:46 +02:00
ansuz 6186953a12 make whiteboard a default app 2017-03-29 11:54:19 +02:00
ansuz df7363f416 regenerate templated files for new footer 2017-03-28 11:50:42 +02:00
ansuz b50b76bf81 remove unnecessary lines 2017-03-27 18:13:21 +02:00
yflory d92a875ce5 Translate the 'wrong application' error message 2017-03-27 11:34:54 +02:00
ansuz 69edce5491 remove unused translation keys 2017-03-27 11:29:19 +02:00
yflory 53c60a31f6 Set the properties and backup inputs to read-only in the drive 2017-03-27 11:14:37 +02:00
yflory ff60dd4399 Translate settings_publicSigningKey in french 2017-03-27 10:32:13 +02:00
ansuz b176426213 increase default ckeditor font size to 16px 2017-03-24 14:55:29 +01:00
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 2017-03-24 14:26:36 +01:00
ansuz d1c32ea1f8 define english, french, and spanish labels for whiteboard app 2017-03-23 16:50:37 +01:00
ansuz f301592a83 Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish 2017-03-20 18:08:08 +01:00
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +01:00
ansuz ef0e1d7aa0 add a non-breaking space to pad initialState 2017-03-20 18:05:07 +01:00
yflory 29174b2922 Update the lag icon 2017-03-20 16:39:33 +01:00
yflory 26edb77cf0 Fix style and usability issues in slides 2017-03-20 15:20:42 +01:00
Pierre Bondoerffer 0efb3c993c
fixed lint :( 2017-03-17 18:10:37 +01:00
yflory 45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
Pierre Bondoerffer 3c60ebcc97
Update Spanish 2017-03-17 18:02:48 +01:00
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 2017-03-17 15:30:27 +01:00
yflory 7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
ansuz 5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:38 +01:00
ansuz 0a6373852e add signing keys to user object at login and register time 2017-03-15 18:57:13 +01:00
yflory 0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +01:00
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
ansuz dcc4e0dc6b remove extraneous translation 2017-03-14 14:35:27 +01:00
ansuz 805e26bc07 add a version footer to main pages 2017-03-14 14:34:13 +01:00
yflory f10149db1c Make sure the tip is always visible when the loading screen is removed 2017-03-14 12:49:22 +01:00
yflory bc35fc86cf Translate the 'alreadyRegistered' error in french 2017-03-14 12:42:00 +01:00
ansuz 71db08eac2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-14 12:40:25 +01:00
ansuz fcbe3a5224 add already registered message to english translation 2017-03-14 12:40:19 +01:00
yflory 36a2eab3c3 Add French translation for the new register process 2017-03-14 12:05:12 +01:00
ansuz 11ff3f5347 new styles for alertify dialogs 2017-03-14 12:02:12 +01:00
ansuz bbe2279b9c add new translations for registration 2017-03-14 11:02:14 +01:00
ansuz 10bb11bff6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 19:32:15 +01:00
ansuz 0d30a1e00f add safe and danger classes to alertify styles 2017-03-13 19:32:10 +01:00
Pierre Bondoerffer 3ad8b4023d
Spanish update 🇪🇸 2017-03-13 15:50:20 +01:00
yflory e761dc27c2 French translation for feedback 2017-03-13 13:04:55 +01:00
ansuz a16e6850d4 add translation keys for the feedback page 2017-03-13 12:54:59 +01:00
yflory c00010177d Add tips in the loading screen 2017-03-13 12:41:15 +01:00
ansuz 95a51e8fe4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 12:16:06 +01:00
ansuz ff3641134f update pad initialState 2017-03-13 12:16:01 +01:00
yflory 275900f5ff Translate new initial states for pad and code 2017-03-13 12:15:53 +01:00
yflory 4a762fec99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-13 11:53:24 +01:00
yflory ca9faa0056 Fix wrong translation keys 2017-03-13 11:52:48 +01:00
ansuz 1178660815 update code initialState string 2017-03-13 11:52:33 +01:00
yflory 2e418c1723 When the browser returns a regional language, check if the language code is available 2017-03-10 17:03:30 +01:00
yflory f94db93897 Improve the slides layout in print mode 2017-03-10 16:46:36 +01:00
yflory 2392167996 Export slides as PDF 2017-03-09 19:05:44 +01:00
yflory 404fa378e6 Move the store to the 'common' folder, it is not customizable anymore 2017-03-08 16:47:38 +01:00
yflory a8d200ef2e Don't redirect until realtime is synced when logging in 2017-03-08 16:15:31 +01:00
yflory 4206382865 Fix the settings app to allow backup for unregistered users 2017-03-08 14:45:39 +01:00
yflory d93a270336 Ability to display tips in the loading screen 2017-03-06 17:20:09 +01:00
yflory 77d09f64e1 Display anonymous users in the user list 2017-03-06 14:56:41 +01:00
yflory cb88227e2b Autocomplete on key press in some dropdown menus 2017-03-06 12:20:23 +01:00
yflory f61f284e44 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-03 18:14:59 +01:00
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 2017-03-03 18:14:53 +01:00
ansuz 6e72c6a51b remove unused dependencies 2017-03-03 17:15:33 +01:00
Pierre Bondoerffer 616d265b8d
Remove unused French keys 2017-03-02 18:43:06 +01:00
Pierre Bondoerffer 30faef613a
Update Spanish 2017-03-02 18:41:14 +01:00
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:44:29 +01:00
Pierre Bondoerffer e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:09:39 +01:00
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 2017-03-02 17:09:06 +01:00
ansuz c884782d57 here are some changes 2017-03-02 17:08:50 +01:00
yflory 2b6e44189d When trying to reset the drive, tell the user if the input text is invalid 2017-03-02 17:01:27 +01:00
Pierre Bondoerffer e8a82c4c10
(CSS) Toolbar buttons are now always black on white independent of system theme 2017-03-02 16:35:30 +01:00
Pierre Bondoerffer fa59f1000e
(CSS) Fix title input in pads 2017-03-02 16:33:17 +01:00
yflory 2b20eef464 Fix userlist in /pad 2017-03-02 12:28:01 +01:00
ansuz e3f26263f4 remove red outline on images in slide 2017-03-02 11:28:20 +01:00
ansuz c9040997d5 Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2 2017-03-02 11:07:17 +01:00
yflory 8bdc8415ab Find a pad in the drive 2017-03-02 10:15:13 +01:00
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
ansuz 9800f036c5 fix a typo 2017-03-01 17:06:18 +01:00
ansuz 84a4a15c46 fix inverted checkbox description 2017-02-28 18:58:20 +01:00
Pierre Bondoerffer f11b03c16e
Spanish translation updated 🎉 2017-02-28 18:47:58 +01:00
yflory f130fd0598 Fix horizontal scrollbar in edge 2017-02-28 18:02:12 +01:00
yflory 345d2faab2 Fix horizontal scrollbar in Edge #3 2017-02-28 17:13:51 +01:00
yflory d683dc499a Fix horizontal scrollbar in Edge #2 2017-02-28 17:03:23 +01:00
yflory 7a0a87bf6c Fix horizontal scrollbar in Edge 2017-02-28 16:38:51 +01:00
ansuz 3bf85b113c don't hide overflow, that causes worse problems 2017-02-28 16:37:34 +01:00
yflory 65202bd619 Fix french translation with the drive readme 2017-02-28 15:02:11 +01:00
ansuz 3380b13c95 remove horizontal scroll on edge 2017-02-28 12:29:53 +01:00
ansuz 10c41369de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 12:25:40 +01:00
ansuz 8c87255267 remove any mention of piwik 2017-02-28 12:25:31 +01:00
yflory 8007f51655 Update french translation 2017-02-28 12:01:32 +01:00
yflory 1c7561f37e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 11:51:23 +01:00
yflory 6967b67485 Update french translation suing new best practices 2017-02-28 11:51:18 +01:00
ansuz 569d25f25f update some translation keys in English 2017-02-28 11:50:07 +01:00
ansuz b87c9d4ba6 fix merge conflicts with usability branch 2017-02-28 11:35:29 +01:00
ansuz 5a49e276b5 add settings_anonymous key 2017-02-28 11:32:14 +01:00
yflory 4f4075ed6e Make the settings app available to anonymous users 2017-02-28 11:23:50 +01:00
ansuz 69b6f80e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-28 10:47:23 +01:00
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +01:00
yflory 96f6b5755d Add the blog link in the header and footer 2017-02-28 10:39:48 +01:00
yflory ccd195d318 Translate user feedback keys in french 2017-02-28 10:28:07 +01:00
ansuz 9a2ed5741a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 20:11:26 +01:00
ansuz a4913f2f4b provide UI for disabling the user feedback api 2017-02-27 20:11:18 +01:00
yflory 20518a3e88 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 17:23:40 +01:00
yflory f8d653406a Add the new content for the default pad and add french translation 2017-02-27 17:23:28 +01:00
ansuz d15a08830e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-27 14:32:04 +01:00
ansuz 06f0891d21 add allowUserFeedback toggle to settigs page 2017-02-27 14:31:56 +01:00
ansuz 4941674cf7 initialize allowUserFeedback to true if it is not defined 2017-02-27 14:31:00 +01:00
yflory 95853debf9 Update the default pad #1 2017-02-27 14:29:48 +01:00
yflory 38893fb8e5 Remove the 'Bootstart tooltips require Tether' error 2017-02-27 11:19:29 +01:00
yflory 3fd5669647 Hide the trash icon for read-only pads if we have the edit link in drive 2017-02-24 16:51:15 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
ansuz 9ccb473b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into usability 2017-02-24 12:06:17 +01:00
ansuz 252fc7a640 uppercase messages 2017-02-24 11:52:21 +01:00
ansuz 20689b1dec update english translation for usability feedback 2017-02-23 16:11:39 +01:00
yflory 2d30393243 Add support for updated translation key 2017-02-23 11:45:00 +01:00
ansuz f168433db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 17:41:06 +01:00
ansuz d0b7576d84 make slide present mode exit button clickable at all sizes 2017-02-22 17:40:44 +01:00
yflory bdc00a2413 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-22 12:25:48 +01:00
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz 1494387c9f ignore a line for jshint 2017-02-22 11:17:12 +01:00
yflory e73b4a1131 Don't display 'All files' in the menu 2017-02-22 11:15:29 +01:00
ansuz 33e2c8676e assign updated key to what it should actually be 2017-02-22 11:15:25 +01:00
ansuz 641c805518 unbreak ckeditor 2017-02-21 18:59:42 +01:00
ansuz fac5a043ca Merge pull request #88 from pbondoer/staging
Update Spanish translation 🇪🇸
2017-02-21 18:54:09 +01:00
yflory e5179a1b3f Translate pad initial state in french 2017-02-21 18:48:01 +01:00
Pierre Bondoerffer 328e3e71d9
Some UI fixes for Spanish 2017-02-21 18:47:32 +01:00
yflory 2e378564d0 Make the 'pad' initial state translatable 2017-02-21 18:43:26 +01:00
ansuz c0989f64fa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 18:21:39 +01:00
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
yflory 81fbe0fdd1 Add back some translation keys that shouldn't have been removed 2017-02-21 18:21:11 +01:00
Pierre Bondoerffer f08d43d2a0
Slight fixup 2017-02-21 18:02:12 +01:00
Pierre Bondoerffer fc2aac2d1b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-02-21 18:00:27 +01:00
Pierre Bondoerffer 1438f6b84b
Update Spanish translation 🇪🇸 2017-02-21 17:56:02 +01:00
ansuz ed19c6885d join array in messages.js 2017-02-21 17:16:56 +01:00
yflory 20b08a7847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-21 14:16:35 +01:00
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
ansuz 5276dac7cc safely handle keys which aren't strings 2017-02-21 12:29:47 +01:00
yflory b55ded454b Update README #2 2017-02-21 11:13:10 +01:00
yflory f17b84d7e9 Update README about translations 2017-02-21 11:11:38 +01:00
yflory 3b71c8b0b5 Missing translations are now returned as an array of arrays 2017-02-21 10:53:30 +01:00
yflory 11d9c9e813 Merge branch 'master' into staging 2017-02-21 10:44:03 +01:00
yflory 454d1c2052 Do not load all the translations anymore, only the needed one 2017-02-20 18:29:06 +01:00
yflory 434c3a220c Remove old translation keys #2 2017-02-20 16:15:13 +01:00
yflory d81d17b86c Remove old translations keys no longer used 2017-02-17 17:39:27 +01:00
yflory a6497f7a52 Add a way to show the drive tips again 2017-02-17 16:56:59 +01:00
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +01:00
ansuz 66a21bb45c implement cache-busting everywhere 2017-02-17 12:38:10 +01:00
ansuz c9b8889380 add cache-busting to chainpad-crypto 2017-02-17 11:26:43 +01:00
ansuz 09fade6127 add cache-busting to chainpad-crypto 2017-02-17 11:25:35 +01:00
yflory 550c65aae0 Add a default pad in CryptDrive after signing up 2017-02-16 18:10:12 +01:00
yflory b4128ee313 Fix typo 2017-02-16 17:26:51 +01:00
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory 7497e0d1c5 Add a dropdown user menu to the top bar in static pages 2017-02-15 17:57:42 +01:00
yflory 0e76b18278 Hide the links in the html topbar on small screens 2017-02-15 14:23:56 +01:00
yflory 0a43570990 Add the new files for the settings app 2017-02-14 19:07:17 +01:00
yflory cd9cea8fa4 Create a settings app to manage user objects 2017-02-14 19:04:57 +01:00
yflory 318cec5f91 Update french translation 2017-02-13 15:23:45 +01:00
yflory c838fdc667 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 13:06:38 +01:00
yflory dc9ab7af4a Make the user confirm (french) 2017-02-13 13:06:32 +01:00
ansuz 5ae65c8bc1 make the user confirm 2017-02-13 13:04:55 +01:00
yflory 25dd103f6f Reduce font-size for register explanations 2017-02-13 12:54:34 +01:00
yflory f93e121763 Translate register explanations in French 2017-02-13 12:54:03 +01:00
ansuz 7d0c29513c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-13 12:42:17 +01:00
ansuz 7d21206cae add registration introductory text 2017-02-13 12:42:07 +01:00
yflory 2807ad9dc3 Add spinner and translate the register page 2017-02-13 11:41:48 +01:00
yflory bff9d05210 Make sure the login_name is in the object 2017-02-13 11:15:30 +01:00
yflory 3aa03225c9 Add a spinner when hashing the password and translate homepage 2017-02-13 11:09:30 +01:00
ansuz 3b1bd2f720 use additional translation keys for registration 2017-02-13 10:15:25 +01:00
ansuz 438e139489 don't complete login names 2017-02-13 10:14:26 +01:00
ansuz b5b2454f0b use bootstrap for login and register pages 2017-02-10 18:29:49 +01:00
ansuz c556f78562 log in directly from home page, sign up at /register/ 2017-02-10 16:49:17 +01:00
ansuz 0ee808295b make sure jquery is imported before using it 2017-02-10 14:29:01 +01:00
yflory 6c1981c776 Fix dropdown menus 2017-02-10 12:26:47 +01:00
yflory 73e9effd32 Fix the drive button in the homepage and a:hover in dropdown 2017-02-10 11:21:10 +01:00
yflory ae6e066ed4 Update font-size for the drive link 2017-02-09 19:00:52 +01:00
yflory 6026351091 Improve the homepage (style and translations) 2017-02-09 18:53:04 +01:00
yflory d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +01:00
yflory f8366e0cfc Remove support for legacy store and add a way to import legacy pads 2017-02-09 15:23:09 +01:00
yflory 37c94935f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-09 12:58:22 +01:00
yflory fc3995054d Do not expose the store methods until it is ready 2017-02-09 12:56:05 +01:00
Caleb James DeLisle 2eccc6a69f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-09 12:48:14 +01:00
Caleb James DeLisle 9dfe3ccaac Change 'jot it down' to 'write it down' in the front page 2017-02-09 12:48:06 +01:00
yflory 914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
ansuz dae17588c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-07 18:27:28 +01:00
yflory 4aaaa2f647 Update the footer 2017-02-07 18:06:36 +01:00
ansuz 4b710b418c remove dead code from home page 2017-02-07 17:27:00 +01:00
ansuz 6e730c7800 prefer to end links to apps with a trailing slash 2017-02-07 10:53:42 +01:00
yflory ac79fbb5a2 Improve mobile support for the toolbar and the drive 2017-02-06 18:06:59 +01:00
yflory 7e7d1f7a16 Display the error when opening a document with the wrong app 2017-02-06 12:43:56 +01:00
yflory ad82a275bc Replace the Apps button by a New button again 2017-02-06 11:39:04 +01:00
yflory fbbf8a2829 Replace initialState by a placeholder in slide and code 2017-02-03 18:45:30 +01:00
yflory 9c4c378d6a Add a footer to the html pages 2017-02-03 16:52:55 +01:00
yflory 02439e0f61 Improve the homepage with new images and translations 2017-02-03 16:03:36 +01:00
yflory 46b48df966 Don't display 'Hello null' if we can't get the account name 2017-02-03 10:48:15 +01:00
ansuz 8648ff208e dropdown links should always be black 2017-02-02 18:52:11 +01:00
ansuz 0ad95142f5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:49:17 +01:00
ansuz 26a4b0c18f override bootstrap colors 2017-02-02 18:48:43 +01:00
yflory f57c8c0e4b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:40:45 +01:00
yflory 2c6b4b9c6a Hide disabled applications from the context menu in drive 2017-02-02 18:40:39 +01:00
ansuz e712025a4e set cached styles 2017-02-02 18:39:40 +01:00
ansuz 85b49d5ec8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-02 18:37:09 +01:00
ansuz 9d0252e989 style links on info pages, and fix layouts 2017-02-02 18:36:30 +01:00
yflory 91299f5f30 Ability to access the drive from any pad 2017-02-02 18:22:59 +01:00
yflory b0fb56fa63 Allow logge din users to access the home page 2017-02-02 18:09:27 +01:00
yflory bed49d0b26 Adjust space between buttons in the home page 2017-02-02 11:46:52 +01:00
yflory 35a49ac195 Improve the connection lost message with read-only 2017-02-02 11:33:05 +01:00
yflory 4bb02b9d4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-01 18:48:37 +01:00
yflory 89da142204 Fix pad creation from the context menu 2017-02-01 15:52:47 +01:00
ansuz 07f722fbd8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-01 15:47:58 +01:00
ansuz 1a061c22a0 more consistent styles and improved SEO 2017-02-01 15:47:50 +01:00
ansuz 3a9c1c782d remove dead code from cryptpad.less 2017-02-01 15:21:59 +01:00
yflory 24f66b7e3f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-02-01 11:37:27 +01:00
yflory 5d499df39e Load jQuery before bootstrap 2017-02-01 11:37:19 +01:00
ansuz eb3c58939d correct typo 2017-02-01 11:15:09 +01:00
yflory 599e00be21 Remove unused code 2017-01-31 18:19:34 +01:00
yflory 46b5b8766d Dropdown button to make a pad from homepage 2017-01-31 18:16:35 +01:00
ansuz d93086a92d hitting enter in the password field should log you in 2017-01-31 17:29:32 +01:00
Caleb James DeLisle 5e4f2ffe6a Shrink images, change text and 'make a pad right now' button 2017-01-31 15:00:01 +01:00
yflory 11fa4493d1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-01-31 14:36:47 +01:00
yflory d76e0ae0d4 Update input colors in alertify 2017-01-31 14:36:33 +01:00
ansuz 5b802d6e84 replace mountain image with lock image 2017-01-31 14:23:09 +01:00
yflory d926b69f8b Improve the main page when javascript is disabled 2017-01-31 12:43:28 +01:00
yflory 2e247d44c7 Hide the backup icon when logged in 2017-01-31 10:59:23 +01:00
yflory 5e69b78334 Remove the domain from the href in store 2017-01-30 18:52:27 +01:00
yflory 487650df78 Remove the remember me checkbox 2017-01-30 15:32:42 +01:00
yflory 58d8a30b5b Redirect to the main page when logging out 2017-01-30 15:26:32 +01:00
yflory 29578a7400 Merge branch 'hpbs' into newtoolbar 2017-01-30 14:45:02 +01:00
yflory 5ef074370b Name a place before creating it in the drive 2017-01-27 17:51:08 +01:00
yflory f42665ba49 Remove the unowned pads category 2017-01-25 14:27:06 +01:00
yflory 88021f2264 Anonymous pads fo anonymous users 2017-01-24 18:14:29 +01:00
yflory 8ccd845d52 Merge branch 'newtoolbar' into hpbs 2017-01-24 12:54:32 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory 9d275daebb Backport changes for the login page from hpbs branch 2017-01-24 12:47:53 +01:00
yflory f5753cf594 Fix typo 2017-01-24 12:42:21 +01:00
yflory 141f8f776a Fix the Noscript bug 2017-01-23 12:29:12 +01:00
yflory fd78e4fa92 Improve homepage CSS and responsiveness 2017-01-20 18:21:51 +01:00
yflory 7d66d391fc Merge branch 'newtoolbar' into hpbs 2017-01-19 15:17:30 +01:00
yflory 3338000018 Add Esc and Arrow icons in the slide's present mode 2017-01-19 12:49:40 +01:00
yflory efdae19f0c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:14:14 +01:00
yflory 36c8ade26c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:13:57 +01:00
yflory fa8a0d5880 Merge branch 'newtoolbar' into hpbs 2017-01-19 10:53:55 +01:00
yflory 9523782bf8 Make the home page responsive 2017-01-19 10:48:46 +01:00
yflory 69bee7d79a Add data into the homepage 2017-01-18 18:02:32 +01:00
yflory b9c4ceccd4 Change the CSS and colors 2017-01-18 13:51:11 +01:00
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory 82e8041054 Use bootstrap 4 in the main page 2017-01-17 18:19:45 +01:00
yflory 73d424b506 Improve the login UI (css and translations) 2017-01-17 16:21:12 +01:00
yflory e006ed7076 Ability to log in from the main page 2017-01-17 11:52:44 +01:00
yflory 6652e9d6d9 Test new home page 2017-01-16 18:29:34 +01:00
yflory a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory efed1f5efe Add handlers to login and logout buttons 2017-01-13 17:39:41 +01:00
yflory 767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory 2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory 4adde0f0c0 Use the new dropdown for userlist and share 2017-01-13 15:05:00 +01:00
yflory efffd4974f Add createDropdown and createLanguageSelector in cryptpad-common 2017-01-12 18:28:38 +01:00
yflory 29c8f0bbef Use a FontAwesome spinner to replace the old unaligned one 2017-01-12 17:05:16 +01:00
yflory 3f1e287811 Fix an issue causing a user object to be turned into a pad 2017-01-12 11:09:45 +01:00
yflory 51a2cfa141 Fix missing FontAwesome icon 2017-01-12 11:09:12 +01:00
yflory 569ea21705 Replace the language selector by our custom dropdown menu 2017-01-11 10:59:09 +01:00
ansuz 9d0d8b27cf Merge branch 'master' of github.com:gustavohmsilva/cryptpad into brazil 2017-01-11 07:59:54 +01:00
Gustavo H M Silva 5b1a45c510 Translation 100% polished.
I've corrected errors, replaced sentences to better translations and other small things. This version can be considered the final one.

Please notify me if new translation tokens gets added to the website, so I can keep the translation up to date.
2017-01-10 16:47:29 -02:00
yflory 4278ac7637 Merge branch 'soon' into fileManager 2017-01-10 15:07:48 +01:00
yflory 2be5db9540 Ability to open files in readonly mode
Fix CSS issues
2017-01-10 15:04:02 +01:00
yflory f74d0a46a4 Remove the alert when pressing del in 'all files' 2017-01-09 18:38:05 +01:00
ansuz b39067d2a1 jshint compliance 2017-01-09 18:07:45 +01:00
yflory dba42a90c7 Fix the username button icon not aligned 2017-01-09 16:33:12 +01:00
yflory 5b08fed7fa Ability to add files from the drive toolbar
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
yflory 0abec4ddb3 Fix error with placeholder translations in Safari 2017-01-09 11:50:45 +01:00
ansuz 4902aebe77 open home page table links in new tabs 2017-01-09 11:01:29 +01:00
yflory d5561910d4 Move the file manager into /drive and add a toolbar 2017-01-06 18:26:41 +01:00
yflory 6106f7d6ca Make sure we never create the file store object twice 2017-01-06 14:14:13 +01:00
yflory 004d4a16fe Fix error with placeholder translations in Safari 2017-01-06 13:52:30 +01:00
yflory bf764d26e7 Merge branch 'staging' into workgroups 2017-01-06 11:17:17 +01:00
yflory 3836b20b08 enable the file store 2017-01-06 11:16:56 +01:00
ansuz 7868a65da9 apply style patches to the correct elements 2017-01-05 15:06:08 +01:00
ansuz 5c967ed09e apply live fixes to the codebase 2017-01-05 14:45:31 +01:00
ansuz bd6f2c037e assign the cors iframe an id 2017-01-05 14:27:40 +01:00
ansuz 5a90d20cff open pads in a new tab 2017-01-04 16:41:47 +01:00
ansuz c380ecfcd9 add the slogan which was accidentally dropped 2017-01-04 16:35:32 +01:00
ansuz 05a956879a prepare new poll app for release
move old poll into poll/old
2017-01-04 15:48:50 +01:00
ansuz 6c4e070c82 update information pages 2017-01-03 15:25:41 +01:00
ansuz 7b87213ec3 extract more constants into less variables 2017-01-03 12:19:07 +01:00
ansuz 27d5559b0c define and use flags to enable the home page table 2017-01-03 12:17:17 +01:00
ansuz 4b1f9fd4f1 Revert "yank dead code"
This reverts commit aad442cb20.
2017-01-03 11:49:44 +01:00
ansuz aad442cb20 yank dead code 2017-01-02 16:03:50 +01:00
ansuz f01c3725af move minor links to the bottom of the home page 2016-12-30 15:56:24 +01:00
ansuz 9b650362b9 rebuild css 2016-12-30 15:33:59 +01:00
ansuz d843caeb9a remove bottom bar and move language selector to main html 2016-12-30 15:33:28 +01:00
ansuz c6499d6789 make panel styles reusable 2016-12-30 15:30:35 +01:00
ansuz 773209472e break monolithic style file into several modules 2016-12-30 15:29:45 +01:00
ansuz 0abf45bdc5 better fsStore debugging 2016-12-30 12:27:58 +01:00
ansuz fefe444501 add new translation keys 2016-12-29 17:11:30 +01:00
ansuz 0c9178ba46 update slide styles, comment alertify styles, updated compiled css 2016-12-28 17:33:46 +01:00
ansuz d7bdb30969 don't compile alertify.css directly 2016-12-28 17:20:29 +01:00
ansuz 89e5830409 make alertify display time configurable 2016-12-28 17:13:00 +01:00
ansuz 8b9d7f2357 update built html 2016-12-28 17:10:38 +01:00
ansuz 6a46d6e06c update page layout and account for about page 2016-12-28 17:09:21 +01:00
ansuz a5407e9222 rework templates and build system 2016-12-28 15:52:16 +01:00
ansuz c9d99f101a rewrite customize/readme.md 2016-12-28 15:33:59 +01:00
ansuz 13e8bf5b5e remove old 'user' code 2016-12-28 15:33:40 +01:00
ansuz f0a4c0ccb0 sheet.js is never used 2016-12-28 15:24:04 +01:00
ansuz 2be90e8858 remove Header.html 2016-12-28 15:18:39 +01:00
ansuz 0a89f13498 don't need /customize/pad.js anymore 2016-12-28 15:15:25 +01:00
ansuz 46024853ec restrict cryptpad styles to descendants of .cp 2016-12-27 14:30:27 +01:00
ansuz e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
ansuz 5a4ec358b3 Merge branch 'soon' into staging 2016-12-27 13:36:23 +01:00
ansuz 71488e6651 add link to markdown tutorial 2016-12-27 13:36:02 +01:00