]>
source.dussan.org Git - nextcloud-server.git/log
Bjoern Schiessle [Fri, 20 Sep 2013 10:38:23 +0000 (12:38 +0200)]
make sure that files are shared correctly before each test and unshared again after the test
Bjoern Schiessle [Fri, 20 Sep 2013 09:24:18 +0000 (11:24 +0200)]
disable encrpytion app before performing tests
Bjoern Schiessle [Fri, 20 Sep 2013 09:21:34 +0000 (11:21 +0200)]
check if encryption app is enabled
Bjoern Schiessle [Thu, 19 Sep 2013 18:14:34 +0000 (20:14 +0200)]
disable encryption app for share API tests
Bjoern Schiessle [Thu, 19 Sep 2013 14:52:44 +0000 (16:52 +0200)]
set share id to 'unknown' if we can't retrive one
Bjoern Schiessle [Thu, 19 Sep 2013 14:41:29 +0000 (16:41 +0200)]
extend API to get the shares from all files in a given folder
Bjoern Schiessle [Thu, 19 Sep 2013 12:42:34 +0000 (14:42 +0200)]
remove some unused variables
Bjoern Schiessle [Thu, 19 Sep 2013 12:39:51 +0000 (14:39 +0200)]
some unit test for the new ocs share api
Bjoern Schiessle [Thu, 19 Sep 2013 08:33:04 +0000 (10:33 +0200)]
return error if wrong shareType is given
Bjoern Schiessle [Wed, 18 Sep 2013 08:11:20 +0000 (10:11 +0200)]
remove debug output
Bjoern Schiessle [Tue, 17 Sep 2013 13:27:10 +0000 (15:27 +0200)]
use share ID as REST resource
Bjoern Schiessle [Tue, 17 Sep 2013 09:53:06 +0000 (11:53 +0200)]
more rest-style API
Bjoern Schiessle [Mon, 16 Sep 2013 15:42:56 +0000 (17:42 +0200)]
return error if public upload is disabled
Bjoern Schiessle [Mon, 16 Sep 2013 15:28:17 +0000 (17:28 +0200)]
allow to set a different permission during initial share operation
Bjoern Schiessle [Mon, 16 Sep 2013 15:04:49 +0000 (17:04 +0200)]
ocs api for file sharing
Bjoern Schiessle [Fri, 6 Sep 2013 14:00:01 +0000 (16:00 +0200)]
some more OCS calls for sharing
Bjoern Schiessle [Fri, 6 Sep 2013 08:49:21 +0000 (10:49 +0200)]
intermediate result ocs api
Bjoern Schiessle [Wed, 4 Sep 2013 15:25:15 +0000 (17:25 +0200)]
intermediate results, share api
Bjoern Schiessle [Wed, 4 Sep 2013 12:32:05 +0000 (14:32 +0200)]
initial commit, start implementing the ocs share api
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 12:38:59 +0000 (05:38 -0700)]
Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
Jenkins for ownCloud [Tue, 3 Sep 2013 11:46:55 +0000 (07:46 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 11:17:16 +0000 (13:17 +0200)]
Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit
64d09452f55c0c73fe0d55a70f82d8ad7a386d7c .
Morris Jobke [Tue, 3 Sep 2013 09:27:52 +0000 (02:27 -0700)]
Merge pull request #4702 from owncloud/center-utils
center utils
Morris Jobke [Tue, 3 Sep 2013 09:18:39 +0000 (02:18 -0700)]
Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
Christopher [Tue, 3 Sep 2013 02:36:03 +0000 (19:36 -0700)]
Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
Thomas Tanghus [Mon, 2 Sep 2013 21:53:45 +0000 (23:53 +0200)]
Use provided mimetype on open. Fix #4696
blizzz [Mon, 2 Sep 2013 21:24:46 +0000 (14:24 -0700)]
Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
Bernhard Posselt [Mon, 2 Sep 2013 17:38:47 +0000 (19:38 +0200)]
center utils
Jan-Christoph Borchardt [Mon, 2 Sep 2013 16:29:16 +0000 (18:29 +0200)]
placeholder.js: fix typo
Jan-Christoph Borchardt [Mon, 2 Sep 2013 16:20:18 +0000 (18:20 +0200)]
placeholder.js: adjust saturation and lightness values
Owen Winkler [Mon, 2 Sep 2013 15:20:56 +0000 (08:20 -0700)]
Merge pull request #4514 from owncloud/windows_ssl
Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config
Morris Jobke [Mon, 2 Sep 2013 14:41:18 +0000 (16:41 +0200)]
RGB -> HSL
ringmaster [Mon, 26 Aug 2013 19:56:45 +0000 (15:56 -0400)]
This function doesn't cache anymore. Adjusted PHPDoc to suit.
ringmaster [Mon, 26 Aug 2013 16:08:23 +0000 (12:08 -0400)]
Don't cache the pkey, skip generation if the keyfile exists
Owen Winkler [Mon, 19 Aug 2013 10:36:19 +0000 (06:36 -0400)]
Employ config option for OpenSSL config file, if provided.
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
Owen Winkler [Sun, 18 Aug 2013 17:11:48 +0000 (13:11 -0400)]
Start a branch for easier OpenSSL configuration.
Jörn Friedrich Dreyer [Mon, 2 Sep 2013 08:46:29 +0000 (01:46 -0700)]
Merge pull request #4673 from owncloud/ocsapi_cleanup
remove the activity call here. it is not implemented anyways.
Morris Jobke [Mon, 2 Sep 2013 08:11:09 +0000 (01:11 -0700)]
Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
Morris Jobke [Mon, 2 Sep 2013 06:08:23 +0000 (23:08 -0700)]
Merge pull request #4657 from owncloud/files-controls-fixes
Files controls fixes
Morris Jobke [Mon, 2 Sep 2013 06:06:59 +0000 (23:06 -0700)]
Merge pull request #4674 from owncloud/fit-filepicker-new-icons
Fit filesummary for \OC\Preview's new mimetype-icons
Morris Jobke [Mon, 2 Sep 2013 06:05:47 +0000 (08:05 +0200)]
IE8 fixes
Bernhard Posselt [Mon, 2 Sep 2013 00:47:55 +0000 (17:47 -0700)]
Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
Jenkins for ownCloud [Sun, 1 Sep 2013 17:30:40 +0000 (13:30 -0400)]
[tx-robot] updated from transifex
Christopher [Sun, 1 Sep 2013 15:46:27 +0000 (08:46 -0700)]
Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
kondou [Sun, 1 Sep 2013 13:50:58 +0000 (15:50 +0200)]
Check for $this->fileInfo and @depend on testData()
Frank Karlitschek [Sun, 1 Sep 2013 06:23:11 +0000 (08:23 +0200)]
fixing this obvious typo directly
kondou [Sat, 31 Aug 2013 21:48:23 +0000 (23:48 +0200)]
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
kondou [Sat, 31 Aug 2013 17:21:51 +0000 (19:21 +0200)]
Fit filesummary for \OC\Preview's ne mimetype-icons
Frank Karlitschek [Sat, 31 Aug 2013 16:14:46 +0000 (18:14 +0200)]
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
Frank Karlitschek [Sat, 31 Aug 2013 16:03:10 +0000 (18:03 +0200)]
remove the config option that is no longer needed
Frank Karlitschek [Sat, 31 Aug 2013 16:00:53 +0000 (18:00 +0200)]
remove knowledgebase calls that are no longer used in ownCloud 5/6
Alessandro Cosentino [Sat, 31 Aug 2013 15:25:11 +0000 (11:25 -0400)]
rename emptyfolder to emptycontent
Alessandro Cosentino [Sat, 31 Aug 2013 15:12:07 +0000 (11:12 -0400)]
text centered horizontally and vertically in emptycontent div
Thomas Müller [Sat, 31 Aug 2013 10:41:29 +0000 (03:41 -0700)]
Merge pull request #4022 from owncloud/oc_preview
\OC\Preview
Georg Ehrke [Fri, 30 Aug 2013 20:05:44 +0000 (22:05 +0200)]
fix issue with filetable background
kondou [Tue, 6 Aug 2013 14:56:50 +0000 (16:56 +0200)]
Fix #4258, clean up \OC_Image and improve its unittest
Georg Ehrke [Fri, 30 Aug 2013 16:11:18 +0000 (18:11 +0200)]
Merge master into oc_preview
Jan-Christoph Borchardt [Fri, 30 Aug 2013 16:08:25 +0000 (09:08 -0700)]
Merge pull request #4661 from owncloud/separate-app-styles
Move CSS for apps and browser-specific fixes out of main styles.css
Georg Ehrke [Fri, 30 Aug 2013 16:07:49 +0000 (18:07 +0200)]
use gerMimeTypeDetector detectPath instead of getMimeType
Jenkins for ownCloud [Fri, 30 Aug 2013 13:38:20 +0000 (09:38 -0400)]
[tx-robot] updated from transifex
Stephane Martin [Fri, 30 Aug 2013 13:20:07 +0000 (06:20 -0700)]
Merge pull request #4578 from houbaastef/master
fixes #4574
Jan-Christoph Borchardt [Fri, 30 Aug 2013 11:46:10 +0000 (13:46 +0200)]
fix issues caused by introduction of sticky Apps management footer
Morris Jobke [Fri, 30 Aug 2013 10:47:15 +0000 (03:47 -0700)]
Merge pull request #4660 from owncloud/apps-management-sticky
Apps management as sticky footer and rename to 'Apps', fix #4622
Arthur Schiwon [Wed, 21 Aug 2013 11:15:31 +0000 (13:15 +0200)]
Use Group methods for searching, fixes #4201
petemcfarlane [Fri, 30 Aug 2013 09:48:04 +0000 (10:48 +0100)]
prefix 'tbody tr' to separate app/core css errors
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
Arthur Schiwon [Thu, 29 Aug 2013 22:33:48 +0000 (00:33 +0200)]
Use the real username in preferences and magic cookie instead of case-insensitive user input. Fixes 4616.
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:42:32 +0000 (11:42 +0200)]
move CSS for browser-specific fixes out of styles.css into new fixes.css
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:38:49 +0000 (11:38 +0200)]
move CSS for apps out of styles.css into new apps.css
Jan-Christoph Borchardt [Fri, 30 Aug 2013 09:17:31 +0000 (11:17 +0200)]
Apps management as sticky footer and rename to 'Apps', fix #4622
Jan-Christoph Borchardt [Fri, 30 Aug 2013 08:26:41 +0000 (10:26 +0200)]
adjust right padding of controls bar, fix #4650
Jan-Christoph Borchardt [Fri, 30 Aug 2013 08:20:39 +0000 (10:20 +0200)]
fix coding style for controls bar
Morris Jobke [Thu, 29 Aug 2013 19:05:32 +0000 (12:05 -0700)]
Merge pull request #4642 from masakik/master
Minor enhancement to console.php
Masaki [Thu, 29 Aug 2013 18:03:16 +0000 (15:03 -0300)]
replace ident spaces with tabs
Thomas Müller [Thu, 29 Aug 2013 15:40:33 +0000 (08:40 -0700)]
Merge pull request #4592 from owncloud/fix-logic
fix weird logical behaviour
Thomas Müller [Thu, 29 Aug 2013 15:37:46 +0000 (08:37 -0700)]
Merge pull request #4643 from owncloud/touch-newfile-hook
also emmit create hook when creating new files using touch()
Georg Ehrke [Thu, 29 Aug 2013 14:13:16 +0000 (16:13 +0200)]
fix parameter missing warning
Robin Appelman [Thu, 29 Aug 2013 13:31:03 +0000 (15:31 +0200)]
also emmit create hook when creating new files using touch()
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:03:58 +0000 (10:03 -0300)]
enable usage with CLI interface
Added option to use the status.php with console.php via CLI
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:00:53 +0000 (10:00 -0300)]
added help and status commands
switch structure enables many commands seamlessy.
also added some help and status command.
Masaki Kawabata Neto [Thu, 29 Aug 2013 13:00:30 +0000 (10:00 -0300)]
added help and status commands
switch structure enables many commands seamlessy.
also added some help and status command.
Thomas Müller [Thu, 29 Aug 2013 08:49:50 +0000 (10:49 +0200)]
webdav quota information contains the values for used and free - not total
Georg Ehrke [Thu, 29 Aug 2013 08:50:55 +0000 (10:50 +0200)]
Merge master into oc_preview
Georg Ehrke [Thu, 29 Aug 2013 08:08:53 +0000 (10:08 +0200)]
invert logic of disable_previews
Morris Jobke [Wed, 28 Aug 2013 22:46:51 +0000 (15:46 -0700)]
Merge pull request #4552 from dampfklon/fix4552
Make group suffix in share dialog translatable
Morris Jobke [Wed, 28 Aug 2013 22:42:06 +0000 (15:42 -0700)]
Merge pull request #4631 from owncloud/hotfix_4630
Work around #4630 to fix license showing
Thomas Müller [Wed, 28 Aug 2013 22:11:09 +0000 (15:11 -0700)]
Merge pull request #3926 from owncloud/improve_filesummary
Improve filelist summary
Thomas Müller [Wed, 28 Aug 2013 21:54:37 +0000 (14:54 -0700)]
Merge pull request #4614 from owncloud/trashbin_also_show_empty_folders
also move empty folders to the trash bin
Thomas Müller [Wed, 28 Aug 2013 21:18:47 +0000 (14:18 -0700)]
Merge pull request #4615 from owncloud/npm-modules
Adds Node Modules to build in gitignore for easy testing.
Morris Jobke [Wed, 28 Aug 2013 21:17:50 +0000 (14:17 -0700)]
Merge pull request #4618 from owncloud/visualize-js
visualize
Thomas Müller [Wed, 28 Aug 2013 21:04:55 +0000 (23:04 +0200)]
fixing typo
Thomas Müller [Wed, 28 Aug 2013 20:42:43 +0000 (22:42 +0200)]
no duplicate declaration of appLicense + camelCase
Morris Jobke [Wed, 28 Aug 2013 20:17:38 +0000 (13:17 -0700)]
Merge pull request #3961 from owncloud/logrotate
Very simple log rotation
kondou [Wed, 28 Aug 2013 20:12:01 +0000 (22:12 +0200)]
Work around #4630 to fix license showing
Morris Jobke [Wed, 28 Aug 2013 19:54:20 +0000 (21:54 +0200)]
calculate fontsize and line-height
Morris Jobke [Wed, 28 Aug 2013 19:22:56 +0000 (21:22 +0200)]
update 3rdparty - md5
Morris Jobke [Wed, 28 Aug 2013 16:36:32 +0000 (18:36 +0200)]
fix typo
Morris Jobke [Wed, 28 Aug 2013 16:09:40 +0000 (09:09 -0700)]
Merge pull request #4627 from owncloud/trashbin-tipsy
change orientation for delete tooltip to left, fix #4589
Jan-Christoph Borchardt [Wed, 28 Aug 2013 15:58:23 +0000 (17:58 +0200)]
change orientation for delete tooltip to left, fix #4589
Bart Visscher [Wed, 28 Aug 2013 15:41:27 +0000 (17:41 +0200)]
Only enable logrotate when configured. Also rotate size is settable.
Bart Visscher [Wed, 10 Jul 2013 16:07:43 +0000 (18:07 +0200)]
Check for installed state before registering the logrotate background job