]>
source.dussan.org Git - nextcloud-server.git/log
Sam Tuke [Mon, 14 Jan 2013 19:07:28 +0000 (19:07 +0000)]
Adding sharing support: added new method in Keymanager setShareKey()
Added notes in proxy{} and stream{} pointing to share support
Sam Tuke [Mon, 14 Jan 2013 17:06:48 +0000 (17:06 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Mon, 14 Jan 2013 17:05:47 +0000 (17:05 +0000)]
Added two hooks: pre_unshare and pre_unshareAll, useful for files_encryption
Sam Tuke [Mon, 14 Jan 2013 16:54:25 +0000 (16:54 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Mon, 14 Jan 2013 15:39:04 +0000 (15:39 +0000)]
Added creation of dir for shared file env encryption keys
Added comment to use multiKeyEncrypt
Sam Tuke [Mon, 14 Jan 2013 12:36:46 +0000 (12:36 +0000)]
Removed debugging comments
Björn Schießle [Mon, 14 Jan 2013 09:33:17 +0000 (10:33 +0100)]
Merge branch 'master' of github.com:owncloud/core
Björn Schießle [Mon, 14 Jan 2013 09:24:40 +0000 (10:24 +0100)]
merge conflict fixed, settings-personal.php is no longer needed
Conflicts:
apps/files_versions/templates/settings-personal.php
Jenkins for ownCloud [Sun, 13 Jan 2013 23:18:21 +0000 (00:18 +0100)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 12 Jan 2013 23:08:40 +0000 (00:08 +0100)]
[tx-robot] updated from transifex
Lukas Reschke [Sat, 12 Jan 2013 14:19:12 +0000 (15:19 +0100)]
Correct the link
Lukas Reschke [Sat, 12 Jan 2013 10:51:31 +0000 (02:51 -0800)]
Merge pull request #1160 from owncloud/updateContrib
Update CONTRIBUTING.md
Lukas Reschke [Sat, 12 Jan 2013 10:51:03 +0000 (11:51 +0100)]
Updated browser log
Thomas Müller [Sat, 12 Jan 2013 08:08:23 +0000 (09:08 +0100)]
Adding database to server config
Jenkins for ownCloud [Fri, 11 Jan 2013 23:10:58 +0000 (00:10 +0100)]
[tx-robot] updated from transifex
Lukas Reschke [Fri, 11 Jan 2013 22:40:14 +0000 (23:40 +0100)]
Typos
Lukas Reschke [Fri, 11 Jan 2013 22:39:37 +0000 (23:39 +0100)]
Add server operating system to template
Thanks @eMerzh, could be especially needed as there are some platform specific issues like filename encoding under MS Windows
Lukas Reschke [Fri, 11 Jan 2013 22:34:16 +0000 (23:34 +0100)]
Add the correct link to the apps repository
:oops:
Lukas Reschke [Fri, 11 Jan 2013 22:08:01 +0000 (23:08 +0100)]
Add a space behind the ####
Makes it at least better readable for me.
Lukas Reschke [Fri, 11 Jan 2013 22:00:48 +0000 (23:00 +0100)]
Uneeded newline
Lukas Reschke [Fri, 11 Jan 2013 21:59:41 +0000 (22:59 +0100)]
Remove :
Lukas Reschke [Fri, 11 Jan 2013 21:57:55 +0000 (22:57 +0100)]
Add ownCloud version
Bart Visscher [Fri, 11 Jan 2013 21:57:40 +0000 (22:57 +0100)]
Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo
Conflicts:
settings/routes.php
Lukas Reschke [Fri, 11 Jan 2013 21:57:30 +0000 (22:57 +0100)]
Add template
Lukas Reschke [Fri, 11 Jan 2013 21:52:41 +0000 (13:52 -0800)]
Create issue_template.md
Lukas Reschke [Fri, 11 Jan 2013 21:24:22 +0000 (22:24 +0100)]
Fix a typo
Lukas Reschke [Fri, 11 Jan 2013 21:22:08 +0000 (22:22 +0100)]
Update CONTRIBUTING.md
Lukas Reschke [Fri, 11 Jan 2013 21:14:18 +0000 (22:14 +0100)]
Remove uneeded link
Lukas Reschke [Fri, 11 Jan 2013 19:57:14 +0000 (11:57 -0800)]
Merge pull request #1159 from LukasReschke/master
Add contribution file
Björn Schießle [Fri, 11 Jan 2013 18:33:54 +0000 (19:33 +0100)]
- code clean-up
- some more code comments
- fixed bug in the expire function, cleanup all_versions array during run. Otherwise it could happen that we try to delete already deleted versions
Lukas Reschke [Fri, 11 Jan 2013 18:23:04 +0000 (10:23 -0800)]
Merge pull request #994 from owncloud/enhanced_multiSelect
Enhanced multiSelect
Lukas Reschke [Fri, 11 Jan 2013 18:19:04 +0000 (19:19 +0100)]
Added links to app + mirall repo
Lukas Reschke [Fri, 11 Jan 2013 17:59:56 +0000 (18:59 +0100)]
Update CONTRIBUTING.md
Lukas Reschke [Fri, 11 Jan 2013 17:57:56 +0000 (09:57 -0800)]
Create CONTRIBUTING.md
Lukas Reschke [Fri, 11 Jan 2013 17:21:08 +0000 (09:21 -0800)]
Merge pull request #1150 from owncloud/EnableSSL-AdminMenu
Add security section to admin settings to enable the HTTPS enforcement
Lukas Reschke [Fri, 11 Jan 2013 17:18:14 +0000 (09:18 -0800)]
Merge pull request #1155 from owncloud/remove-setContentTypeHeader
Remove setContentTypeHeader()
Frank Karlitschek [Fri, 11 Jan 2013 17:16:55 +0000 (09:16 -0800)]
Merge pull request #1154 from owncloud/remove-uneededFile
Remove uneeded file
Lukas Reschke [Fri, 11 Jan 2013 16:24:10 +0000 (17:24 +0100)]
Remove OpenID from the router
Lukas Reschke [Fri, 11 Jan 2013 16:22:15 +0000 (17:22 +0100)]
Move to apps repo
This belongs to the apps repo.
Lukas Reschke [Fri, 11 Jan 2013 16:09:36 +0000 (17:09 +0100)]
Remove setContentTypeHeader()
`OC_JSON::success` and `OC_JSON::error` are calling
`OC_JSON::encodedPrint`, which already sets these headers. So this two
calls are uneeded duplicates.
Lukas Reschke [Fri, 11 Jan 2013 15:49:55 +0000 (16:49 +0100)]
Remove uneeded file
logout.php is a legacy file, which isn't used anymore in the ownCloud
code.
Lukas Reschke [Fri, 11 Jan 2013 15:42:06 +0000 (16:42 +0100)]
Correct link to the bugtracker in exception.php
Lukas Reschke [Fri, 11 Jan 2013 13:43:56 +0000 (14:43 +0100)]
Removed uneeded HTML tag
Björn Schießle [Fri, 11 Jan 2013 13:24:00 +0000 (14:24 +0100)]
function description fixed
Björn Schießle [Fri, 11 Jan 2013 13:23:28 +0000 (14:23 +0100)]
some more clean-up, isVersioned() is no longer needed; rename hook fixed if a complete folder gets renamed
Lukas Reschke [Fri, 11 Jan 2013 13:18:51 +0000 (14:18 +0100)]
Add security section to admin menu
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.
The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
Björn Schießle [Fri, 11 Jan 2013 10:12:32 +0000 (11:12 +0100)]
some code clean-up
Thomas Müller [Thu, 10 Jan 2013 23:14:14 +0000 (15:14 -0800)]
Merge pull request #1133 from owncloud/add_linebreaks_in_sharing
add more linebreaks, replace SQL LIMIT with param
Jenkins for ownCloud [Thu, 10 Jan 2013 23:06:14 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Sam Tuke [Thu, 10 Jan 2013 18:48:40 +0000 (18:48 +0000)]
Removed old and unnecessary comments
Sam Tuke [Thu, 10 Jan 2013 18:19:37 +0000 (18:19 +0000)]
Removed misleading crypto gen comment
Sam Tuke [Thu, 10 Jan 2013 18:16:56 +0000 (18:16 +0000)]
Removed unnecessary line
Sam Tuke [Thu, 10 Jan 2013 18:14:15 +0000 (18:14 +0000)]
Removed phantom depreciated files
Sam Tuke [Thu, 10 Jan 2013 18:07:15 +0000 (18:07 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Thu, 10 Jan 2013 18:04:52 +0000 (18:04 +0000)]
Re-added 'checkAdminUser'
Improved code formatting
Björn Schießle [Thu, 10 Jan 2013 17:04:30 +0000 (18:04 +0100)]
keep track of the size of the versions directory
Thomas Müller [Thu, 10 Jan 2013 10:27:00 +0000 (02:27 -0800)]
Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
Björn Schießle [Thu, 10 Jan 2013 09:36:55 +0000 (10:36 +0100)]
add complete size of versions to array
Jenkins for ownCloud [Wed, 9 Jan 2013 23:05:53 +0000 (00:05 +0100)]
[tx-robot] updated from transifex
Lukas Reschke [Wed, 9 Jan 2013 20:07:39 +0000 (12:07 -0800)]
Merge pull request #1131 from owncloud/more_translations
translate move and rename error messages
Lukas Reschke [Wed, 9 Jan 2013 20:06:25 +0000 (12:06 -0800)]
Merge pull request #1124 from schiesbn/sabredav2
OC_Connector_Sabre_Client no longer needed
Björn Schießle [Wed, 9 Jan 2013 16:11:46 +0000 (17:11 +0100)]
every 1000s run reduce the number of versions for all files, not only for the currently edited file
Jörn Friedrich Dreyer [Wed, 9 Jan 2013 12:57:51 +0000 (13:57 +0100)]
add more linebreaks, replace SQL LIMIT with param
Jörn Friedrich Dreyer [Wed, 9 Jan 2013 11:48:57 +0000 (12:48 +0100)]
more translations
Thomas Mueller [Tue, 8 Jan 2013 23:37:50 +0000 (00:37 +0100)]
webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode.
Jenkins for ownCloud [Tue, 8 Jan 2013 23:05:49 +0000 (00:05 +0100)]
[tx-robot] updated from transifex
Thomas Tanghus [Tue, 8 Jan 2013 23:02:06 +0000 (15:02 -0800)]
Merge pull request #938 from owncloud/fix_minor_files_annoyances
Fix minor files annoyances
Björn Schießle [Tue, 8 Jan 2013 16:44:28 +0000 (17:44 +0100)]
Upstream merged my patch to add additional ssl root certificates to the webdav client.
This means that OC_Connector_Sabre_Client is no longer needed
Thomas Mueller [Mon, 7 Jan 2013 23:32:41 +0000 (00:32 +0100)]
fixing string concatenation in javascript
refs https://github.com/owncloud/core/commit/
ae54364d7c8baf5138d166855db6431190963886
Jenkins for ownCloud [Mon, 7 Jan 2013 23:31:36 +0000 (00:31 +0100)]
[tx-robot] updated from transifex
Frank Karlitschek [Mon, 7 Jan 2013 15:45:03 +0000 (16:45 +0100)]
Update apps/user_webdavauth/user_webdavauth.php
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
Björn Schießle [Mon, 7 Jan 2013 14:13:32 +0000 (15:13 +0100)]
adjust timestamp of the file copied from the version history
Jörn Friedrich Dreyer [Mon, 7 Jan 2013 12:09:52 +0000 (13:09 +0100)]
ie8 ignores rgba, show button border in ie8 by adding second border css row
Jörn Friedrich Dreyer [Mon, 7 Jan 2013 11:23:29 +0000 (12:23 +0100)]
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
Björn Schießle [Mon, 7 Jan 2013 11:06:31 +0000 (12:06 +0100)]
use limits defined in issue https://github.com/owncloud/core/issues/860
Jörn Friedrich Dreyer [Mon, 7 Jan 2013 10:11:21 +0000 (11:11 +0100)]
remove aborted uploads
Jörn Friedrich Dreyer [Mon, 7 Jan 2013 09:39:35 +0000 (10:39 +0100)]
adapt to isFileNameValid, whitespace cleanup
Jörn Friedrich Dreyer [Mon, 7 Jan 2013 09:17:19 +0000 (01:17 -0800)]
Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields
remove css not selector - incompatible with ie8
Jenkins for ownCloud [Sun, 6 Jan 2013 23:06:32 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Thomas Müller [Sun, 6 Jan 2013 22:03:02 +0000 (14:03 -0800)]
Merge pull request #632 from owncloud/fix_629
fix pattern for database names - #629
Thomas Mueller [Sun, 6 Jan 2013 21:46:40 +0000 (22:46 +0100)]
Merge branch 'master' into fix_minor_files_annoyances
Conflicts:
apps/files/js/files.js
Sam Tuke [Sun, 6 Jan 2013 18:53:32 +0000 (18:53 +0000)]
Merge branch 'master' into files_encryption
Sam Tuke [Sun, 6 Jan 2013 18:38:35 +0000 (18:38 +0000)]
All in-use unit tests now passing after merge
Thomas Müller [Sun, 6 Jan 2013 15:25:12 +0000 (07:25 -0800)]
Merge pull request #1092 from owncloud/rename_dot
Files: prevent people from renaming files to '.'
Sam Tuke [Sun, 6 Jan 2013 14:06:22 +0000 (14:06 +0000)]
Removed debugging line
Sam Tuke [Sun, 6 Jan 2013 13:56:45 +0000 (13:56 +0000)]
Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly
Thomas Mueller [Sun, 6 Jan 2013 11:52:00 +0000 (12:52 +0100)]
rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
adding file name checks and notifications to isFileNameValid() for . and empty file name
Michael Gapczynski [Sat, 5 Jan 2013 17:33:29 +0000 (09:33 -0800)]
Merge pull request #1079 from owncloud/update-progress
Updater progress feedback
Michael Gapczynski [Sat, 5 Jan 2013 17:24:21 +0000 (12:24 -0500)]
Merge branch 'master' into update-progress
Sam Tuke [Sat, 5 Jan 2013 17:22:01 +0000 (17:22 +0000)]
Merge branch 'master' into files_encryption
Michael Gapczynski [Sat, 5 Jan 2013 17:21:57 +0000 (12:21 -0500)]
Reformat long line
Michael Gapczynski [Sat, 5 Jan 2013 17:13:36 +0000 (12:13 -0500)]
Tweak failure message and throw exceptions from updateDbFromStructure()
Sam Tuke [Sat, 5 Jan 2013 17:12:23 +0000 (17:12 +0000)]
Development snapshot
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
Michael Gapczynski [Sat, 5 Jan 2013 16:28:01 +0000 (11:28 -0500)]
Modify and include additional update messages from updating apps
Michael Gapczynski [Sat, 5 Jan 2013 16:09:48 +0000 (11:09 -0500)]
Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache
Thomas Müller [Sat, 5 Jan 2013 14:21:28 +0000 (06:21 -0800)]
Merge pull request #1066 from owncloud/fix-388-master
workaround for 32-bit systems to handle filesizes bigger than 2GB
Robin Appelman [Sat, 5 Jan 2013 02:30:05 +0000 (03:30 +0100)]
Files: prevent people from renaming files to '.'
Michael Gapczynski [Sat, 5 Jan 2013 01:18:58 +0000 (17:18 -0800)]
Merge pull request #1053 from owncloud/ocs_api
External API for ownCloud based on OCS
Michael Gapczynski [Sat, 5 Jan 2013 01:13:00 +0000 (20:13 -0500)]
Only show the version updating to instead of worrying about converting internal to a formatted version
Thomas Mueller [Fri, 4 Jan 2013 23:09:37 +0000 (00:09 +0100)]
remove duplicate return