]>
source.dussan.org Git - nextcloud-server.git/log
Sam Tuke [Wed, 6 Feb 2013 18:26:44 +0000 (18:26 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Wed, 6 Feb 2013 18:24:35 +0000 (18:24 +0000)]
Added comment
Thomas Müller [Wed, 6 Feb 2013 18:16:49 +0000 (10:16 -0800)]
Merge pull request #1502 from owncloud/gitignore-cloud9
gitignore Cloud9IDE system folder
Jan-Christoph Borchardt [Wed, 6 Feb 2013 18:01:40 +0000 (10:01 -0800)]
Merge pull request #1501 from owncloud/fix-shorttag
fix shorttag issue mentioned in #1357
Sam Tuke [Wed, 6 Feb 2013 17:59:47 +0000 (17:59 +0000)]
Removed debugging code
Sam Tuke [Wed, 6 Feb 2013 17:43:03 +0000 (17:43 +0000)]
Added comments
Sam Tuke [Wed, 6 Feb 2013 17:42:29 +0000 (17:42 +0000)]
Fixed bug causing password change related hooks to not be called due to ajax
Sam Tuke [Wed, 6 Feb 2013 17:42:15 +0000 (17:42 +0000)]
Fixed syntax bug
Jan-Christoph Borchardt [Wed, 6 Feb 2013 17:27:04 +0000 (18:27 +0100)]
gitignore Cloud9IDE system folder
Jan-Christoph Borchardt [Wed, 6 Feb 2013 17:19:26 +0000 (18:19 +0100)]
fix shorttag issue mentioned in #1357
Thomas Müller [Wed, 6 Feb 2013 16:53:20 +0000 (08:53 -0800)]
Merge pull request #1472 from owncloud/files_versions-cleanup
files_versions cleanup
Frank Karlitschek [Wed, 6 Feb 2013 16:40:53 +0000 (08:40 -0800)]
Merge pull request #1438 from owncloud/phpunit-tests-win32-master
PHPUnit support for Windows added
Jan-Christoph Borchardt [Wed, 6 Feb 2013 16:23:53 +0000 (08:23 -0800)]
Merge pull request #1459 from owncloud/infield-detail
shift infield labels just a tiny bit to the right so the cursor doesn't ...
Thomas Tanghus [Wed, 6 Feb 2013 16:13:45 +0000 (08:13 -0800)]
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
Sam Tuke [Wed, 6 Feb 2013 16:05:14 +0000 (16:05 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Wed, 6 Feb 2013 16:01:43 +0000 (16:01 +0000)]
Removed call to depreciated isUserVerified()
Thomas Tanghus [Wed, 6 Feb 2013 15:56:26 +0000 (16:56 +0100)]
Reduce top position for content below controls.
Jan-Christoph Borchardt [Wed, 6 Feb 2013 15:33:59 +0000 (07:33 -0800)]
Merge pull request #1497 from owncloud/collapse-usermenu
collapse user menu when inside one of the settings sections
Jan-Christoph Borchardt [Wed, 6 Feb 2013 15:25:16 +0000 (07:25 -0800)]
Merge pull request #1496 from owncloud/custom_clients
make it possible to modify the links to the clients
Sam Tuke [Wed, 6 Feb 2013 15:08:53 +0000 (15:08 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Wed, 6 Feb 2013 15:08:36 +0000 (15:08 +0000)]
Development snapshot
Jan-Christoph Borchardt [Wed, 6 Feb 2013 15:03:01 +0000 (16:03 +0100)]
collapse user menu when inside one of the settings sections
Thomas Müller [Wed, 6 Feb 2013 14:49:58 +0000 (06:49 -0800)]
Merge pull request #1357 from owncloud/alternative-loging-master
add support for apps to register alternative login methods
Thomas Müller [Wed, 6 Feb 2013 14:45:01 +0000 (06:45 -0800)]
Merge pull request #1487 from owncloud/fix-1420-master
Replace OC_FileCache usage in files_versions
Sam Tuke [Wed, 6 Feb 2013 14:30:40 +0000 (14:30 +0000)]
Fixed bug causing encrypted files to be doubly encrypted at login
Added comments and docblocks
Georg Ehrke [Wed, 6 Feb 2013 14:20:43 +0000 (15:20 +0100)]
make it possible to modify the links to the clients
Jan-Christoph Borchardt [Wed, 6 Feb 2013 14:15:20 +0000 (15:15 +0100)]
move inline style to CSS file, fix details
Björn Schießle [Wed, 6 Feb 2013 13:19:32 +0000 (14:19 +0100)]
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
Björn Schießle [Wed, 6 Feb 2013 10:56:01 +0000 (02:56 -0800)]
Merge pull request #1490 from schiesbn/user_displayname
let the user change his display name, if supported by the back-end
Björn Schießle [Wed, 6 Feb 2013 10:55:19 +0000 (11:55 +0100)]
make strings translatable
Björn Schießle [Wed, 6 Feb 2013 10:38:03 +0000 (11:38 +0100)]
let the user change his display name, if supported by the back-end
Bart Visscher [Wed, 6 Feb 2013 07:00:57 +0000 (08:00 +0100)]
Replace OC_FileCache usage in files_versions
Jenkins for ownCloud [Tue, 5 Feb 2013 23:06:28 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 5 Feb 2013 22:35:11 +0000 (14:35 -0800)]
Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit
disable error handler while running phpunit
Thomas Mueller [Tue, 5 Feb 2013 19:21:29 +0000 (20:21 +0100)]
uncomment failing calls to \OC\Files\Filesystem::file_put_contents
Thomas Mueller [Tue, 5 Feb 2013 19:20:55 +0000 (20:20 +0100)]
add phpunit configuration for autotest withou the json listener because this pollutes the console
Thomas Mueller [Tue, 5 Feb 2013 19:19:54 +0000 (20:19 +0100)]
fix failing test cases due to wrong typing
Arthur Schiwon [Tue, 5 Feb 2013 13:58:35 +0000 (14:58 +0100)]
offer change password only when the action is supported by the user backend
Lukas Reschke [Tue, 5 Feb 2013 17:58:35 +0000 (09:58 -0800)]
Merge pull request #1474 from samtuke/master
Improvements to files_encryption
Sam Tuke [Tue, 5 Feb 2013 17:28:26 +0000 (17:28 +0000)]
Fixed comment typo, wrapped return value conditional on var assignment in session{}
Sam Tuke [Tue, 5 Feb 2013 17:22:59 +0000 (17:22 +0000)]
Added missing translation wrapping
Sam Tuke [Tue, 5 Feb 2013 17:06:15 +0000 (17:06 +0000)]
Added notice to personal settings indicating what filetypes are not encrypted
Bart Visscher [Wed, 19 Sep 2012 19:26:24 +0000 (21:26 +0200)]
Only calculate md5 of local file once
Bart Visscher [Wed, 19 Sep 2012 18:59:57 +0000 (20:59 +0200)]
Change files_versions namespace to OCA\Files_Versions
Sam Tuke [Tue, 5 Feb 2013 16:11:50 +0000 (16:11 +0000)]
Removed debugging output
Sam Tuke [Tue, 5 Feb 2013 16:09:01 +0000 (16:09 +0000)]
Fixed bug relating to Filesystem{} that prevented webdav logins with files_encryption
Michael Gapczynski [Tue, 5 Feb 2013 16:03:18 +0000 (08:03 -0800)]
Merge pull request #1471 from owncloud/temp-storage-call-parent-ctor-master
Temp storage call parent ctor master
Sam Tuke [Tue, 5 Feb 2013 15:59:28 +0000 (15:59 +0000)]
Cleaned up path formatting with new method stripUserFilesPath()
Thomas Mueller [Thu, 31 Jan 2013 21:05:06 +0000 (22:05 +0100)]
disable error handler while running phpunit
Sam Tuke [Tue, 5 Feb 2013 15:37:40 +0000 (15:37 +0000)]
Minor improvement to comments
Sam Tuke [Tue, 5 Feb 2013 15:35:29 +0000 (15:35 +0000)]
Recryption of legacy encrypted files now working on login
Thomas Mueller [Tue, 5 Feb 2013 15:24:40 +0000 (16:24 +0100)]
spell check
Thomas Mueller [Thu, 31 Jan 2013 21:04:08 +0000 (22:04 +0100)]
pass the argument to the ctor
Conflicts:
lib/files/storage/temporary.php
Bart Visscher [Tue, 5 Feb 2013 15:16:14 +0000 (07:16 -0800)]
Merge pull request #1469 from owncloud/no-setlocale-on-windows
No setlocale on windows
Michael Gapczynski [Tue, 5 Feb 2013 14:56:15 +0000 (06:56 -0800)]
Merge pull request #1452 from owncloud/fix-breadcrumb
Remove undefined crumb variable from home breadcrumb
Thomas Mueller [Tue, 5 Feb 2013 14:46:55 +0000 (15:46 +0100)]
setlocale test is pointless on Windows
Thomas Mueller [Tue, 5 Feb 2013 14:43:12 +0000 (15:43 +0100)]
new function \OC_Util::runningOnWindows()
Jan-Christoph Borchardt [Tue, 5 Feb 2013 13:47:14 +0000 (05:47 -0800)]
Merge pull request #1429 from owncloud/fix_addNavigation
Make app icon linkable when enabling app.
Jan-Christoph Borchardt [Tue, 5 Feb 2013 13:46:38 +0000 (05:46 -0800)]
Merge pull request #1460 from owncloud/login-button
Login screen details
Sam Tuke [Tue, 5 Feb 2013 13:44:45 +0000 (13:44 +0000)]
Merge github.com:owncloud/core
Thomas Müller [Tue, 5 Feb 2013 13:18:58 +0000 (05:18 -0800)]
Merge pull request #1456 from owncloud/gitignore-apps
gitignore all apps except core ones
Thomas Tanghus [Tue, 5 Feb 2013 13:15:17 +0000 (14:15 +0100)]
Remove superfluous append
Jan-Christoph Borchardt [Tue, 5 Feb 2013 11:49:33 +0000 (12:49 +0100)]
line up 'remember' text with checkbox
Jan-Christoph Borchardt [Tue, 5 Feb 2013 11:48:30 +0000 (12:48 +0100)]
form detail on log in button, better shape
Jan-Christoph Borchardt [Tue, 5 Feb 2013 11:30:23 +0000 (12:30 +0100)]
shift infield labels just a tiny bit to the right so the cursor doesn't overlap
Jan-Christoph Borchardt [Tue, 5 Feb 2013 10:30:18 +0000 (11:30 +0100)]
remove superfluous enabled-app class again
Jan-Christoph Borchardt [Tue, 5 Feb 2013 10:09:38 +0000 (11:09 +0100)]
Merge branch 'master' into fix_addNavigation
Jan-Christoph Borchardt [Tue, 5 Feb 2013 10:04:39 +0000 (11:04 +0100)]
gitignore all apps except core ones
Michael Gapczynski [Tue, 5 Feb 2013 01:40:16 +0000 (20:40 -0500)]
Remove undefined crumb variable from home breadcrumb
Jenkins for ownCloud [Mon, 4 Feb 2013 23:20:29 +0000 (00:20 +0100)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 4 Feb 2013 20:52:56 +0000 (12:52 -0800)]
Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master
fixing namespace in local storage
Thomas Tanghus [Mon, 4 Feb 2013 20:02:16 +0000 (12:02 -0800)]
Merge pull request #1432 from owncloud/add_requesttoken
[user_webdavauth] add requesttoken
Thomas Tanghus [Mon, 4 Feb 2013 19:57:57 +0000 (11:57 -0800)]
Merge pull request #1442 from owncloud/reuse-oc_helper-tmpfolder-master
reuse \OC_Helper::tmpFolder()
Thomas Müller [Mon, 4 Feb 2013 19:52:20 +0000 (11:52 -0800)]
Merge pull request #1234 from owncloud/fix-issue-192
Fix sharing issue with collection and children mismatches
Thomas Mueller [Mon, 4 Feb 2013 19:49:01 +0000 (20:49 +0100)]
fixing namespace
Thomas Müller [Mon, 4 Feb 2013 19:11:15 +0000 (11:11 -0800)]
Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
in case file based session handling in enabled - we need to make sure th...
Thomas Müller [Mon, 4 Feb 2013 18:36:43 +0000 (10:36 -0800)]
Merge pull request #1445 from owncloud/CSP_font
Allow loading of external fonts
Lukas Reschke [Mon, 4 Feb 2013 17:43:26 +0000 (18:43 +0100)]
Also allow local files
Lukas Reschke [Mon, 4 Feb 2013 17:38:16 +0000 (18:38 +0100)]
Allow the loading of local font files embedded via data:
Thomas Tanghus [Mon, 4 Feb 2013 17:30:49 +0000 (18:30 +0100)]
Add 'hascontrols' class for content with fixed topbar.
Lukas Reschke [Mon, 4 Feb 2013 16:51:52 +0000 (17:51 +0100)]
Allow loading of external fonts
Required by several applications like our pdf viewer
Thomas Müller [Mon, 4 Feb 2013 14:44:40 +0000 (06:44 -0800)]
Merge pull request #1427 from TheSFReader/master
The mimetype/mimepart need to be readable, even from searchByMime
Thomas Mueller [Mon, 4 Feb 2013 14:32:01 +0000 (15:32 +0100)]
in case file based session handling in enabled - we need to make sure the configured folder is writable
Thomas Müller [Mon, 4 Feb 2013 13:51:34 +0000 (05:51 -0800)]
Merge pull request #1436 from owncloud/cache_check_path
Cache: check for invalid paths in getFileInfo/getDirectoryContent
Thomas Mueller [Mon, 4 Feb 2013 12:10:25 +0000 (13:10 +0100)]
reuse \OC_Helper::tmpFolder()
Thomas Tanghus [Mon, 4 Feb 2013 13:09:32 +0000 (14:09 +0100)]
Remove padding hack to position users list.
Robin Appelman [Mon, 4 Feb 2013 12:28:31 +0000 (13:28 +0100)]
Cache: fix copy-paste errors
Thomas Müller [Mon, 4 Feb 2013 11:08:13 +0000 (03:08 -0800)]
Merge pull request #1423 from owncloud/getowner
Add getOwner to Filesystem and View classes
Björn Schießle [Mon, 4 Feb 2013 10:14:52 +0000 (02:14 -0800)]
Merge pull request #1434 from owncloud/trashbin_CSRF
[files_trashbin] Add CSRF token
Thomas Mueller [Thu, 24 Jan 2013 12:47:04 +0000 (13:47 +0100)]
PHPUnit support for Windows added
Lukas Reschke [Mon, 4 Feb 2013 08:15:11 +0000 (09:15 +0100)]
OCP\JSON instead of OCP\User
Thomas Müller [Mon, 4 Feb 2013 05:55:54 +0000 (21:55 -0800)]
Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
Thomas Müller [Mon, 4 Feb 2013 05:53:02 +0000 (21:53 -0800)]
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
Michael Gapczynski [Mon, 4 Feb 2013 03:05:31 +0000 (19:05 -0800)]
Merge pull request #1435 from owncloud/make_BlacklistConfigurable
Make file blacklist configurable
Robin Appelman [Sun, 3 Feb 2013 16:12:57 +0000 (17:12 +0100)]
Files: fix positioning of Trash button and upload progress bar
Thomas Tanghus [Sun, 3 Feb 2013 23:24:34 +0000 (00:24 +0100)]
Add box-sizing to controls.
Jenkins for ownCloud [Sun, 3 Feb 2013 23:05:52 +0000 (00:05 +0100)]
[tx-robot] updated from transifex
Robin Appelman [Sun, 3 Feb 2013 22:34:27 +0000 (23:34 +0100)]
Cache: check for invalid paths in getFileInfo/getDirectoryContent
Lukas Reschke [Sun, 3 Feb 2013 22:03:06 +0000 (23:03 +0100)]
Make fileblacklist configurable
Lukas Reschke [Sun, 3 Feb 2013 21:49:12 +0000 (22:49 +0100)]
[files_trashbin] Add CSRF token
projects / nextcloud-server.git / log