dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,783 Commits 99 Branches 133 Tags 566 MiB
Commit Graph

231 Commits

Author SHA1 Message Date
Fabrice Mouhartem 4184a15d2d #1275: typo 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 31cb79548b calendar: Improve warnings when changing recurring events' calendar 
Related to issue #1275's changes.
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 76101cc74c calendar: Use variables instead of inline test for readability 
WIP for #1275
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem ec6e1a030f calendar: confirmation dialog changes in case of changing calendar for recurring events 
#1275: given the current implementation of recurring event, it is not
possible to move a group of events from a calendar to another.

- Disabling « Future event » if the user tries to move a recurring event
  from a calendar to another.
- Show a warning upon moving the first event to another calendar
  explaining why the user can only move the all events.
- Add a translation key for the above.
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 39371deb4d Moving the original event 
#1275: handle simple cases when moving the first element of a recurring
event to a new calendar.
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 918fd3f908 calendar: apply changes on the moved event 
#1275: from previous implementation, the changes were applied to the
original recurrent event and not the one in which has been moved
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem b7842cc01b Linter compliance 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 41be1b39f4 calendar: copy-and-delete when moving an event one time from calendars 
#1275: Copy a calendar item then remove it.

WIP: does not work with the first recurring event (the origin).
 2023-10-26 09:40:27 +02:00
Fabrice Mouhartem 382230d4e8 calendar: Change newEvent behaviour 
In preparation for #1275:

- Change `newEvent` to take an event directly
  - It would be used to add a new event in the target calendar
 2023-10-26 09:40:27 +02:00
David Benque 1a79fc9146 Tests on www/admin and www/calendar 2023-10-19 15:40:19 +01:00
yflory e9bc3f1f8b Fix calendar reminder #1279 2023-10-09 16:28:59 +02:00
yflory 4dfbf1175e Merge branch '1094-calendar-event-edit-panel-cuts-off' into staging 2023-10-02 15:15:18 +02:00
yflory e8513a2d1d Fix calendar reminders 2023-10-02 15:14:28 +02:00
DianaXWiki 3f6c72ff67 Fix layout reminders v2 #1094 2023-10-02 10:27:31 +03:00
yflory d68dde07a9 Remove translation XXX 2023-09-28 18:33:03 +02:00
yflory 5f3acfb81d Merge branch 'mobile-fixes' into staging 2023-09-28 18:01:02 +02:00
yflory fd90827da9 Merge branch 'accessibility' into staging 2023-09-28 17:55:34 +02:00
DianaXWiki 6b7dfa2451 More robust solution #1094 2023-09-26 13:59:55 +03:00
DianaXWiki 5dde8f1a53 Revert "Fix edit event panel cut off on small screen #1094" 2023-09-26 10:26:01 +03:00
yflory b78ec996ec Deduplicate code for iframe title 2023-09-19 16:40:22 +02:00
yflory b977b759b4 Fix syntax inconsistencies 2023-09-19 16:07:17 +02:00
yflory 4c83721c28 Re-apply tui-calendar fix from fe404cc 2023-09-19 15:50:04 +02:00
yflory 51cb51a710 Revert "made confirmation button responsive according to the text #1211" 
This reverts commit fe404ccde6.
 2023-09-19 15:43:42 +02:00
DianaXWiki 5a1f95da38 Fix edit event panel cut off on small screen #1094 2023-09-18 14:10:10 +03:00
DianaXWiki 7e24f0cc8b Make event edit menu visible on mobile #1094 2023-09-12 14:52:16 +03:00
DianaXWiki c68d317f2b Make calendar menu visible on mobile #971 2023-09-12 14:12:51 +03:00
Diana Voineag 1fba93d664 Fix calendar and modal avatar consistnecy #1188 2023-08-29 12:23:17 +03:00
daria 56f3a8e0ea spaced out evenly reminder buttons (calendar popup) #1217 2023-08-28 15:25:03 +03:00
daria fe404ccde6 made confirmation button responsive according to the text #1211 2023-08-28 14:49:31 +03:00
daria 25cb24be0f added title to Calendar inner page #1159 2023-08-17 12:59:35 +03:00
daria 5c1d67f244 added temporary label for calendar settings button 2023-08-09 15:20:09 +03:00
daria 5a944a075f added temporary label for calendar buttons 2023-08-09 15:04:30 +03:00
daria 6e3b761e9e added aria-label to calendar settings button for accessibility 
fixed #1150
 2023-07-20 15:23:40 +03:00
daria 1eb2cdf5ed added comments to change the text for translation 2023-07-20 12:01:57 +03:00
daria e1166268fb 3/4 buttons solved 
fixing #1150
 2023-07-19 13:50:53 +03:00
yflory 30bb4d61bb Merge branch 'main' into debower 2023-05-02 13:55:40 +02:00
yflory f4b477ee37 Clean XXX 2023-02-01 18:02:03 +01:00
Pamplemousse 9019d92291 removing `bower`: migrate `nthen` 
Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:42 +01:00
Pamplemousse 6c10407802 removing `bower`: migrate `bootstrap` 
Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:41 +01:00
Pamplemousse a847a5300a removing `bower`: migrate `file-saver` 
Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:41 +01:00
Pamplemousse 871110ec12 removing `bower`: migrate `chainpad*` 
Also, explicitly add `chainpad-netflux`.

Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:41 +01:00
Pamplemousse dd25b85554 removing `bower`: migrate `requirejs` and `requirejs-plugins` 
Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:40 +01:00
Pamplemousse c8859524ee removing `bower`: migrate `components-font-awesome` 
Signed-off-by: Pamplemousse <git@xaviermaso.com>
 2023-01-07 13:50:40 +01:00
yflory 4709b6740d Fix link location in calendar events 2022-12-21 13:34:01 +01:00
David Benque a7463c1987 Add comments to pass translations test 2022-12-16 12:05:01 +00:00
yflory acd7d9654d Fix calendar issues 2022-11-02 14:58:29 +01:00
David Benque 89d0a7ef28 Move daily(weekday/weekend) option up the list 2022-10-25 10:42:10 +01:00
yflory 846b91907b Use CryptPad language in dates 2022-10-25 11:07:54 +02:00
David Benque f8b06af65b Remove hard-coded translations 2022-10-24 14:45:12 +01:00
David Benque 795ec4b22f Remove some hard-coded translations 2022-10-21 15:47:06 +01:00
David Benque 1ab0208f5b fix shrinking icons with long calendar titles 2022-10-12 17:20:29 +01:00
David Benque 81e00842b9 Style for default confirm button 2022-10-12 16:48:24 +01:00
David Benque 90a7b89a0c Use CryptPad blue for "all day" checkbox 2022-10-12 16:45:49 +01:00
David Benque 0b87f1f9c6 Merge remote-tracking branch 'origin/rrule' into rrule 2022-10-11 16:02:10 +01:00
David Benque 5d96f94766 Align reminders line-height 2022-10-11 16:00:37 +01:00
yflory ce5609ea6a Add confirm step when deleting events 2022-10-11 17:00:13 +02:00
yflory f3dc8d059e Update weekly and monthly recurrence pickers in calendar 2022-10-11 16:43:37 +02:00
yflory 16cdf2ccdc Fix recurrence rule update issues 2022-10-11 16:11:53 +02:00
yflory c11b83dd5a Merge branch 'staging' into rrule 2022-10-11 14:00:30 +02:00
David Benque 99da655225 Adjust event popup style 2022-10-10 16:14:39 +01:00
David Benque 707ac44536 Improve notification alignment 2022-10-10 16:05:37 +01:00
David Benque 176f6ab594 Fix remove notification message 2022-10-10 16:05:15 +01:00
David Benque e568027d14 Fix button spacing in event popup 2022-10-10 16:04:23 +01:00
yflory 89aabacc55 Merge branch 'rrule' of github.com:xwiki-labs/cryptpad into rrule 2022-09-21 11:10:09 +03:00
yflory b7024b23f5 Fix HTML encoding in calendar #736 2022-09-21 11:09:58 +03:00
David Benque 5c51fb3d84 Re-style notification section of calendar event modal 2022-09-19 17:26:53 +01:00
David Benque 29e5bf63dd Fix styles in calendar event modal 2022-09-19 17:26:14 +01:00
David Benque 34b5f66047 Add label for "remove reminder" 2022-09-19 17:25:15 +01:00
David Benque 31ca0c4518 Use primary button for day picker in custom recurring event settings 2022-09-19 17:23:59 +01:00
David Benque 7aaf1afeff Add title to custom recurring event End setting 2022-09-19 17:23:21 +01:00
yflory 57c3c28cb0 Support clickable links in calendar location 2022-09-15 17:19:12 +02:00
yflory c3b501b431 Fix incorrect recurrence with monthly events on day 31 2022-09-15 16:34:31 +02:00
yflory 175fb7e1dc Add button to move calendar to a specific date 2022-09-15 16:33:50 +02:00
yflory 65b00736bc Support recurrence rules when importing or exporting ICS calendars 2022-09-15 13:15:27 +02:00
yflory af923170a4 Merge branch 'rrule' of github.com:xwiki-labs/cryptpad into rrule 2022-09-14 17:42:06 +02:00
yflory 2e983bf52a Fix recurrence rule monthly picker 2022-09-14 17:40:44 +02:00
yflory 0ee48d40f2 Add click handlers to calendar reminders notifications 2022-09-14 16:11:54 +02:00
David Benque 57e801da98 Improve layout of calendar event pop-up 2022-09-14 13:52:50 +01:00
yflory f27d779aef Fix issues with reminders and recurrence rule 2022-09-13 16:43:08 +02:00
David Benque b7aa3aed0f Import Bootstrap styles in Calendar app 
Bootstrap forces buttons and form elements to inherit font styles
Since this wasn't applied calendar forms were displayed in system font
 2022-09-13 14:30:25 +01:00
yflory ae32732483 Update recurrence rule 2022-09-13 14:18:38 +02:00
yflory 0c273b1b3d Manage reminders for recurring events 2022-09-12 19:06:25 +02:00
yflory d35b42d207 Fix updating recurring events 2022-09-12 14:42:54 +02:00
yflory 3fa92fa155 Fix update original event 2022-09-08 17:03:08 +02:00
yflory 99df9bc21a Update recurring events in calendar 2022-09-08 16:56:58 +02:00
yflory ee5e1f8335 Translate recurrence rules into text 2022-09-07 17:08:41 +02:00
yflory c123434fa0 Fix recurrence issues 2022-09-07 12:56:45 +02:00
yflory 6ca6ecd283 Create recurring events 2022-09-06 18:58:39 +02:00
ansuz 71922dbae4 add noscript tags to apps 2022-09-05 19:15:32 +05:30
ansuz 8089698f4c remove noscript tags from inner.html 
because inner.html should only ever load if javascript is enabled
 2022-09-05 19:11:19 +05:30
yflory a5c4bc98ba Merge branch '5.1-candidate' into rrule 2022-08-31 11:43:38 +02:00
yflory bdddb231af Display recurring events 2022-08-30 13:17:57 +02:00
ansuz 524ba22c46 update hardcoded preloading.js cache-busting version string 2022-08-30 14:27:10 +05:30
yflory d5272874fb Add version string to placeholder .js and .css files 2022-08-17 11:14:51 +02:00
Maxime Cesson 0d75a2a92a Load pre-loading script and stylesheet before every others 2022-08-02 16:19:38 +02:00
Maxime Cesson 24ccb6d9e7 Apply placeholder to all relevant applications on a slow connection #865 
Made with the following command from the cryptpad/ root directory:

$ patternStatic='(<link href=\"\/customize\/src\/outer\.css.*$|<script async data-bootload=\"\/customize\/template\.js\".*$)';
$ pattern2='<style>$';
$ js='<script src=\"\/customize\/pre-loading\.js\"><\/script>';
$ css='<link href=\"\/customize\/src\/pre-loading\.css\" rel=\"stylesheet\" type=\"text\/css\">';
$ find . -name 'index.html' | grep -v -E '(onlyoffice|bower_components|node_modules)' | while read x; \
do if [ `grep -cE "$pattern" $x` -gt 0 ]; then sed -E "s/($pattern)/$js\n    \1\n    $css/" $x > tmp; \
mv tmp $x; y=`echo $x | sed 's/index\.html/inner\.html/'`; if [ -f "$y" ]; then \
sed -E "s/($pattern2)/$js\n    $css\n    \1/" $y > tmp; mv tmp $y; fi; fi; done
 2022-07-13 13:21:38 +02:00
ansuz 01e3012b62 fix poor text contrast for date range indicator in calendar dark mode 2022-06-02 16:21:41 +05:30
ansuz 93a9c44b6e Merge branch 'main' into 4.15-candidate 2022-04-20 15:32:46 +05:30
ansuz 841884c631 translated warnings for people that use AdGuard 2022-04-01 16:40:26 +05:30
ansuz 9c3b08d389 Merge branch 'sortCalendars' into soon 2022-03-31 11:58:05 +05:30