Commit graph

10799 commits

Author SHA1 Message Date
Jenkins for ownCloud
05ab9d2de7 [tx-robot] updated from transifex 2013-04-23 02:00:31 +02:00
Bernhard Posselt
edd37c779d Merge pull request #3074 from owncloud/sqlite3-raiseerror
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 14:34:09 -07:00
Bernhard Posselt
4af4a5bd98 Merge pull request #3073 from owncloud/setup-error-message
Improve error message if user creation fails during setup
2013-04-22 13:28:18 -07:00
Bernhard Posselt
8b490e0ec3 Merge pull request #3078 from owncloud/files-dnd
Files: Fix XSS when creating dropshadow
2013-04-22 13:16:35 -07:00
Robin Appelman
1507d1ef26 Files: Fix XSS when creating dropshadow 2013-04-22 21:55:54 +02:00
Bart Visscher
2314067e75 Merge pull request #3019 from owncloud/fix-3004
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-22 20:46:13 +02:00
Robin Appelman
7c1a4d2f57 Fix raiseError call in the MDB2 sqlite3 driver 2013-04-22 20:34:00 +02:00
Robin Appelman
5942d5aeac Improve error message if user creation fails during setup 2013-04-22 20:32:40 +02:00
Jan-Christoph Borchardt
c7a17efc01 Merge pull request #2983 from owncloud/style-details
Style details
2013-04-22 07:12:19 -07:00
Jenkins for ownCloud
f6808617b3 [tx-robot] updated from transifex 2013-04-22 02:00:20 +02:00
Jenkins for ownCloud
e0027ad78b [tx-robot] updated from transifex 2013-04-21 02:04:42 +02:00
Jenkins for ownCloud
03c7a52bc5 [tx-robot] updated from transifex 2013-04-20 02:02:09 +02:00
Bart Visscher
0701d0019b Merge pull request #3020 from owncloud/cleaner-webdav-reason
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
2013-04-19 07:56:41 -07:00
Bart Visscher
e1c5b31d65 Test if we want a 3rdparty style/script before checking the 3rdparty root 2013-04-19 16:09:39 +02:00
Bart Visscher
25e7dc1ec5 Merge pull request #3024 from owncloud/file-delete-action
Fix #1164 and fix showing spinner on delete
2013-04-19 06:08:09 -07:00
Bart Visscher
802a5a331b Fix displaying spinner on delete 2013-04-19 13:46:11 +02:00
Bart Visscher
a21885953f No need to strip slashes, json_decode handles that for us 2013-04-19 13:45:40 +02:00
Bart Visscher
7ac49dd52a Cleaner isWebDAVWorking reason, otherwise people overlook the reason 2013-04-19 12:44:54 +02:00
Thomas Tanghus
4ccc9d896a Merge pull request #3010 from owncloud/fix-cookie_path
Don't use empty session.cookie_path, otherwise we get multiple cookies
2013-04-19 01:17:35 -07:00
Jenkins for ownCloud
1ad0c11136 [tx-robot] updated from transifex 2013-04-19 01:57:39 +02:00
Bart Visscher
e4876c9117 Don't use empty session.cookie_path, otherwise we get multiple cookies 2013-04-18 21:11:58 +02:00
Jenkins for ownCloud
cbd8b792d9 [tx-robot] updated from transifex 2013-04-18 02:09:28 +02:00
Bernhard Posselt
739d8eb152 Merge pull request #2986 from eMerzh/upgrade_warn
Warn when we do an upgrade
2013-04-17 12:43:15 -07:00
Brice Maron
43d0f1fabf Warn when we do an upgrade 2013-04-17 21:29:14 +02:00
Raghu Nayyar
a3e5da834b Merge pull request #2925 from owncloud/navigation-icon-fix
fix navigation hover effect, documentation
2013-04-17 10:20:36 -07:00
Jan-Christoph Borchardt
d83adb8b84 remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px 2013-04-17 17:36:30 +02:00
Jan-Christoph Borchardt
3d47c62a20 apply navigation hover effect directly to img and span, cleaner code 2013-04-17 17:23:12 +02:00
Jan-Christoph Borchardt
c8cafcefe4 move password warning more relevant below password field, un-nest log in warning 2013-04-17 17:16:15 +02:00
Jan-Christoph Borchardt
21bcb95e2a move warning and error states together in CSS, to be cleaned up 2013-04-17 17:15:34 +02:00
Bernhard Posselt
3b2a0523f8 Merge pull request #2978 from owncloud/displayname_can_be_null
Remove not null constraint. Fix #2976
2013-04-17 07:47:17 -07:00
Jan-Christoph Borchardt
9f58166339 make textarea inherit ownCloud font instead of using monospace 2013-04-17 16:30:42 +02:00
Morris Jobke
867a527148 Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
2013-04-17 06:49:46 -07:00
Bernhard Posselt
4679e789e1 also adjust template properly for log date fix 2013-04-17 15:31:05 +02:00
Thomas Tanghus
44668b36a7 Remove not null constraint. Fix #2976 2013-04-17 14:08:45 +02:00
Bernhard Posselt
f7e29eabf2 fix admin log display and use a more readable format 2013-04-17 14:05:51 +02:00
Bernhard Posselt
8471340db9 use date and time instead of timestamp 2013-04-17 12:24:18 +02:00
Thomas Tanghus
ec280e6f9f Merge pull request #2746 from owncloud/use-count-userexists
Use count SQL to check for user existance
2013-04-17 03:06:50 -07:00
Jan-Christoph Borchardt
ca323e56c2 correct primary color to #1d2d44 where slightly wrong 2013-04-17 11:55:27 +02:00
Björn Schießle
ddde1b65db adapt free space calculation to the way it is done for the trash bin 2013-04-17 10:43:12 +02:00
Björn Schießle
a3999036f7 improved free space calculation if no quota is set, discussed in #2936 2013-04-17 10:42:59 +02:00
Bart Visscher
f3c06ae4e4 Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
2013-04-17 00:44:14 -07:00
Jenkins for ownCloud
37868818ff [tx-robot] updated from transifex 2013-04-17 02:29:17 +02:00
icewind1991
c50dfd7251 Merge pull request #2951 from owncloud/no_personal_variables
No personal prefixes for variables.
2013-04-16 15:43:20 -07:00
Bernhard Posselt
7049436058 Merge pull request #2953 from jerrac/emailsavetimeout
Modified how the #lostpassword or #email fields save email addresses on ...
2013-04-16 13:56:14 -07:00
David Reagan
0dd6f16e0b Removed extra id from jquery selectors. Remove console.log call. Removed commented code. 2013-04-16 13:22:04 -07:00
David Reagan
6d812ada05 Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event. 2013-04-16 13:03:41 -07:00
Michael Gapczynski
2040f0af78 Merge pull request #2943 from owncloud/always_load_cache_hooks_first
always connect file cache updater hooks first
2013-04-16 12:21:09 -07:00
kondou
6ee2b4c740 No personal prefixes for variables. 2013-04-16 19:18:15 +02:00
Bart Visscher
8d1db84ed1 Merge pull request #2887 from owncloud/l10n-caching
L10N: cache the result of findLanguage
2013-04-16 09:11:33 -07:00
Jörn Friedrich Dreyer
606b672a3d always connect file cache updater hooks first 2013-04-16 13:07:55 +02:00