]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Tue, 11 Mar 2014 14:40:14 +0000 (15:40 +0100)]
Fix 3rdparty submodule after transifex sync broke it
Vincent Petry [Tue, 11 Mar 2014 11:40:59 +0000 (12:40 +0100)]
Merge pull request #7650 from owncloud/quota-totalspace
Fixed total space display when data size exceeds quota
Vincent Petry [Tue, 11 Mar 2014 11:40:14 +0000 (12:40 +0100)]
Merge pull request #7652 from owncloud/localStorage_remove
Add OC.localStorage.removeItem()
Vincent Petry [Tue, 11 Mar 2014 10:36:22 +0000 (11:36 +0100)]
Merge pull request #7659 from owncloud/fix-7596
Fix 7596
Jenkins for ownCloud [Tue, 11 Mar 2014 05:59:39 +0000 (01:59 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 10 Mar 2014 22:24:24 +0000 (23:24 +0100)]
Changing host after transifex client update on server
Thomas Müller [Mon, 10 Mar 2014 20:56:37 +0000 (21:56 +0100)]
remove magic handling of recipient lists by exploding the string - this functionality is nowhere used this way and nowhere documented - and broken because only $toaddress will be exploded not $toname
Thomas Müller [Mon, 10 Mar 2014 20:54:23 +0000 (21:54 +0100)]
send an individual email to each recipient
Vincent Petry [Mon, 10 Mar 2014 18:54:00 +0000 (19:54 +0100)]
Merge pull request #7602 from owncloud/flush-updater-cache
Reset time of last update feed polling after successful update
Lukas Reschke [Mon, 10 Mar 2014 18:52:04 +0000 (19:52 +0100)]
Merge pull request #7656 from owncloud/xml-entityfixes
Disable XML entities when parsing XML
Vincent Petry [Mon, 10 Mar 2014 14:19:18 +0000 (15:19 +0100)]
Fixed total space display when data size exceeds quota
The total space display in the personal page now shows the quota value
instead of used space when used space exceeds the quota (soft quota).
Vincent Petry [Mon, 10 Mar 2014 16:49:47 +0000 (17:49 +0100)]
Disable XML entities when parsing XML
Thomas Tanghus [Mon, 10 Mar 2014 15:26:07 +0000 (16:26 +0100)]
Fix copy/paste error
Thomas Tanghus [Mon, 10 Mar 2014 15:22:52 +0000 (16:22 +0100)]
Add function remove() to OC.localeStorage
Vincent Petry [Mon, 10 Mar 2014 15:12:39 +0000 (16:12 +0100)]
Merge pull request #7600 from ideaship/fix_escaped_html
fix: use print_escaped for radio button "checked"
Thomas Müller [Mon, 10 Mar 2014 15:06:17 +0000 (16:06 +0100)]
Merge pull request #7646 from owncloud/fix_ocs_api_unshare
we need the file_source to delete a share successfully
Vincent Petry [Mon, 10 Mar 2014 15:04:47 +0000 (16:04 +0100)]
Merge pull request #7398 from owncloud/trash_dont_rely_on_db
[trash] fall back if file is not in db
Bjoern Schiessle [Mon, 3 Mar 2014 11:23:21 +0000 (12:23 +0100)]
fix mimetype detection, introduce fake etag to identify preview images
Bjoern Schiessle [Tue, 25 Feb 2014 20:35:54 +0000 (21:35 +0100)]
get trash size from file cache
Bjoern Schiessle [Tue, 25 Feb 2014 20:28:39 +0000 (21:28 +0100)]
only enable previews if the encryption is disabled
Bjoern Schiessle [Tue, 25 Feb 2014 19:46:41 +0000 (20:46 +0100)]
if file is not in db, fall back to restore file to the users root
Thomas Müller [Mon, 10 Mar 2014 14:10:19 +0000 (15:10 +0100)]
Merge pull request #7632 from owncloud/fix-7582-master
we first shall check if the current session is valid - otherwise the ses...
Vincent Petry [Mon, 10 Mar 2014 10:40:28 +0000 (11:40 +0100)]
Merge pull request #7629 from owncloud/files-allfileswarningtypo
Fixed log warning when deleting a single file
Bjoern Schiessle [Mon, 10 Mar 2014 10:16:09 +0000 (11:16 +0100)]
we need the file_source to delete a share successfully
Vincent Petry [Mon, 10 Mar 2014 09:04:54 +0000 (10:04 +0100)]
Merge pull request #7631 from ichEben/master
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
Vincent Petry [Mon, 10 Mar 2014 08:38:24 +0000 (09:38 +0100)]
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
[master] Fixed used space to be based on unencrypted size
Thomas Tanghus [Sun, 9 Mar 2014 22:34:01 +0000 (23:34 +0100)]
Merge pull request #7628 from owncloud/fileinfo-type
Fix FileInfo->getType errors
Jan-Christoph Borchardt [Sun, 9 Mar 2014 00:22:51 +0000 (01:22 +0100)]
Merge pull request #7567 from owncloud/apps-scroll-settings
restrict height of settings and make scrollable
Thomas Müller [Fri, 7 Mar 2014 19:06:06 +0000 (20:06 +0100)]
fixing ident
Thomas Müller [Fri, 7 Mar 2014 19:00:34 +0000 (20:00 +0100)]
we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth
IchEben [Fri, 7 Mar 2014 16:45:24 +0000 (17:45 +0100)]
only initialise upload dropZone if public upload is allowed
Robin Appelman [Fri, 7 Mar 2014 14:16:35 +0000 (15:16 +0100)]
Check if value exists before returning
Vincent Petry [Fri, 7 Mar 2014 14:03:35 +0000 (15:03 +0100)]
Fixed log warning when deleting a single file
Vincent Petry [Fri, 7 Mar 2014 10:25:29 +0000 (11:25 +0100)]
Return unencrypted_size of folder when queried
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
Robin Appelman [Fri, 7 Mar 2014 13:52:44 +0000 (14:52 +0100)]
Fix FileInfo->getType errors
icewind1991 [Fri, 7 Mar 2014 12:29:47 +0000 (13:29 +0100)]
Merge pull request #7529 from owncloud/getlocalfile-cache
Add caching for getLocalFile on remote storages
Vincent Petry [Fri, 7 Mar 2014 10:00:22 +0000 (11:00 +0100)]
Propagate unencrypted_size up to the file cache root
Vincent Petry [Fri, 7 Mar 2014 09:37:16 +0000 (10:37 +0100)]
Merge pull request #7583 from owncloud/trusteddomainerrorpage
[master] Show warning page when accessing server from an untrusted domain
Vincent Petry [Thu, 6 Mar 2014 16:22:40 +0000 (17:22 +0100)]
Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
Vincent Petry [Thu, 6 Mar 2014 16:18:17 +0000 (17:18 +0100)]
Merge pull request #7182 from owncloud/imagerotate_and_loadbase64_fix
Fix imagerotate and move loadFromBase64() one up
Victor Dubiniuk [Thu, 6 Mar 2014 15:19:58 +0000 (18:19 +0300)]
Reset time of last update feed polling
ideaship [Thu, 6 Mar 2014 15:03:00 +0000 (16:03 +0100)]
fix: use print_escaped for radio button "checked"
use of p() results in escaped HTML code: checked="checked"
where it should be: checked="checked"
Morris Jobke [Thu, 6 Mar 2014 14:10:32 +0000 (15:10 +0100)]
Revert "adding new javascript function OC.generateUrl(url, params)"
This reverts commit
8e667d1934d6bd9b4344ac624fdd2846c89abb0a .
Morris Jobke [Thu, 6 Mar 2014 14:07:28 +0000 (15:07 +0100)]
Merge pull request #7579 from owncloud/introduce-generateUrl-master
Introduce OC.generateUrl() in master
Vincent Petry [Thu, 6 Mar 2014 13:49:12 +0000 (14:49 +0100)]
Merge pull request #7494 from owncloud/fix-7307
Replace OC.Router.generate() with OC.generateUrl()
Vincent Petry [Thu, 6 Mar 2014 13:11:44 +0000 (14:11 +0100)]
Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
Vincent Petry [Thu, 6 Mar 2014 13:08:46 +0000 (14:08 +0100)]
Merge pull request #7588 from owncloud/noise-repeat
fix noise not repeating
Vincent Petry [Thu, 6 Mar 2014 12:50:53 +0000 (13:50 +0100)]
Fixed upload issue when free space is not known
Vincent Petry [Thu, 6 Mar 2014 12:49:57 +0000 (13:49 +0100)]
Added unit tests for "add()" method for file upload
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
cases
Vincent Petry [Thu, 6 Mar 2014 11:50:18 +0000 (12:50 +0100)]
Added testArea for JS Unit tests
Added a testArea that is outside the viewport but still considered as
visible from the jQuery code.
The testArea is useful when:
- tested code tries to access DOM elements using global ids
- tested code is requiring some UI elements to be visible to activate
themselves
Jan-Christoph Borchardt [Thu, 6 Mar 2014 11:38:11 +0000 (12:38 +0100)]
fix noise not repeating
Georg Ehrke [Thu, 6 Mar 2014 10:55:45 +0000 (11:55 +0100)]
fix merge conflicts
Vincent Petry [Wed, 5 Mar 2014 16:04:45 +0000 (17:04 +0100)]
Fixed X-Forwarded-Host parsing
Vincent Petry [Wed, 5 Mar 2014 16:04:15 +0000 (17:04 +0100)]
Added unit tests for serverHost and other related functions
Vincent Petry [Wed, 5 Mar 2014 14:41:28 +0000 (15:41 +0100)]
Added localhost as trusted domain
Vincent Petry [Wed, 5 Mar 2014 14:02:05 +0000 (15:02 +0100)]
Show warning page when accessing server from an untrusted domain
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
Thomas Müller [Wed, 5 Mar 2014 23:26:57 +0000 (00:26 +0100)]
adding js unit tests for OC.generateUrl()
Thomas Müller [Wed, 5 Mar 2014 23:17:48 +0000 (00:17 +0100)]
adding new javascript function OC.generateUrl(url, params)
Thomas Müller [Wed, 5 Mar 2014 23:15:08 +0000 (00:15 +0100)]
Merge branch 'master' into fix-7307
Conflicts:
core/js/router.js
settings/js/admin.js
Vincent Petry [Wed, 5 Mar 2014 18:57:25 +0000 (19:57 +0100)]
Merge pull request #7575 from owncloud/issue/7571
Do not set #dir when on public.php
Lukas Reschke [Wed, 5 Mar 2014 18:25:09 +0000 (19:25 +0100)]
Merge pull request #7354 from pschmitt/master
Use 'command -v' to detect whether and where software is installed (instead of 'which')
Joas Schilling [Wed, 5 Mar 2014 17:46:55 +0000 (18:46 +0100)]
Do not set #dir when on public.php
Fix #7571
Björn Schießle [Wed, 5 Mar 2014 17:13:31 +0000 (18:13 +0100)]
Merge pull request #7531 from owncloud/dont_create_shared_folder
don't allow to create a file or folder named 'Shared' in the root folder
Jan-Christoph Borchardt [Wed, 5 Mar 2014 17:10:01 +0000 (18:10 +0100)]
Merge pull request #7569 from owncloud/scrutinizer-tabs
fix some spaces to tabs issues reported by Scrutinizer
Morris Jobke [Wed, 5 Mar 2014 16:36:53 +0000 (17:36 +0100)]
Merge pull request #7568 from owncloud/lib_preview_add_fclose
add fclose, fixes issue from
bdb96b9af85256f9b3f8663ccf6d27b3d1330918
Morris Jobke [Wed, 5 Mar 2014 15:50:22 +0000 (16:50 +0100)]
Merge pull request #7566 from owncloud/button-outlines
Adds 0 Outlines to Buttons
Georg Ehrke [Wed, 5 Mar 2014 14:53:12 +0000 (15:53 +0100)]
fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
Jan-Christoph Borchardt [Wed, 5 Mar 2014 14:47:12 +0000 (15:47 +0100)]
fix some spaces to tabs issues reported by Scrutinizer
Georg Ehrke [Wed, 5 Mar 2014 14:37:26 +0000 (15:37 +0100)]
Morris Jobke [Wed, 5 Mar 2014 14:23:35 +0000 (15:23 +0100)]
Merge pull request #7558 from owncloud/fix_issue_loading_cached_thumb
fix issue with spamming logging files when loading cached thumbnail
Jan-Christoph Borchardt [Wed, 5 Mar 2014 14:08:16 +0000 (15:08 +0100)]
restrict height of settings and make scrollable
raghunayyar [Wed, 5 Mar 2014 14:06:36 +0000 (19:36 +0530)]
Adds 0 Outlines to Buttons
Raghu Nayyar [Wed, 5 Mar 2014 13:45:33 +0000 (19:15 +0530)]
Merge pull request #7560 from owncloud/icons.css-star-fix
add hover/focus states for star icons to hint at action
Jan-Christoph Borchardt [Wed, 5 Mar 2014 13:41:36 +0000 (14:41 +0100)]
Merge pull request #7261 from owncloud/issue/6793
Allow admins to disable certain external storages for users
Vincent Petry [Wed, 5 Mar 2014 12:30:11 +0000 (13:30 +0100)]
Merge pull request #7556 from owncloud/enc_dont_create_files_folder
[enc] don't create users files folder
Jan-Christoph Borchardt [Wed, 5 Mar 2014 12:21:33 +0000 (13:21 +0100)]
add hover/focus states for star icons to hint at action
Georg Ehrke [Wed, 5 Mar 2014 12:20:50 +0000 (13:20 +0100)]
fix issue with spamming logging files when loading cached thumbnail
Joas Schilling [Wed, 5 Mar 2014 12:18:41 +0000 (13:18 +0100)]
Merge pull request #7412 from owncloud/issue/7175
Add button to send a test mail after changing the email settings
Bjoern Schiessle [Tue, 4 Mar 2014 15:42:40 +0000 (16:42 +0100)]
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
Bjoern Schiessle [Wed, 5 Mar 2014 11:44:02 +0000 (12:44 +0100)]
don't create files folder, let ownCloud core handle it
Vincent Petry [Wed, 5 Mar 2014 11:43:10 +0000 (12:43 +0100)]
Merge pull request #7012 from owncloud/display-share-owner-master
adding share owner information to the file list
Morris Jobke [Wed, 5 Mar 2014 10:13:43 +0000 (11:13 +0100)]
Merge pull request #7554 from owncloud/issue/7304
Fix position of eye icon on database password field
Vincent Petry [Wed, 5 Mar 2014 09:27:15 +0000 (10:27 +0100)]
Removed obsolete OC.Router stubs in specHelper
Joas Schilling [Wed, 5 Mar 2014 09:22:35 +0000 (10:22 +0100)]
Fix position of eye icon on database password field
Fix #7304
Joas Schilling [Wed, 26 Feb 2014 11:13:20 +0000 (12:13 +0100)]
Add button to send a test mail after changing the email settings
Fix #7175
Thomas Müller [Wed, 5 Mar 2014 00:10:39 +0000 (01:10 +0100)]
fixing js unit tests
Thomas Müller [Tue, 4 Mar 2014 23:40:49 +0000 (00:40 +0100)]
Merge pull request #7521 from owncloud/docstrings_2_kondou
Fix some more docstrings
Vincent Petry [Tue, 4 Mar 2014 16:08:29 +0000 (17:08 +0100)]
Merge pull request #7508 from owncloud/ldap-configkeycasing
Fixed configkey casing for PostgreSQL
Tom Needham [Tue, 4 Mar 2014 15:37:45 +0000 (15:37 +0000)]
Merge pull request #7251 from owncloud/fix-ocsapi-getuser
Add displayname for admins on external api
Vincent Petry [Tue, 4 Mar 2014 15:33:41 +0000 (16:33 +0100)]
Merge pull request #7481 from tripflex/fix_downloadlink_spaces
replace spaces in download link without encoding entire URL
Robin Appelman [Tue, 4 Mar 2014 14:44:58 +0000 (15:44 +0100)]
Add caching for getLocalFile on remote storages
Thomas Müller [Tue, 4 Mar 2014 13:30:30 +0000 (14:30 +0100)]
Merge pull request #7525 from owncloud/fix_S3string
fix https://github.com/owncloud/core/issues/6825
Frank Karlitschek [Tue, 4 Mar 2014 11:38:56 +0000 (12:38 +0100)]
fix https://github.com/owncloud/core/issues/6825
Raghu Nayyar [Tue, 4 Mar 2014 09:35:22 +0000 (15:05 +0530)]
Merge pull request #7522 from owncloud/email-field-wording
update wording of email field
Morris Jobke [Tue, 4 Mar 2014 09:22:54 +0000 (10:22 +0100)]
update wording of email field
Thomas Müller [Mon, 3 Mar 2014 19:05:21 +0000 (20:05 +0100)]
Merge pull request #7497 from owncloud/add-.scrutinizer.yml
add .scrutinizer.yml
Thomas Müller [Mon, 3 Mar 2014 19:05:14 +0000 (20:05 +0100)]
Remove duplicate row
Vincent Petry [Mon, 3 Mar 2014 17:52:25 +0000 (18:52 +0100)]
Merge pull request #7453 from owncloud/preview-fileinfo
Cache the fileinfo in OC\Preview
Vincent Petry [Mon, 3 Mar 2014 16:45:39 +0000 (17:45 +0100)]
Merge pull request #7511 from owncloud/emailtemplatefix
Fix mail template to use p() for colors
Vincent Petry [Mon, 3 Mar 2014 16:36:12 +0000 (17:36 +0100)]
Fix mail template to use p() for colors
Now using p() instead of print_unescaped() for colors.