]>
source.dussan.org Git - nextcloud-server.git/log
Victor Dubiniuk [Thu, 6 Mar 2014 15:19:58 +0000 (18:19 +0300)]
Reset time of last update feed polling
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
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
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
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
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.
kondou [Mon, 3 Mar 2014 16:32:29 +0000 (17:32 +0100)]
Fix some more docstrings
Frank Karlitschek [Mon, 3 Mar 2014 16:22:33 +0000 (17:22 +0100)]
Merge pull request #7500 from owncloud/theme-mailtemplate
Enable theming of the mail template header
Jan-Christoph Borchardt [Mon, 3 Mar 2014 15:23:19 +0000 (16:23 +0100)]
Merge pull request #7502 from jbtbnl/master
Do not override button background image
Vincent Petry [Mon, 3 Mar 2014 15:17:37 +0000 (16:17 +0100)]
Merge pull request #7506 from owncloud/master-update3rdpartysubmoduleforlibxmlfix
Update 3rdparty submodule pointer to include libxml fixes
Vincent Petry [Mon, 3 Mar 2014 15:15:23 +0000 (16:15 +0100)]
Fixed configkey casing for PostgreSQL
Vincent Petry [Mon, 3 Mar 2014 14:41:25 +0000 (15:41 +0100)]
Update 3rdparty submodule pointer to include libxml fixes
Vincent Petry [Mon, 3 Mar 2014 10:31:46 +0000 (11:31 +0100)]
Allow XML entity loader for MDB2 schema loader
Forward port of
762b0d9 from stable6 to master
jbtbnl [Mon, 3 Mar 2014 13:07:44 +0000 (14:07 +0100)]
Do not override button background image
Vincent Petry [Mon, 3 Mar 2014 12:59:21 +0000 (13:59 +0100)]
Merge pull request #7482 from owncloud/reset-3rdparty-submodule
Update 3rdparty submodule
Jan-Christoph Borchardt [Mon, 3 Mar 2014 11:43:22 +0000 (12:43 +0100)]
make mail notification header color themable
Jan-Christoph Borchardt [Mon, 3 Mar 2014 11:42:58 +0000 (12:42 +0100)]
compress mail notification logo
Jan-Christoph Borchardt [Mon, 3 Mar 2014 11:21:08 +0000 (12:21 +0100)]
mail template: remove off-white background color to better blend into mail client
Thomas Müller [Mon, 3 Mar 2014 09:55:01 +0000 (10:55 +0100)]
add .scrutinizer.yml
Arthur Schiwon [Fri, 28 Feb 2014 09:58:51 +0000 (10:58 +0100)]
remove remaining testing artefact
Arthur Schiwon [Thu, 27 Feb 2014 15:20:53 +0000 (16:20 +0100)]
intendetion. where did the whitespaces come from?
Arthur Schiwon [Thu, 27 Feb 2014 15:18:03 +0000 (16:18 +0100)]
LDAP: let proxy for multiple server access methods from Access
Thomas Müller [Sun, 2 Mar 2014 22:45:23 +0000 (23:45 +0100)]
remove OC.Router.registerLoadedCallback()
Thomas Müller [Sun, 2 Mar 2014 22:41:14 +0000 (23:41 +0100)]
fixing download url in files app
Thomas Müller [Sun, 2 Mar 2014 22:15:37 +0000 (23:15 +0100)]
adding JSDoc + remove unused function
Thomas Müller [Sun, 2 Mar 2014 21:30:24 +0000 (22:30 +0100)]
Replace OC.Router.generate() with OC.generateUrl()
Morris Jobke [Sat, 1 Mar 2014 09:38:48 +0000 (10:38 +0100)]
Merge pull request #7486 from owncloud/l10n_docstrings
Fix some docstrings in l10n.php
Thomas Tanghus [Sat, 1 Mar 2014 05:08:32 +0000 (06:08 +0100)]
Merge pull request #7433 from owncloud/config_basic_auth
Config to disable basic_auth username checking
kondou [Sat, 1 Mar 2014 02:38:35 +0000 (03:38 +0100)]
Fix some docstrings in l10n.php
Thomas Müller [Fri, 28 Feb 2014 18:11:40 +0000 (19:11 +0100)]
Update 3rdparty submodule
Vincent Petry [Fri, 28 Feb 2014 18:07:31 +0000 (19:07 +0100)]
Merge pull request #7480 from owncloud/sabredav-1.7.11
Update SabreDAV to 1.7.11
Myles McNamara [Fri, 28 Feb 2014 16:19:19 +0000 (11:19 -0500)]
move replace to inside isset
Myles McNamara [Fri, 28 Feb 2014 16:15:49 +0000 (11:15 -0500)]
replace spaces in download link without encoding entire URL
Thomas Müller [Fri, 28 Feb 2014 15:55:50 +0000 (16:55 +0100)]
Update SabreDAV to 1.7.11
Thomas Müller [Fri, 28 Feb 2014 13:54:10 +0000 (14:54 +0100)]
Merge branch 'master' into display-share-owner-master
Conflicts:
apps/files_sharing/lib/cache.php
Thomas Müller [Fri, 28 Feb 2014 13:48:21 +0000 (14:48 +0100)]
Merge pull request #7444 from owncloud/fix/7443
remove unused code and fix wrong variable names - some PHPDoc updated
Morris Jobke [Fri, 28 Feb 2014 13:19:36 +0000 (14:19 +0100)]
Merge pull request #7471 from owncloud/fix-css-loading
CSS is now loaded directly instead via PHP
icewind1991 [Fri, 28 Feb 2014 11:36:56 +0000 (12:36 +0100)]
Merge pull request #7455 from owncloud/rawlist-fileinfo
Update rawlist to work with new fileinfo object
Thomas Müller [Fri, 28 Feb 2014 10:57:24 +0000 (11:57 +0100)]
Merge pull request #7470 from owncloud/abort-cancel
profile image: relabel technical 'Abort' to more widely used 'Cancel'
Lukas Reschke [Fri, 28 Feb 2014 10:14:18 +0000 (11:14 +0100)]
CSS is now loaded directly instead via PHP
269f24cf9617397aaf501b27ec1af2c8e3154cf8 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
Jan-Christoph Borchardt [Fri, 28 Feb 2014 09:09:34 +0000 (10:09 +0100)]
profile image: relabel technical 'Abort' to more widely used 'Cancel'
Björn Schießle [Fri, 28 Feb 2014 08:57:58 +0000 (09:57 +0100)]
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
[enc] remember original fopen access type in pre-proxy
Vincent Petry [Thu, 27 Feb 2014 18:50:16 +0000 (19:50 +0100)]
Fixed wrong field name
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.
Fixes #7467
Thomas Müller [Thu, 27 Feb 2014 20:52:46 +0000 (21:52 +0100)]
Merge pull request #7439 from owncloud/unit-test-for-7430
adding test for migrations on columns using keywords
Raghu Nayyar [Thu, 27 Feb 2014 15:41:26 +0000 (21:11 +0530)]
Merge pull request #7382 from jbtbnl/master
Remove necessity of icon class
Morris Jobke [Thu, 27 Feb 2014 13:44:29 +0000 (14:44 +0100)]
Merge pull request #7452 from owncloud/icon-delete-hover
icons: automatically show delete hover instead of using explicit class
Morris Jobke [Thu, 27 Feb 2014 13:39:16 +0000 (14:39 +0100)]
add BMP mimetype for BMP previews
Bjoern Schiessle [Thu, 27 Feb 2014 12:58:51 +0000 (13:58 +0100)]
remember original fopen access type in pre-proxy because sometimes they change
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
Robin Appelman [Thu, 27 Feb 2014 13:04:19 +0000 (14:04 +0100)]
Update rawlist to work with new fileinfo object
Thomas Müller [Thu, 27 Feb 2014 12:51:14 +0000 (13:51 +0100)]
Merge pull request #7446 from owncloud/etag_assert_fixes
use assertSame and assertNotSame for etag checks
Thomas Müller [Thu, 27 Feb 2014 12:37:18 +0000 (13:37 +0100)]
Merge pull request #7451 from owncloud/fix-jshint
rename config to camelcase
Morris Jobke [Thu, 27 Feb 2014 12:24:44 +0000 (13:24 +0100)]
Merge pull request #7449 from owncloud/remove-input-border
remove border from log in input fields, simpler and works better with themes
Robin Appelman [Thu, 27 Feb 2014 12:15:18 +0000 (13:15 +0100)]
Cache the fileinfo in OC\Preview
Jan-Christoph Borchardt [Thu, 27 Feb 2014 11:48:25 +0000 (12:48 +0100)]
icons: automatically show delete hover instead of using explicit class
Jörn Friedrich Dreyer [Thu, 27 Feb 2014 11:42:53 +0000 (12:42 +0100)]
initialize etags of temporary storage
Raghu Nayyar [Thu, 27 Feb 2014 11:26:28 +0000 (16:56 +0530)]
Merge pull request #7450 from owncloud/rename-advanced
Installation: relabel 'Advanced' to more descriptive 'Storage & database'