Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 63fd7b4dde implement EXPIRE_SESSION rpc ansuz 2017-07-05 16:00:54 +02:00
• bf17ad3f1e Friend button in the userlist yflory 2017-07-05 15:59:36 +02:00
• 8dc8aa27ab Lint yflory 2017-07-05 12:27:40 +02:00
• 35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-05 12:27:08 +02:00
• 43ac71603c Move pad attributes in pad data yflory 2017-07-05 12:21:01 +02:00
• 9f6ecea5d9 fix nacl reference error in media tag ansuz 2017-07-05 11:57:53 +02:00
• cb7efeebe1 don't require admins to explicitly enable uploads ansuz 2017-07-05 11:54:27 +02:00
• dfad622b76 Merge branch 'soon' into staging ansuz 2017-07-05 10:14:30 +02:00
• 3e802c2443 Fix overflowing content in profile yflory 2017-07-05 10:14:43 +02:00
• b0a0b29770 add missing diff-dom dependency ansuz 2017-07-05 10:09:42 +02:00
• cbd9fc4076 Merge branch 'staging' ansuz 2017-07-04 17:03:20 +02:00
• 69f4ce2abd Fix middle click on the drive button yflory 2017-07-04 17:03:54 +02:00
• 9bf9130b9d fix error in pin reset ansuz 2017-07-04 17:02:29 +02:00
• 2acbb37291 Merge branch 'soon' yflory 2017-07-04 15:58:30 +02:00
• d7f9ddd8d2 Fix icon colors in the new menu (/pad app) yflory 2017-07-04 15:57:34 +02:00
• cc67838786 Fix horizontal scrollbar in /pad anonymous mode yflory 2017-07-04 15:56:18 +02:00
• 3fe0baa956 disable pin limit caching ansuz 2017-07-04 15:50:52 +02:00
• 9c1eaf9c1a lint compliance ansuz 2017-07-04 15:48:20 +02:00
• fa06f9d413 fix minor bugs in poll ansuz 2017-07-04 15:09:09 +02:00
• 90bcadd87b Merge branch 'soon' into staging ansuz 2017-07-04 14:58:45 +02:00
• be7e7fec43 don't bypass warnings when registering ansuz 2017-07-04 14:56:03 +02:00
• cab595f959 Fix duplicate folders in the drive yflory 2017-07-04 14:51:35 +02:00
• 42375190e6 style buttons for long titles ansuz 2017-07-04 14:24:07 +02:00
• 43d4597f38 merge to master ansuz 2017-07-04 14:19:08 +02:00
• 34fd6f4285 new version ansuz 2017-07-04 14:11:56 +02:00
• c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-04 12:37:50 +02:00
• ac8da0d52d load codemirror in the correct context. fix selection events ansuz 2017-07-04 12:37:24 +02:00
• 789274fd4f Fix font-size in slides yflory 2017-07-04 12:32:14 +02:00
• 7377d39b39 hide print button ansuz 2017-07-04 10:35:55 +02:00
• 43b877ad27 fix styling on media tag download button ansuz 2017-07-04 10:28:50 +02:00
• 1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-04 10:21:35 +02:00
• 04a28433ae replace inner content of media tag download buttons ansuz 2017-07-04 10:21:29 +02:00
• f85af7ef4c hide useless messages ansuz 2017-07-04 10:19:18 +02:00
• a59853f9c2 use new media tag ansuz 2017-07-04 10:15:45 +02:00
• 25905d13fa wip Caleb James DeLisle 2017-07-03 20:40:19 +02:00
• 8cf694bea6 Lint yflory 2017-07-03 18:41:41 +02:00
• 47c6c64b8a Allow emojis in default avatars yflory 2017-07-03 18:37:50 +02:00
• ffd184d50e Fix overflowing names in the new userlist yflory 2017-07-03 17:41:34 +02:00
• fcf983854d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-03 17:05:13 +02:00
• 1a27f11e73 Fix dropdown menus in static pages yflory 2017-07-03 17:04:59 +02:00
• 92d88d1644 don't change allowed media types until we have media-tag scoping ansuz 2017-07-03 16:45:40 +02:00
• 678986dac4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-03 16:43:57 +02:00
• 708d5ae35f remove noisy log calls ansuz 2017-07-03 16:43:49 +02:00
• fa2d857d70 Fix css issues with Safari yflory 2017-07-03 16:11:41 +02:00
• efedfe0667 show preview pane by default in /slide/ ansuz 2017-07-03 14:53:50 +02:00
• 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-07-03 14:43:17 +02:00
• 1df5e6e855 Fix toolbar buttons for Safari yflory 2017-07-03 14:32:54 +02:00
• 8b0210baf1 hide useless error ansuz 2017-07-03 12:26:34 +02:00
• bf414c15ee fix logout button on home page ansuz 2017-07-03 12:26:08 +02:00
• 991cb896bd Fix avatar in /pad yflory 2017-07-03 12:25:05 +02:00
• 70c9f3df75 Fix avatar size yflory 2017-07-03 12:13:37 +02:00
• f09ae9b19c jshint compliance ansuz 2017-07-03 11:51:47 +02:00
• 4a9a564913 don't try to handle error thta never happens anymore ansuz 2017-07-03 11:40:52 +02:00
• b15aa3360a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-03 11:39:21 +02:00
• 6ac056e314 make explicit file size RPCs unauthenticated ansuz 2017-07-03 11:38:39 +02:00
• 9b131dc49c Fix CSS in the slide app yflory 2017-07-03 11:34:30 +02:00
• e52eda42df Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-07-03 11:21:06 +02:00
• 5694505719 Fix syntax highlighting yflory 2017-07-03 10:55:25 +02:00
• a91dbb67e3 more restrictive semver for external dependencies ansuz 2017-07-03 10:28:49 +02:00
• be0bd011c3 Fix readme cryptpad-docker doc link Alexandros 2017-07-02 20:56:13 +03:00
• d72acec915 Version of diffdom must be pinned because they release with breaking changes Caleb James DeLisle 2017-07-02 16:52:01 +02:00
• fcff5fa009 wip Caleb James DeLisle 2017-07-02 16:51:21 +02:00
• 335898a4c7 Hack the drawer to close it when clicking outside yflory 2017-06-30 18:23:23 +02:00
• 472a62730b Fix profile creation and add a link to the profile app yflory 2017-06-30 17:24:22 +02:00
• f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-30 16:57:37 +02:00
• b153dda6ff Add avatars in the user list yflory 2017-06-30 16:57:23 +02:00
• c2e153e8ed more fouc fixes ansuz 2017-06-30 16:20:10 +02:00
• 73cfecdf08 note which node version we use ansuz 2017-06-30 16:12:03 +02:00
• 8ffad5ece6 FOUC fixes ansuz 2017-06-30 16:10:42 +02:00
• b6944e6638 Fix userlist style in apps without iframe yflory 2017-06-30 13:13:11 +02:00
• 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-30 12:36:34 +02:00
• 568ce70afd Add a spinner for the history and update history buttons yflory 2017-06-30 12:36:21 +02:00
• 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-06-30 12:11:55 +02:00
• c25f2df721 Added caching versions to some of the images which are loaded by js Caleb James DeLisle 2017-06-30 12:11:44 +02:00
• 4ab82710ab Remove the background color from the text-color button in the slide app yflory 2017-06-30 11:55:29 +02:00
• 7e69d051c4 Lint errors yflory 2017-06-30 11:46:20 +02:00
• 26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-30 11:42:59 +02:00
• b9320e6005 Toolbar improvements yflory 2017-06-30 11:42:54 +02:00
• 9e91739044 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-30 11:21:27 +02:00
• ecff05425f feedback for slide printing ansuz 2017-06-30 11:21:19 +02:00
• 75c2a1fd73 jshint compliance ansuz 2017-06-30 11:20:56 +02:00
• b8934c0b97 smarter redraws of drive/settings usage bar ansuz 2017-06-30 11:20:40 +02:00
• d2085c1269 enable logging of rpc calls ansuz 2017-06-30 11:19:12 +02:00
• 5a3e9c785c Fix ckeditor toolbar yflory 2017-06-29 18:15:41 +02:00
• cc5b7615ad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-29 18:05:49 +02:00
• ed0121d172 Lint errors yflory 2017-06-29 18:05:34 +02:00
• 8abc94d37b Replace folder images in the drive yflory 2017-06-29 18:03:19 +02:00
• b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-29 17:54:29 +02:00
• 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens yflory 2017-06-29 17:51:30 +02:00
• b037cfbfdb set usage tips relative to bottom of screen, not top ansuz 2017-06-29 17:25:06 +02:00
• 0b9d7d6c0b fix color of links in poll and whiteboard ansuz 2017-06-29 16:51:44 +02:00
• 1763cf72d1 tell anonymous users they can't upload ansuz 2017-06-29 16:24:12 +02:00
• 45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-06-29 15:20:46 +02:00
• 7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-06-29 15:21:09 +02:00
• 56a25e1036 Small fixes for the new toolbar yflory 2017-06-29 15:15:40 +02:00
• 1179992a90 update feedback key name ansuz 2017-06-29 14:48:33 +02:00
• 4a5f5de78c restore missing stylesheet for poll ansuz 2017-06-29 14:35:23 +02:00
• bbf9916a91 fixes for file app ansuz 2017-06-29 14:21:48 +02:00
• 39149a052b add new feedback keys ansuz 2017-06-29 14:12:54 +02:00
• 7a5c5ce0a3 load scripts asynchronously ansuz 2017-06-29 12:17:08 +02:00