Merge lp://qastaging/~matias-wilkman/calendar-indicator/devel into lp://qastaging/calendar-indicator
Proposed by
appas
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~matias-wilkman/calendar-indicator/devel |
| Merge into: | lp://qastaging/calendar-indicator |
| Diff against target: |
748 lines (+191/-183) (has conflicts) 11 files modified
.bzrignore (+3/-0) po/po.pot (+7/-0) src/calendardialog.py (+2/-1) src/calendarindicator.py (+55/-44) src/calendarwindow.py (+8/-7) src/comboboxcalendar.py (+6/-1) src/comun.py (+3/-2) src/eventwindow.py (+92/-123) src/googlecalendarapi.py (+1/-1) src/hourentry.py (+13/-3) src/preferences_dialog.py (+1/-1) Text conflict in po/po.pot |
| To merge this branch: | bzr merge lp://qastaging/~matias-wilkman/calendar-indicator/devel |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lorenzo Carbonell | Pending | ||
|
Review via email:
|
|||
Description of the change
Merged a bugfix and modified the calendar window to adapt to the screen size
To post a comment you must log in.
Unmerged revisions
- 56. By appas
-
- icons less aggressive (:D)
- event window hour entry wraps - 55. By appas
-
- event start date can not be after end, nor end before start
- beautified eventwindow member names - 54. By appas
-
made hour and minutes two-digit always
made positioning of calendar and hour entries more sensible - 53. By appas
-
make the event window's icon be the start date of the event
- 52. By appas
-
modified gtk icon to show date instead of 01 always
- 51. By appas
-
update at midnight (to set correct date icon)
- 50. By appas
-
bugfix
- 49. By appas
-
Made calendar window adapt to screen size instead of hardcoded cell size
- 48. By appas
-
re-apply fix for #1394124
- 47. By appas
-
Jeffrey Flaker 2014-09-01 Fixing bug 1315361
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
