# # ChangeLog for / in confclerk_git # # Generated by Trac 1.2.3 # 06/26/22 22:00:11 Wed, 28 Jul 2021 21:42:45 GMT Philipp Spitzer [31d8a4c] * src/mvc/event.cpp (modified) Adjust alarm logic to include UTC offset or displayTimeShift. Wed, 28 Jul 2021 21:42:09 GMT Philipp Spitzer [e4dcafe] * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) Save adjusted displayTimeShift to database. Wed, 28 Jul 2021 21:41:39 GMT Philipp Spitzer [5b7fa79] * src/gui/daynavigatorwidget.cpp (modified) * src/gui/mainwindow.cpp (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/eventmodel.cpp (modified) Adjust shown event time when displayTimeShift is set. Wed, 28 Jul 2021 21:37:22 GMT Philipp Spitzer [280f29b] * src/gui/conferenceeditor.cpp (modified) No lonely comma when city is missing. Wed, 28 Jul 2021 21:35:48 GMT Philipp Spitzer [03f38cf] * src/app/application.h (modified) Add active conference to application class. Wed, 21 Jul 2021 21:52:35 GMT Philipp Spitzer [bffc77e] * src/gui/conferenceeditor.ui (modified) Exchange "where" and "when" lines in conference dialog. Wed, 21 Jul 2021 21:49:56 GMT Philipp Spitzer [7dc1b1c] * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.ui (modified) Show conference offset in conference dialog and prepare display offset. Wed, 21 Jul 2021 21:49:20 GMT Philipp Spitzer [d858942] * src/mvc/conference.h (modified) Expose utc_offset and display_time_shift in Conference class. Wed, 21 Jul 2021 21:45:49 GMT Philipp Spitzer [29af341] * src/mvc/conference.cpp (modified) Load utc_offset and display_time_shift with conference. Wed, 21 Jul 2021 20:41:46 GMT Philipp Spitzer [8d47489] * src/sql/schedulexmlparser.cpp (modified) * src/sql/sqlengine.cpp (modified) Parse and store utc_offset. Wed, 21 Jul 2021 18:16:12 GMT Philipp Spitzer [0b4a1d0] * src/dbschema002.sql (modified) Add comment for day_change field in conference table definition. Wed, 21 Jul 2021 18:15:50 GMT Philipp Spitzer [c13a488] * src/db.qrc (modified) * src/dbschema001to002.sql (added) * src/dbschema002.sql (added) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) Add utc_offset and display_time_shift columns to conference database. Wed, 21 Jul 2021 17:17:01 GMT Philipp Spitzer [a5dc5eb] * README (modified) Add links to XML files. Wed, 14 Jul 2021 19:34:51 GMT Philipp Spitzer [85c3458] * src/gui/searchtabcontainer.cpp (modified) Adjust whitespace in if statements. Wed, 14 Jul 2021 19:33:29 GMT Philipp Spitzer [d921406] * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.h (modified) Fix typo "favourities" -> "favourites". Wed, 14 Jul 2021 19:28:46 GMT Philipp Spitzer [102d186] * src/mvc/delegate.cpp (modified) Delete unused variable to avoid a compiler warning. Wed, 14 Jul 2021 19:28:46 GMT Philipp Spitzer [6759e32] * src/mvc/delegate.cpp (modified) Replace QModelIndex::child() to avoid a deprecation warning. Wed, 14 Jul 2021 19:28:46 GMT Philipp Spitzer [ce60f42] * src/gui/daynavigatorwidget.cpp (modified) Replace QFontMetrics::width() with QFontMetrics::horizontalAdvance() ... Wed, 14 Jul 2021 19:28:39 GMT Philipp Spitzer [af9f24b] * src/gui/searchtabcontainer.cpp (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) Replace QHash with QMultiHash to avoid a deprecation warning. Fri, 01 May 2020 18:41:30 GMT gregor herrmann [28acdbe] * src/mvc/mvc.pro (modified) src/mvc/mvc.pro: add network module. src/mvc/treeview.cpp includes ... Mon, 09 Mar 2020 19:33:12 GMT gregor herrmann [2def667] * README (modified) * data/confclerk.pod (modified) Update some URLs in the documentation. Mon, 09 Mar 2020 19:29:52 GMT gregor herrmann [f374273] * data/at.priv.toastfreeware.confclerk.metainfo.xml (added) Add appstream metadata file. Fri, 08 Dec 2017 14:20:37 GMT gregor herrmann [4498f2e] * NEWS (modified) * src/global.pri (modified) bump version after release Fri, 08 Dec 2017 14:15:32 GMT gregor herrmann [e755a70] * NEWS (modified) update NEWS before release of version 0.6.4 Fri, 06 Oct 2017 22:00:35 GMT gregor herrmann [f940bd5] * src/gui/mainwindow.ui (modified) Make toolbar in main window non-movable to prevent accidentally ... Fri, 06 Oct 2017 19:34:23 GMT gregor herrmann [4bf83ee] * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.ui (modified) Settings (dialog): add username/password options for proxy server ... Thu, 05 Oct 2017 21:06:56 GMT gregor herrmann [e618f18] * src/gui/settingsdialog.cpp (modified) update comment on default proxy value as we use ... Thu, 05 Oct 2017 20:50:44 GMT Philipp Spitzer [9b513f6] * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/gui/settingsdialog.cpp (modified) AppSettings returns the proxy type as QNetworkProxy instead of int now. Thu, 05 Oct 2017 16:31:15 GMT gregor herrmann [68efead] * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.ui (modified) Settings (dialog): add HTTP+SOCKS5 radio buttons and use them ... Thu, 05 Oct 2017 15:59:45 GMT gregor herrmann [0ede0a2] * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/settingsdialog.cpp (modified) Add ProxyType setting in preparation of SOCKS5 proxy support. Tue, 03 Oct 2017 20:20:38 GMT gregor herrmann [8180111] * src/gui/settingsdialog.ui (modified) Settings dialog: set port range to 1-65535 and right-align. Tue, 03 Oct 2017 20:20:14 GMT gregor herrmann [37b299c] * src/gui/settingsdialog.ui (modified) Settings dialog: change heading to "HTTP proxy settings". Fixes: #59 Mon, 02 Oct 2017 21:29:02 GMT gregor herrmann [f519c91] * src/sql/schedulexmlparser.cpp (modified) schedulexmlparser.cpp: add missing #include Found when building ... Mon, 02 Oct 2017 21:03:50 GMT Philipp Spitzer [0816326] * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) C++98 compatibility: Variable initialization in SqlEngine class. Mon, 02 Oct 2017 21:03:50 GMT Philipp Spitzer [0c1d3ea] * src/sql/sqlengine.h (modified) C++98 compatibility: Variable initialization in TransactionRaii class. Mon, 02 Oct 2017 21:03:50 GMT Philipp Spitzer [c793b28] * src/orm/ormrecord.h (modified) C++98 compatibility: Use throw() in destructor of std exceptions. Mon, 02 Oct 2017 21:03:50 GMT Philipp Spitzer [4d0db91] * src/gui/urlinputdialog.cpp (modified) C++98 compatibility: QDialogButtonBox::StandardButton::Open -> ... Mon, 02 Oct 2017 20:51:42 GMT gregor herrmann [d6f1e74] * src/global.pri (modified) Make sure we build with -std=c++98 (under Unix and Qt4) because gcc ... Sun, 01 Oct 2017 15:10:52 GMT gregor herrmann [9b07ee2] * NEWS (modified) * src/global.pri (modified) bump version after release Sun, 01 Oct 2017 14:53:08 GMT gregor herrmann [81c642b] * NEWS (modified) update NEWS before release of version 0.6.3 Wed, 27 Sep 2017 21:36:30 GMT Philipp Spitzer [15d41d9] * src/gui/eventdialog.cpp (modified) Now the links in the description are clickable. Fixes #49. Wed, 27 Sep 2017 20:36:57 GMT Philipp Spitzer [01d1452] * src/sql/schedulexmlparser.cpp (modified) The ID of an event is checked now when importing the XML file. Wed, 27 Sep 2017 20:36:57 GMT Philipp Spitzer [9782bbb] * src/sql/schedulexmlparser.cpp (modified) Now using exceptions to report errors in schedulexmlparser.cpp. Wed, 27 Sep 2017 20:36:56 GMT Philipp Spitzer [961971e] * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) Create dedicated sub-function to parse XML data (to prepare exception ... Wed, 27 Sep 2017 19:40:54 GMT Philipp Spitzer [a2f0d1e] * src/sql/schedulexmlparser.cpp (modified) Use TransactionRaii in schedulexmlparser.cpp. Wed, 27 Sep 2017 19:36:47 GMT Philipp Spitzer [c19618d] * src/sql/sqlengine.h (modified) Implement transaction RAII. Wed, 27 Sep 2017 19:36:00 GMT Philipp Spitzer [0c71a07] * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) Implement rollbackTransaction(). Wed, 13 Sep 2017 21:28:44 GMT Philipp Spitzer [d03ca41] * src/sql/schedulexmlparser.cpp (modified) * src/sql/sqlengine.cpp (modified) If no day_change was given for a conference 4 AM is assumed. Fixes #53. Wed, 13 Sep 2017 21:28:44 GMT Philipp Spitzer [7ba0378] * src/sql/schedulexmlparser.cpp (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) Import schedules with dates attached to events correctly. Wed, 13 Sep 2017 21:28:44 GMT Philipp Spitzer [f0f9fdc] * src/sql/sqlengine.cpp (modified) Avoid duplicate code when inserting/updating a conference. Wed, 13 Sep 2017 19:12:35 GMT gregor herrmann [a4d3f7b] * src/gui/urlinputdialog.cpp (modified) URL input dialog: trim URL. Wed, 30 Aug 2017 21:00:10 GMT Philipp Spitzer [9dbc426] * src/gui/urlinputdialog.cpp (modified) Minor typographic improvement. Wed, 30 Aug 2017 20:56:31 GMT Philipp Spitzer [841aad4] * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) "Open" button is disabled not when no URL was entered. Wed, 30 Aug 2017 19:34:42 GMT gregor herrmann [30edeb7] * data/confclerk.pod (modified) Mention new location of database file under Qt5 in docs. Wed, 30 Aug 2017 19:15:52 GMT gregor herrmann [79a7671] * confclerk.pro (modified) * src/app/app.pro (modified) * src/gui/eventdialog.cpp (modified) * src/gui/gui.pro (modified) * src/gui/mainwindow.h (modified) * src/gui/searchhead.h (modified) * src/mvc/delegate.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/mvc.pro (modified) * src/sql/sqlengine.cpp (modified) ifdef qt4 and qt5 Wed, 30 Aug 2017 18:38:27 GMT gregor herrmann [809b5e5] * .gitignore (added) * NEWS (modified) * README (modified) * confclerk.pro (modified) * data/confclerk.pod (modified) * src/alarm/alarm.cpp (modified) * src/alarm/alarm.h (modified) * src/app/application.cpp (modified) * src/app/application.h (modified) * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/app/main.cpp (modified) * src/dbschema001.sql (modified) * src/global.pri (modified) * src/gui/about.ui (modified) * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) * src/gui/conflictdialogcontainer.cpp (modified) * src/gui/conflictdialogcontainer.h (modified) * src/gui/conflictsdialog.cpp (modified) * src/gui/conflictsdialog.h (modified) * src/gui/daynavigatorwidget.cpp (modified) * src/gui/daynavigatorwidget.h (modified) * src/gui/dayviewtabcontainer.cpp (modified) * src/gui/dayviewtabcontainer.h (modified) * src/gui/errormessage.cpp (modified) * src/gui/errormessage.h (modified) * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/gui/eventdialog.ui (modified) * src/gui/favtabcontainer.cpp (modified) * src/gui/favtabcontainer.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) * src/gui/roomstabcontainer.cpp (modified) * src/gui/roomstabcontainer.h (modified) * src/gui/searchhead.cpp (modified) * src/gui/searchhead.h (modified) * src/gui/searchtabcontainer.cpp (modified) * src/gui/searchtabcontainer.h (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.h (modified) * src/gui/tabcontainer.cpp (modified) * src/gui/tabcontainer.h (modified) * src/gui/trackstabcontainer.cpp (modified) * src/gui/trackstabcontainer.h (modified) * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) * src/icons.qrc (modified) * src/icons/alarm-off.png (modified) * src/icons/alarm-on.png (modified) * src/icons/alarm.blend (modified) * src/icons/favourite-no.png (added) * src/icons/favourite-off.png (deleted) * src/icons/favourite-on.png (deleted) * src/icons/favourite-strong.png (added) * src/icons/favourite-weak.png (added) * src/icons/favourite.blend (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/eventmodel.h (modified) * src/mvc/room.cpp (modified) * src/mvc/room.h (modified) * src/mvc/track.cpp (modified) * src/mvc/track.h (modified) * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) * src/orm/ormrecord.h (modified) * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) * src/test/main.cpp (modified) * src/test/mvc/eventtest.cpp (modified) * src/test/mvc/eventtest.h (modified) Merge branch 'master' into qt5 Wed, 30 Aug 2017 18:19:18 GMT Philipp Spitzer [e27a3f5] * src/sql/sqlengine.cpp (modified) When no track is present, use the special name "No track" is used. ... Wed, 30 Aug 2017 17:44:17 GMT Philipp Spitzer [50c848a] * src/mvc/track.cpp (modified) Fix possibility for SQL injection attack. Wed, 30 Aug 2017 17:41:28 GMT Philipp Spitzer [511ff7e] * src/app/application.cpp (modified) Demangling exception class name from error message of unknown exceptions. Wed, 30 Aug 2017 17:28:58 GMT Philipp Spitzer [e4c166a] * src/gui/mainwindow.cpp (modified) Write debug message in case of silently catched exceptions. Wed, 30 Aug 2017 17:26:49 GMT Philipp Spitzer [330b8cb] * src/app/application.cpp (modified) More specific error message for "unknown" exceptions. Sun, 27 Aug 2017 20:58:18 GMT gregor herrmann [81e085d] * src/mvc/track.cpp (modified) TrackInsertException: make error message useful. Sun, 27 Aug 2017 20:57:52 GMT gregor herrmann [5def683] * src/mvc/track.cpp (modified) TrackInsertException: correctly derive from OrmSqlException. Sun, 27 Aug 2017 20:57:06 GMT gregor herrmann [bd11472] * src/orm/ormrecord.h (modified) Derive OrmException from std::runtime_error. Tue, 24 Jan 2017 17:50:06 GMT gregor herrmann [860fc82] * NEWS (modified) * src/global.pri (modified) bump version after release Tue, 24 Jan 2017 17:38:57 GMT gregor herrmann [57bb19b] * NEWS (modified) update NEWS before release. Mon, 23 Jan 2017 20:48:23 GMT Philipp Spitzer [fe5dac7] * src/gui/mainwindow.cpp (modified) Used tr() for some more GUI strings (there are plenty more that ... Mon, 23 Jan 2017 20:48:13 GMT Philipp Spitzer [6984e9d] * src/gui/mainwindow.cpp (modified) Used tr() for some GUI strings (there are plenty more that should be ... Mon, 23 Jan 2017 17:59:07 GMT gregor herrmann [f94ab1d] * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) Handle SSL errors. Show warning with error messages, offer to ... Mon, 23 Jan 2017 17:58:50 GMT gregor herrmann [0d41eb2] * src/gui/mainwindow.cpp (modified) Set some SSL parameters for network request. Sun, 22 Jan 2017 19:11:19 GMT Philipp Spitzer [056bee2] * src/mvc/delegate.cpp (modified) Merged definition and initialization of conflictSeverity. Sun, 22 Jan 2017 18:49:39 GMT gregor herrmann [0f10c1a] * src/mvc/delegate.cpp (modified) Initialize conflictSeverity variable. Compiler warning with ... Sun, 22 Jan 2017 17:27:55 GMT gregor herrmann [e5dfc61] * confclerk.pro (modified) confclerk.pro: add "-transparent white" to convert call Sun, 22 Jan 2017 16:41:03 GMT gregor herrmann [3ba7b3e] * src/gui/mainwindow.cpp (modified) Fix typo in error message. Sun, 22 Jan 2017 16:34:38 GMT gregor herrmann [a84243f] * README (modified) Update example schedule URLs in README. Sun, 22 Jan 2017 16:27:52 GMT gregor herrmann [77f03dd] * README (modified) * data/confclerk.pod (modified) Bump copyright years for icons. Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [c8257a4] * .gitignore (modified) Now ignoring .blend1 files (backup files Blender creates after saving). Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [5fc5d13] * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) In the treeview, the right mouse button now back-cycles the favourite ... Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [bda4629] * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) Added back-cycling option in Event::cycleFavourite. Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [7ea396f] * src/icons/alarm-off.png (modified) * src/icons/alarm-on.png (modified) Updated renderings of the alarm icons after changing the Blender file. Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [c99d950] * src/icons/alarm.blend (modified) The alarm icons had a black border instead of a white border in ... Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [2517471] * src/icons/favourite-no.png (modified) * src/icons/favourite-strong.png (modified) * src/icons/favourite-weak.png (modified) Updated renderings of the favourite icons after changing the Blender ... Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [659fb7b] * src/icons/favourite.blend (modified) The favourite icons had a black border instead of a white border in ... Sat, 21 Jan 2017 22:22:39 GMT Philipp Spitzer [cae4ca3] * src/icons/favourite-no.png (modified) * src/icons/favourite-strong.png (modified) * src/icons/favourite.blend (modified) Re-rendered favourite icons with Blender 2.76b and added favourite- ... Sat, 21 Jan 2017 00:09:53 GMT gregor herrmann [de5d0f1] * README (modified) * data/confclerk.pod (modified) * src/alarm/alarm.cpp (modified) * src/alarm/alarm.h (modified) * src/app/application.cpp (modified) * src/app/application.h (modified) * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/app/main.cpp (modified) * src/gui/about.ui (modified) * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) * src/gui/conflictdialogcontainer.cpp (modified) * src/gui/conflictdialogcontainer.h (modified) * src/gui/conflictsdialog.cpp (modified) * src/gui/conflictsdialog.h (modified) * src/gui/daynavigatorwidget.cpp (modified) * src/gui/daynavigatorwidget.h (modified) * src/gui/dayviewtabcontainer.cpp (modified) * src/gui/dayviewtabcontainer.h (modified) * src/gui/errormessage.cpp (modified) * src/gui/errormessage.h (modified) * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/gui/favtabcontainer.cpp (modified) * src/gui/favtabcontainer.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) * src/gui/roomstabcontainer.cpp (modified) * src/gui/roomstabcontainer.h (modified) * src/gui/searchhead.cpp (modified) * src/gui/searchhead.h (modified) * src/gui/searchtabcontainer.cpp (modified) * src/gui/searchtabcontainer.h (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.h (modified) * src/gui/tabcontainer.cpp (modified) * src/gui/tabcontainer.h (modified) * src/gui/trackstabcontainer.cpp (modified) * src/gui/trackstabcontainer.h (modified) * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/eventmodel.h (modified) * src/mvc/room.cpp (modified) * src/mvc/room.h (modified) * src/mvc/track.cpp (modified) * src/mvc/track.h (modified) * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) * src/orm/ormrecord.h (modified) * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) * src/test/main.cpp (modified) * src/test/mvc/eventtest.cpp (modified) * src/test/mvc/eventtest.h (modified) Bump copyright years. Sat, 21 Jan 2017 00:06:37 GMT gregor herrmann [95db98d] * src/dbschema001.sql (modified) whitespace Fri, 20 Jan 2017 23:04:47 GMT Philipp Spitzer [df1ba30] * src/icons/favourite-weak.png (modified) Addes white border to favourite-weak star. Fri, 20 Jan 2017 22:45:56 GMT Philipp Spitzer [81d87d7] * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.ui (modified) * src/icons.qrc (modified) * src/icons/favourite-no.png (moved) * src/icons/favourite-strong.png (moved) * src/mvc/delegate.cpp (modified) Renamed favourite-on.png to favourite-strong.png and favourite- ... Fri, 20 Jan 2017 22:04:17 GMT Philipp Spitzer [1343ea4] * src/mvc/delegate.cpp (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) Now the conflict severity is drawn. Fri, 20 Jan 2017 20:49:51 GMT Philipp Spitzer [ec7fa22] * src/mvc/event.h (modified) Removed deprecated functions. Fri, 20 Jan 2017 20:46:55 GMT Philipp Spitzer [7b3cd0e] * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/icons.qrc (modified) * src/icons/favourite-weak.png (added) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/treeview.cpp (modified) Event favourite is now tristate in the code now and the corresponding ... Fri, 20 Jan 2017 19:33:23 GMT Philipp Spitzer [ea8416e] * .gitignore (added) Checked in .gitignore. Fri, 20 Jan 2017 19:33:09 GMT Philipp Spitzer [3cd9fe6] * src/dbschema001.sql (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) favourite is now tristate instead of bool. Wed, 11 Jan 2017 20:48:53 GMT gregor herrmann [8cb2bc7] * src/gui/eventdialog.cpp (modified) eventdialog: only convertFromPlainText description and abstract if ... Wed, 11 Jan 2017 20:35:17 GMT gregor herrmann [ebe26af] * README (modified) * confclerk.pro (modified) * data/confclerk.pod (modified) * src/alarm/alarm.cpp (modified) * src/alarm/alarm.h (modified) * src/app/application.cpp (modified) * src/app/application.h (modified) * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/app/main.cpp (modified) * src/gui/about.ui (modified) * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) * src/gui/conflictdialogcontainer.cpp (modified) * src/gui/conflictdialogcontainer.h (modified) * src/gui/conflictsdialog.cpp (modified) * src/gui/conflictsdialog.h (modified) * src/gui/daynavigatorwidget.cpp (modified) * src/gui/daynavigatorwidget.h (modified) * src/gui/dayviewtabcontainer.cpp (modified) * src/gui/dayviewtabcontainer.h (modified) * src/gui/errormessage.cpp (modified) * src/gui/errormessage.h (modified) * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/gui/favtabcontainer.cpp (modified) * src/gui/favtabcontainer.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) * src/gui/roomstabcontainer.cpp (modified) * src/gui/roomstabcontainer.h (modified) * src/gui/searchhead.cpp (modified) * src/gui/searchhead.h (modified) * src/gui/searchtabcontainer.cpp (modified) * src/gui/searchtabcontainer.h (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.h (modified) * src/gui/tabcontainer.cpp (modified) * src/gui/tabcontainer.h (modified) * src/gui/trackstabcontainer.cpp (modified) * src/gui/trackstabcontainer.h (modified) * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/eventmodel.h (modified) * src/mvc/room.cpp (modified) * src/mvc/room.h (modified) * src/mvc/track.cpp (modified) * src/mvc/track.h (modified) * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) * src/orm/ormrecord.h (modified) * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) * src/test/main.cpp (modified) * src/test/mvc/eventtest.cpp (modified) * src/test/mvc/eventtest.h (modified) Merge branch 'master' into qt5 Tue, 20 Jan 2015 20:54:35 GMT gregor herrmann [4a87a3b] * README (modified) * data/confclerk.pod (modified) * src/alarm/alarm.cpp (modified) * src/alarm/alarm.h (modified) * src/app/application.cpp (modified) * src/app/application.h (modified) * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/app/main.cpp (modified) * src/gui/about.ui (modified) * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) * src/gui/conflictdialogcontainer.cpp (modified) * src/gui/conflictdialogcontainer.h (modified) * src/gui/conflictsdialog.cpp (modified) * src/gui/conflictsdialog.h (modified) * src/gui/daynavigatorwidget.cpp (modified) * src/gui/daynavigatorwidget.h (modified) * src/gui/dayviewtabcontainer.cpp (modified) * src/gui/dayviewtabcontainer.h (modified) * src/gui/errormessage.cpp (modified) * src/gui/errormessage.h (modified) * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/gui/favtabcontainer.cpp (modified) * src/gui/favtabcontainer.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) * src/gui/roomstabcontainer.cpp (modified) * src/gui/roomstabcontainer.h (modified) * src/gui/searchhead.cpp (modified) * src/gui/searchhead.h (modified) * src/gui/searchtabcontainer.cpp (modified) * src/gui/searchtabcontainer.h (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.h (modified) * src/gui/tabcontainer.cpp (modified) * src/gui/tabcontainer.h (modified) * src/gui/trackstabcontainer.cpp (modified) * src/gui/trackstabcontainer.h (modified) * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/eventmodel.h (modified) * src/mvc/room.cpp (modified) * src/mvc/room.h (modified) * src/mvc/track.cpp (modified) * src/mvc/track.h (modified) * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) * src/orm/ormrecord.h (modified) * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) * src/test/main.cpp (modified) * src/test/mvc/eventtest.cpp (modified) * src/test/mvc/eventtest.h (modified) Bump copyright year. In anticipation of a release in 2015. Tue, 20 Jan 2015 20:50:25 GMT gregor herrmann [6bbaac5] * confclerk.pro (modified) Update release target. Exclude .git directory from tarball. Tue, 20 Jan 2015 20:47:33 GMT gregor herrmann [b716480] * confclerk.pro (modified) Update ChangeLog target. Use ... Tue, 13 Jan 2015 22:27:16 GMT Philipp Spitzer [54b69e2] * NEWS (modified) * README (modified) * confclerk.pro (modified) * data/confclerk.pod (modified) * src/alarm/alarm.cpp (modified) * src/alarm/alarm.h (modified) * src/app/application.cpp (modified) * src/app/application.h (modified) * src/app/appsettings.cpp (modified) * src/app/appsettings.h (modified) * src/app/main.cpp (modified) * src/global.pri (modified) * src/gui/about.ui (modified) * src/gui/conferenceeditor.cpp (modified) * src/gui/conferenceeditor.h (modified) * src/gui/conflictdialogcontainer.cpp (modified) * src/gui/conflictdialogcontainer.h (modified) * src/gui/conflictsdialog.cpp (modified) * src/gui/conflictsdialog.h (modified) * src/gui/daynavigatorwidget.cpp (modified) * src/gui/daynavigatorwidget.h (modified) * src/gui/dayviewtabcontainer.cpp (modified) * src/gui/dayviewtabcontainer.h (modified) * src/gui/errormessage.cpp (modified) * src/gui/errormessage.h (modified) * src/gui/eventdialog.cpp (modified) * src/gui/eventdialog.h (modified) * src/gui/favtabcontainer.cpp (modified) * src/gui/favtabcontainer.h (modified) * src/gui/mainwindow.cpp (modified) * src/gui/mainwindow.h (modified) * src/gui/roomstabcontainer.cpp (modified) * src/gui/roomstabcontainer.h (modified) * src/gui/searchhead.cpp (modified) * src/gui/searchhead.h (modified) * src/gui/searchtabcontainer.cpp (modified) * src/gui/searchtabcontainer.h (modified) * src/gui/settingsdialog.cpp (modified) * src/gui/settingsdialog.h (modified) * src/gui/tabcontainer.cpp (modified) * src/gui/tabcontainer.h (modified) * src/gui/trackstabcontainer.cpp (modified) * src/gui/trackstabcontainer.h (modified) * src/gui/urlinputdialog.cpp (modified) * src/gui/urlinputdialog.h (modified) * src/mvc/conference.cpp (modified) * src/mvc/conference.h (modified) * src/mvc/conferencemodel.cpp (modified) * src/mvc/conferencemodel.h (modified) * src/mvc/delegate.cpp (modified) * src/mvc/delegate.h (modified) * src/mvc/event.cpp (modified) * src/mvc/event.h (modified) * src/mvc/eventmodel.cpp (modified) * src/mvc/eventmodel.h (modified) * src/mvc/room.cpp (modified) * src/mvc/room.h (modified) * src/mvc/track.cpp (modified) * src/mvc/track.h (modified) * src/mvc/treeview.cpp (modified) * src/mvc/treeview.h (modified) * src/orm/ormrecord.h (modified) * src/sql/schedulexmlparser.cpp (modified) * src/sql/schedulexmlparser.h (modified) * src/sql/sqlengine.cpp (modified) * src/sql/sqlengine.h (modified) * src/test/main.cpp (modified) * src/test/mvc/eventtest.cpp (modified) * src/test/mvc/eventtest.h (modified) Merged changes from trunk. It still compiles successfully. :-) Thu, 11 Sep 2014 21:02:06 GMT gregor herrmann [0af3939] * confclerk.pro (modified) Make release target depend on distclean target to ensure we have no ...