Commit graph

4819 commits

Author SHA1 Message Date
Daniel Molkentin
23d8f01012 Fix locating translations on linux 2013-09-05 11:08:00 +02:00
Daniel Molkentin
05178f0fbf Fix locating translations on linux 2013-09-05 11:06:40 +02:00
Daniel Molkentin
573aaec9fd Fix propagator test 2013-09-04 17:29:19 +02:00
Klaas Freitag
8fe102662d Merge branch 'propagator-ng': Fixes to work with new LGPL ocsync.
Conflicts:
	src/mirall/csyncthread.cpp
2013-09-04 16:33:06 +02:00
Olivier Goffart
83cdece0b4 Merge remote-tracking branch 'owncloud/ocsync' into ocsync 2013-09-04 15:53:47 +02:00
Klaas Freitag
4cc1ef3624 Merge remote-tracking branch 'freitag/dav' into ocsync
Conflicts:
	src/csync_propagate.c
	src/csync_statedb.c
2013-09-04 15:51:38 +02:00
Klaas Freitag
b676ffe208 Some more info about the exclude matching. 2013-09-04 15:17:43 +02:00
Daniel Molkentin
625b21152e Merge branch 'qt5' 2013-09-04 15:01:21 +02:00
Daniel Molkentin
385759f3c9 bump version 2013-09-04 15:00:53 +02:00
Daniel Molkentin
12b9b87c61 Update 0.90.0 changelog 2013-09-04 11:15:42 +02:00
Daniel Molkentin
9ce09713b6 1.4.0 final 2013-09-04 11:09:12 +02:00
Daniel Molkentin
0e1858ef2f 0.90.0 for final release with mirall 1.4 2013-09-03 16:44:46 +02:00
Klaas Freitag
d65b9aa404 Fixed exclude test. 2013-09-03 15:15:14 +02:00
Klaas Freitag
4fa6faf608 Hide quota and display explanation if no quota info is available. 2013-09-03 14:25:28 +02:00
Klaas Freitag
a24ae13d9c Added logging to quota info result slot. 2013-09-03 14:25:28 +02:00
Daniel Molkentin
64dd0d1b45 Consistent look for top-labels 2013-09-03 14:24:34 +02:00
Daniel Molkentin
da63b1223c Doc: more polishing
- add description of syncing limitations
- update out-of-date comments

Fixes #788
2013-09-03 12:35:40 +02:00
Jenkins for ownCloud
36f32c2aef [tx-robot] updated from transifex 2013-09-03 06:30:41 -04:00
Klaas Freitag
8b224e2c0a Don't warn about a finished sqlite3 query. 2013-09-03 11:47:19 +02:00
Daniel Molkentin
063acadc3b Doc: new interface chapter 2013-09-02 19:28:06 +02:00
Klaas Freitag
81c720c05b Remove dots from the end of error messages. 2013-09-02 17:37:16 +02:00
Klaas Freitag
edcdcb945a Show the reason why a file was ignored. 2013-09-02 17:25:23 +02:00
Klaas Freitag
ce554eb44a Let csync exclude report the exclude reason. 2013-09-02 17:23:17 +02:00
Daniel Molkentin
5df6430bb2 Doc: Do not enforce theme when building without submodules 2013-09-02 15:55:03 +02:00
Daniel Molkentin
9a0096d07c Docs: Allow to build with org and com branding 2013-09-02 14:01:15 +02:00
Jenkins for ownCloud
25d33d6057 [tx-robot] updated from transifex 2013-09-01 12:30:19 -04:00
Daniel Molkentin
ab4c6247c7 Fix display of "Monochrome icon" setting
The logic was inverse, and there was a typo in the string. Oh my...
2013-08-31 14:14:24 +02:00
Jenkins for ownCloud
1b69dbb38b [tx-robot] updated from transifex 2013-08-30 09:22:37 -04:00
Daniel Molkentin
bfdd488b00 Tests: make tests run in parallel 2013-08-29 14:50:55 +02:00
Daniel Molkentin
54c8809bf4 Tests: Fix indentation 2013-08-29 14:50:18 +02:00
Daniel Molkentin
0873665bec Tests: Move all comparisons from QVERIFY to QCOMPARE 2013-08-29 14:48:40 +02:00
Olivier Goffart
02b3033ca3 Use the same convention as on the server to format strings
* use power of 10 SI units
 * use "B" instead of "bytes"
 * use at least 2 significant digit, but no more than one digit after
   the period
2013-08-29 12:06:41 +02:00
Olivier Goffart
a27c8ad90c Fix crash in case of error
the QObject::parent() is 0
2013-08-28 21:26:42 +02:00
Olivier Goffart
bf6d0a521c Compile with Qt5 2013-08-28 20:58:22 +02:00
Olivier Goffart
336bbb2403 Compile with Qt4 2013-08-28 20:14:40 +02:00
Daniel Molkentin
73da086964 Initial changes to also build on Qt5, doesn't compile yet 2013-08-28 17:03:31 +02:00
Daniel Molkentin
58f4f3623f Startup: Unity has no proper Systray implementation
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:51:00 +02:00
Daniel Molkentin
18a58f73de Startup: Unity has no proper Systray implementation
...so it can't respond to isSysTrayAvailable()
2013-08-28 15:45:52 +02:00
Daniel Molkentin
d1451a3c90 Mac: Use hdiutil attach instead of open during signing 2013-08-28 12:53:34 +02:00
Jenkins for ownCloud
0bef47b2f3 [tx-robot] updated from transifex 2013-08-28 05:24:20 -04:00
Jenkins for ownCloud
ccc05d6658 [tx-robot] updated from transifex 2013-08-27 10:23:30 -04:00
Olivier Goffart
c15de69156 Reconfigure the proxy when needed 2013-08-27 10:02:59 +02:00
Thomas Müller
8bfb44fd28 Inverting the logic to set the prefix for SYSCONF_INSTALL_DIR 2013-08-26 22:42:17 +02:00
Daniel Molkentin
79d3b84fad Reintroduce workaround for /etc in root if files go to /usr 2013-08-26 21:59:52 +02:00
Daniel Molkentin
b97701586e Properly install icons 2013-08-26 21:18:56 +02:00
Daniel Molkentin
b120345fe7 Icon file needs to use app_executable as well 2013-08-26 20:54:10 +02:00
Daniel Molkentin
ec5c65a530 install correct file 2013-08-26 20:35:56 +02:00
Daniel Molkentin
77e7a1fa8d Fix casing in settings dialog 2013-08-26 20:22:24 +02:00
Daniel Molkentin
f6d45b68ef More clear error messages 2013-08-26 20:20:10 +02:00
Daniel Molkentin
24d76a0d75 desktop file == executable 2013-08-26 20:20:10 +02:00