Commit Graph

18701 Commits

Author SHA1 Message Date
Bjoern Schiessle 4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Vincent Petry 2facfe9984 Merge pull request #8985 from owncloud/share-grouporderfix
Added ORDER BY to enforce share entry order
2014-06-11 17:20:22 +02:00
Vincent Petry 65b3d293ce Added ORDER BY to enforce share entry order
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.

This fix adds an ORDER BY clause to force the order by id.
2014-06-11 14:28:30 +02:00
Frank Karlitschek 7742791bc2 increase to 7.0 alpha 1 2014-06-11 10:54:45 +02:00
Vincent Petry 491c96eaa9 Merge pull request #8966 from owncloud/fix_failing_tests_on_master
Fix failing tests on master
2014-06-11 10:05:38 +02:00
Jenkins for ownCloud f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Morris Jobke e89f1784a3 Merge pull request #8972 from owncloud/use_imagettftext_take2
make text preview backend use imagettftext, fixes #8087
2014-06-11 01:07:32 +02:00
jbtbnl 077a542d59 Merge pull request #8971 from owncloud/sidebar-disablesnapperinielte9
Disable snapper init for IE <= 9
2014-06-10 21:59:55 +02:00
Georg Ehrke e047e28ac5 make text preview backend use imagettftext, fixes #8087 2014-06-10 17:29:40 +02:00
Vincent Petry 015c5062e5 Disable snapper init for IE <= 9
Snapper doesn't work at all for IE8 and IE9 and messes up with the main
container layout when enabled.

This commits disables snapper for these browsers.
2014-06-10 17:14:49 +02:00
Bjoern Schiessle 9dc0befcca call self::getNumericStorageId() to get the numeric ID 2014-06-10 14:48:19 +02:00
Bjoern Schiessle f4a183e753 wwe no longer have a versions table 2014-06-10 14:47:32 +02:00
Bjoern Schiessle 1d9b4aadbf no need to prepare a statement twice 2014-06-10 14:46:47 +02:00
Morris Jobke ecc41fe0c3 Merge pull request #8908 from owncloud/fix-placeholders
fix split translations. fix for the discussion in the description
2014-06-10 10:47:23 +02:00
Jenkins for ownCloud 6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
jbtbnl b2c86b7a07 Merge pull request #8928 from owncloud/too-long-filename-fix-v2
Ellipcises too long filenames
2014-06-09 13:09:18 +02:00
Morris Jobke 3239d1099c Merge pull request #8948 from owncloud/fix-logger-race-condition
set logger before registrate to an error handler
2014-06-09 11:07:10 +02:00
Morris Jobke 63c5c7bd21 set logger before registrate to an error handler 2014-06-09 10:02:23 +02:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Morris Jobke e769ef9bbb Merge pull request #8916 from owncloud/rmdirr-test-cleanup-fix
Added hacky fix for long path cleanup routine
2014-06-08 20:46:00 +02:00
Morris Jobke e3429b63a2 improve ellipsis of filename for different screen sizes 2014-06-08 17:48:53 +02:00
Morris Jobke 1037533a9e Merge pull request #8937 from owncloud/design-sizing
Layout fixes
2014-06-08 12:31:24 +02:00
raghunayyar f3a605230a @jancborchardt's commit for cross browser compatibility of extension. 2014-06-08 15:06:01 +05:30
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Volkan Gezer bcbebe8dd2 Merge pull request #8942 from owncloud/fix-user-search-field
fix hidden user group search field
2014-06-08 03:11:54 +02:00
Volkan Gezer e34a8bb9d6 fix hidden user group search field 2014-06-07 21:12:12 +02:00
raghunayyar 09206f8a49 Adds class name to span element inside filename. 2014-06-07 23:54:21 +05:30
Jan-Christoph Borchardt c0973fe7e8 display empty content message a bit higher up so it's easier to see 2014-06-07 12:08:12 +02:00
Jan-Christoph Borchardt 49e15f0130 app settings: only display text fields at full width, not buttons 2014-06-07 12:07:50 +02:00
raghunayyar d71bb7dbe4 Adds multiple media queries for filename. 2014-06-07 14:23:49 +05:30
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Björn Schießle 3da47db33c Merge pull request #8927 from owncloud/expire_only_link_shares
only expire link shares
2014-06-06 19:24:15 +02:00
Raghu Nayyar dfe6bd61bf Merge pull request #8935 from owncloud/missed-apps-tag
wrap App text with t() to let it use locales
2014-06-06 22:39:31 +05:30
Vincent Petry 506f7adb12 Merge pull request #8925 from owncloud/extstorage-sidebar
Added external storage list in files app
2014-06-06 18:59:37 +02:00
Raghu Nayyar dc77910758 Merge pull request #8933 from owncloud/fix-logo-glitch
Fix logo glitch
2014-06-06 22:08:10 +05:30
Volkan Gezer 713a1c683b wrap App text with t() to let it use locales 2014-06-06 18:31:04 +02:00
Bjoern Schiessle 9c00f5ddb6 set minDate and maxDate in datepicker 2014-06-06 17:40:16 +02:00
Thomas Müller 647dcce514 Merge pull request #8253 from owncloud/pk-on-all-tables-master
Primary keys on all tables master
2014-06-06 16:40:11 +02:00
Thomas Müller c053f27381 Merge pull request #8921 from owncloud/fix-remove-storage-master
No need to create a storage within remove
2014-06-06 16:16:44 +02:00
Jan-Christoph Borchardt 6f0f738f08 reduce padding by 1px after increasing image 2014-06-06 15:58:30 +02:00
Jan-Christoph Borchardt 85a002468d fix logo glitch, add whitespace around form 2014-06-06 15:54:19 +02:00
Bjoern Schiessle f15d7dfec0 only expire link shares 2014-06-06 15:47:37 +02:00
Vincent Petry e39e6a5584 Fixed delete button CSS in ext storage list 2014-06-06 15:33:33 +02:00
Volkan Gezer f56b86e857 fix split translations 2014-06-06 15:31:51 +02:00
Vincent Petry 710d017eec Added more columns to ext storage list
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
2014-06-06 15:06:26 +02:00
Vincent Petry a47ef52ae2 Fixed ext storage list sorting 2014-06-06 15:06:26 +02:00
Vincent Petry 01c2c3107a Added external storage list in files app 2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt 933c05566e Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt 1a519b851d Merge pull request #8923 from owncloud/app-settings-input
app settings: display input fields at full width
2014-06-06 14:52:23 +02:00
raghunayyar 1d1f958bea Ellipcises too long filenames 2014-06-06 17:30:18 +05:30