Commit Graph

13797 Commits

Author SHA1 Message Date
Thomas Müller 8c9add4d32 adding TB and GB to OC_Helper::humanFileSize 2013-09-13 17:22:45 +02:00
Jörn Friedrich Dreyer 7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
kondou 18da2f9cf7 Improve changepassword route naming 2013-09-13 17:07:23 +02:00
kondou 306a8681c5 Move ajax/changepassword to changepassword/controller to use autoloading 2013-09-13 17:03:13 +02:00
Bernhard Posselt 5633291cef use lineheight instead of padding and height 2013-09-13 15:53:03 +02:00
ringmaster 3790cbb493 Allow numeric group names 2013-09-13 09:06:20 -04:00
Thomas Müller d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Andreas Fischer 294f3632e0 Calculate dateInPast and dateInFuture. 2013-09-12 23:43:21 +02:00
Andreas Fischer 20b799b2b4 Compare objects directly. Also use $expected and $actual. 2013-09-12 23:43:21 +02:00
Andreas Fischer bd1163b7d5 Add database tests for INSERT/SELECT date format. 2013-09-12 23:43:21 +02:00
Andreas Fischer 786017c247 Register EventSubscriber that resets Oracle's NLS_DATE_FORMAT etc. 2013-09-12 23:43:20 +02:00
Andreas Fischer 7f07d737f8 Create instance of Doctrine\Common\EventManager() in OC_DB. 2013-09-12 23:43:20 +02:00
Andreas Fischer 261766fe49 Add comment explaining how $dateInFuture was picked. 2013-09-12 23:43:20 +02:00
Andreas Fischer f567bd1b8a Coding style: { for methods start are supposed to be on the same line. 2013-09-12 23:43:20 +02:00
Andreas Fischer fb650deaf7 Expiration tests for sharing with groups. 2013-09-12 23:43:20 +02:00
Andreas Fischer cf97eac401 Do not repeat shareUserOneTestFileWithUserTwo() code. 2013-09-12 23:43:20 +02:00
Andreas Fischer e4b334c3f1 Make dates test class properties. 2013-09-12 23:43:20 +02:00
Andreas Fischer 924a7046dd Try to make Oracle happy by also specifying seconds. 2013-09-12 23:43:20 +02:00
Andreas Fischer 1358b0078a Test whether a still-valid user share is still accessible. 2013-09-12 23:43:20 +02:00
Andreas Fischer 05c970095d Test whether an expired user share is still accessible. 2013-09-12 23:43:20 +02:00
Robin Appelman 58ed78aa9e cleanup public storage interface a bit 2013-09-12 21:58:32 +02:00
Robin Appelman c9d2663159 Merge branch 'master' into fileapi-foreward 2013-09-12 21:43:35 +02:00
Jan-Christoph Borchardt c7ca86799b Merge pull request #4816 from owncloud/fixing-723-master
Fixing 723 master
2013-09-12 07:48:00 -07:00
kondou c9c5e1b97f Merge branch 'master' into oc_avatars 2013-09-12 07:41:44 +02:00
Thomas Tanghus b7205d97d7 Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
Thomas Müller 9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Thomas Müller 5af111b0de added determineIcon to \OCA\files\lib\Helper 2013-09-12 00:39:52 +02:00
Thomas Müller 3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
kondou 4d62f747fa Clean up rawlist.php and fix non-array request 2013-09-12 00:21:01 +02:00
Thomas Müller b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Thomas Müller 8543951cf9 adding icons for shared folders and external folders 2013-09-12 00:12:20 +02:00
Thomas Tanghus 80bf1969f9 Merge pull request #4784 from owncloud/ocdialog_option_setter
Fix setting ocdialog options after initialization.
2013-09-11 12:20:17 -07:00
Thomas Tanghus 08225a60c8 Save two lines 2013-09-11 21:15:32 +02:00
Thomas Tanghus 1f8f0e61d8 Remove test error :P 2013-09-11 21:11:35 +02:00
Thomas Tanghus 7a2b23a036 Fix double destroy on escape. 2013-09-11 17:13:39 +02:00
Pete McFarlane 15be3d85b6 no autoFocus if no users returned 2013-09-11 15:59:28 +01:00
kondou 2ae3ab98d8 Merge branch 'master' into split_personal-user_passwordchange 2013-09-11 16:35:55 +02:00
kondou f6faec0e0b Use a controller instead of two files for changepassword.php 2013-09-11 16:35:13 +02:00
kondou 037cf22c51 Add a comment to clear defaultavatar-functionality 2013-09-11 16:04:41 +02:00
Thomas Tanghus 799c5c2c9b Don't popup meaningless alerts when dialog called on page leave 2013-09-11 16:02:12 +02:00
VicDeo 62eeac3390 Merge pull request #4798 from owncloud/fixing-variable-typos-master
no further comment - which dev did not test this BEFORE submitting the p...
2013-09-11 05:58:07 -07:00
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
Pete McFarlane 92b57c13c1 Added autoFocus to #shareWith autocomplete options 2013-09-11 11:45:32 +01:00
kondou 83d3df4111 Split some lines, use ===, avoid unnecessary operation 2013-09-11 12:12:40 +02:00
Bart Visscher 4ab8dc9c08 Merge pull request #4788 from owncloud/fixin-irods-session-master
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
kondou bf7f94422f Bring another enable_avatars to $_ and fix $thus->$this 2013-09-11 07:11:33 +02:00
Thomas Müller af2164bbcb no further comment - which dev did not test this BEFORE submitting the pull request?
which reviewer did not test the pull request?
2013-09-11 01:23:37 +02:00
Thomas Müller 3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Robin Appelman b9167196fb adjust test cases to namespace changes 2013-09-10 22:21:49 +02:00