Commit Graph

14255 Commits

Author SHA1 Message Date
Björn Schießle b4df4cc61d Merge pull request #5219 from owncloud/catch_wrong_timezone
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
Bjoern Schiessle c1e5725db9 changed default time format to ISO8601 2013-10-09 10:40:20 +02:00
Morris Jobke a18ebac108 Merge pull request #5213 from owncloud/files-filesappdetectionhint
Added filesApp flag as input field for files app detection
2013-10-08 15:45:40 -07:00
Andreas Fischer fe64f7b900 Merge pull request #5032 from owncloud/fixing-5006-master
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
Thomas Müller 7bd5352509 php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer 2013-10-08 23:14:08 +02:00
Thomas Müller 8a06f2e128 php 5.3 compatibility for Test_Files_Sharing_Api 2013-10-08 23:05:19 +02:00
Thomas Müller 51b581a84d php 5.3 compatibility for \OC\Files\Storage 2013-10-08 23:00:41 +02:00
Thomas Müller 24e99016a9 Merge pull request #5188 from owncloud/master-delete-user
User::delete should return bool
2013-10-08 13:28:19 -07:00
Thomas Müller 6f3c49dabb fixing php 5.3 compatibility
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
Bjoern Schiessle 3cf4c46c43 catch unknown timezone and fall-back to UTC 2013-10-08 20:42:35 +02:00
Andreas Fischer 75588fc0b6 Use strict comparison === instead of ==. 2013-10-08 20:03:16 +02:00
Andreas Fischer 114e9d4403 Adjust return value tests for checkPassword() to what OC_User_Example says. 2013-10-08 19:57:37 +02:00
Andreas Fischer 6eab36a89b Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
The user id has to be returned.
2013-10-08 19:57:37 +02:00
Andreas Fischer 1f11dc7200 Use parent:: in Test_User_Database::getUser(). 2013-10-08 19:36:37 +02:00
Andreas Fischer 46cd3082b0 Test_User_Backend::getUser() does not return an array, it returns a string. 2013-10-08 19:36:37 +02:00
Andreas Fischer 00a0588807 Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. 2013-10-08 19:36:37 +02:00
Björn Schießle 76bdd6bc81 Merge pull request #5173 from owncloud/set_timezone_for_log
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
Vincent Petry cddb85c588 Added filesApp flag as input field for files app detection
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Bjoern Schiessle 835f36cb09 find users which are in the same group 2013-10-08 16:43:23 +02:00
Frank Karlitschek 92d9263e24 Merge pull request #5146 from guruz/cache_enabled_apps_list
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
Morris Jobke 6284ab31de fix escaping 2013-10-08 16:00:26 +02:00
Bjoern Schiessle 68e1dd1f23 make sure that we only remove file/folder shares 2013-10-08 16:00:18 +02:00
Victor Dubiniuk 176c2f1502 Add unit tests 2013-10-08 16:33:56 +03:00
Thomas Müller e7e53363ac Merge pull request #5194 from owncloud/fixing-5172-master
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
Björn Schießle f49de34373 Merge pull request #5193 from owncloud/fix_5126_2
fix upload to /Shared
2013-10-08 06:15:43 -07:00
Jenkins for ownCloud 209392587f [tx-robot] updated from transifex 2013-10-08 07:24:19 -04:00
Bjoern Schiessle 6c45fab037 part file needs to have .part extension 2013-10-08 12:00:32 +02:00
Thomas Müller c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
Bjoern Schiessle dd202d9ad3 updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" 2013-10-08 11:27:08 +02:00
Bjoern Schiessle 0293d8e04f If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder 2013-10-08 11:26:49 +02:00
kondou c99c3ea9e6 Optimize confirm.[svg|png] with optipng and scour 2013-10-08 02:40:13 +02:00
Morris Jobke 2123ef57d8 Merge pull request #5181 from owncloud/fixing-chunked-upload-master
Fixing broken chunked upload due to #4974
2013-10-07 13:20:43 -07:00
Victor Dubiniuk 77f43c357c User::delete should return bool 2013-10-07 22:30:15 +03:00
Bart Visscher 6a93994a01 Merge pull request #4796 from owncloud/config-no-catch
Remove the exception catch in OC_Config, this should be handled by a higher layer
2013-10-07 11:45:13 -07:00
VicDeo 372a73d43a Merge pull request #5184 from owncloud/fix-trash-bin-button
Fix trash bin button
2013-10-07 10:58:47 -07:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Morris Jobke 980fc9cc7e Fix trash bin button 2013-10-07 18:15:23 +02:00
Morris Jobke 605ace7398 Merge pull request #5179 from owncloud/userlist-avatar
Fix new user avatar. Ref#5166
2013-10-07 08:47:39 -07:00
Morris Jobke 4af220d09e Fix password screen for public shares
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
 * Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Thomas Müller f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Vincent Petry a3d0e29aa5 Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
VicDeo d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Victor Dubiniuk a240e63981 Fix new user avatar. Ref#5166 2013-10-07 18:00:15 +03:00
Vincent Petry 6a36d7fa86 Added isPublic flag in files_sharing template
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.

This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
Bjoern Schiessle 6a411833b9 let admin specify timezone for log file entries 2013-10-07 15:34:48 +02:00
Thomas Müller b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Morris Jobke 0d492afee1 Merge pull request #5169 from owncloud/sharingdropdown-uxbugfixes
Sharing dropdown bug fixes
2013-10-07 05:14:14 -07:00
Morris Jobke 2b3c351601 Merge pull request #5162 from owncloud/fixing-l10n-master-2
Fixing l10n master 2
2013-10-07 05:07:47 -07:00
Morris Jobke 193e815133 Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
Vincent Petry e97aaee1aa Prevent share dropdown to close too early with autocomplete
When clicking on an autocomplete result in the sharing dropdown,
it will mistakenly be detected as being clicked outside and would
trigger the sharing dropdown closing.

This fix adds a check to detect clicks inside the autocomplete and
prevent closing the dropdown in that case.

This fixes #4142
2013-10-07 13:26:46 +02:00