]>
source.dussan.org Git - nextcloud-server.git/log
Volkan Gezer [Mon, 16 Jun 2014 16:23:55 +0000 (18:23 +0200)]
Merge pull request #9049 from owncloud/fix-upload-button
fix CSS for upload button - fixes #8939
Georg Ehrke [Mon, 16 Jun 2014 13:54:50 +0000 (15:54 +0200)]
Merge pull request #8808 from owncloud/update_shipped_apps_from_appstore
Make shipped apps updatable via appstore
Morris Jobke [Mon, 16 Jun 2014 13:23:08 +0000 (15:23 +0200)]
Merge pull request #9048 from owncloud/fix_9041
format group or username for delete notification, fixes #9041
Morris Jobke [Mon, 16 Jun 2014 11:51:49 +0000 (13:51 +0200)]
fix CSS for upload button - fixes #8939
Georg Ehrke [Mon, 16 Jun 2014 11:49:02 +0000 (13:49 +0200)]
disable code check for shipped apps
Arthur Schiwon [Mon, 16 Jun 2014 11:46:31 +0000 (13:46 +0200)]
style
Arthur Schiwon [Mon, 16 Jun 2014 11:44:41 +0000 (13:44 +0200)]
escape before output, fixes #9041
Morris Jobke [Mon, 16 Jun 2014 11:13:28 +0000 (13:13 +0200)]
Merge pull request #9040 from owncloud/fix-xss
Sanitize name of sharee
Morris Jobke [Mon, 16 Jun 2014 11:10:01 +0000 (13:10 +0200)]
Merge pull request #9030 from owncloud/default-allow-user-mount-backends
AllowUserMount defaults now to all backends fixes #7958
Volkan Gezer [Mon, 16 Jun 2014 10:24:39 +0000 (12:24 +0200)]
Merge pull request #8716 from owncloud/forget-documentation
app manager forgets the documentation links workaround for #8081
Morris Jobke [Mon, 16 Jun 2014 09:35:48 +0000 (11:35 +0200)]
fix camelCase and avoiud re-wrapping $()
Morris Jobke [Mon, 16 Jun 2014 09:33:51 +0000 (11:33 +0200)]
fix typo - Backups -> Backends
Vincent Petry [Mon, 16 Jun 2014 09:13:10 +0000 (11:13 +0200)]
Merge pull request #8917 from owncloud/repair-routine-base
Add support for repair step classes
Vincent Petry [Mon, 16 Jun 2014 09:11:03 +0000 (11:11 +0200)]
Merge pull request #9027 from owncloud/fix-password-saved-share-layout
fix layout of password protected shares
Jenkins for ownCloud [Mon, 16 Jun 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
macjohnny [Mon, 16 Jun 2014 05:50:53 +0000 (07:50 +0200)]
Merge pull request #9022 from owncloud/speedup-nested-ldap-groups
drastic speedup for nested ldap groups
Jenkins for ownCloud [Sun, 15 Jun 2014 05:55:06 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Lukas Reschke [Sat, 14 Jun 2014 18:56:54 +0000 (20:56 +0200)]
Do even more sanitization
Lukas Reschke [Sat, 14 Jun 2014 18:45:10 +0000 (20:45 +0200)]
Sanitize name of sharee
Fixes a XSS introduced with https://github.com/owncloud/core/commit/
271684dcfec16122b88e03780b41af7120f27e45
Morris Jobke [Sat, 14 Jun 2014 13:26:27 +0000 (15:26 +0200)]
Fix path
Lukas Reschke [Sat, 14 Jun 2014 11:08:58 +0000 (13:08 +0200)]
Merge pull request #9028 from owncloud/table-to-paragraph-layout-for-https
migrate table layout to paragraph layout for HTTPS setting
Frank Karlitschek [Sat, 14 Jun 2014 10:01:13 +0000 (12:01 +0200)]
Merge pull request #8618 from owncloud/yet-another-ajax-lost-password
Basic ajax lost password
Jenkins for ownCloud [Sat, 14 Jun 2014 05:55:24 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 13 Jun 2014 23:03:03 +0000 (01:03 +0200)]
remove double space
Morris Jobke [Fri, 13 Jun 2014 23:01:59 +0000 (01:01 +0200)]
Merge pull request #8978 from owncloud/movie_preview_improvements
movie previews: use file directly when it's stored locally and encryption is not enabled
Georg Ehrke [Fri, 13 Jun 2014 19:51:16 +0000 (21:51 +0200)]
don't skip code check for skipped apps
those apps will have to use the public api
Georg Ehrke [Fri, 13 Jun 2014 19:45:31 +0000 (21:45 +0200)]
skip certain tests for shipped apps
Volkan Gezer [Fri, 13 Jun 2014 16:26:14 +0000 (18:26 +0200)]
Merge pull request #9025 from owncloud/fix-mail-settings
fix mail settings save function - ref #8854
Morris Jobke [Fri, 13 Jun 2014 16:14:41 +0000 (18:14 +0200)]
AllowUserMount defaults now to all backends fixes #7958
Frank Karlitschek [Fri, 13 Jun 2014 16:09:51 +0000 (18:09 +0200)]
Merge pull request #9018 from owncloud/dbms-socket-support
Refactor OC_DB::connect() to properly support sockets.
Morris Jobke [Fri, 13 Jun 2014 14:54:47 +0000 (16:54 +0200)]
migrate table layout to paragraph layout for HTTPS setting
Morris Jobke [Fri, 13 Jun 2014 14:38:42 +0000 (16:38 +0200)]
fix layout of password protected shares
* add password icon
* fix upshifted arrow button - fixes #9024
Morris Jobke [Fri, 13 Jun 2014 14:18:58 +0000 (16:18 +0200)]
add proper Exception message for invalid token
Morris Jobke [Fri, 13 Jun 2014 14:18:39 +0000 (16:18 +0200)]
use array_merge for merging arrays in PHP
Morris Jobke [Fri, 13 Jun 2014 14:18:21 +0000 (16:18 +0200)]
complete renaming uid to userId
Morris Jobke [Fri, 13 Jun 2014 14:03:13 +0000 (16:03 +0200)]
remove whitespace at end of line
Morris Jobke [Fri, 13 Jun 2014 14:02:41 +0000 (16:02 +0200)]
Migrate ´ to '
Morris Jobke [Fri, 13 Jun 2014 13:54:09 +0000 (15:54 +0200)]
Remove infield label, add password icon, fix layout
Morris Jobke [Fri, 13 Jun 2014 13:39:44 +0000 (15:39 +0200)]
reformat method call and fix paranthesis mismatch
Bernhard Posselt [Fri, 6 Jun 2014 14:51:58 +0000 (16:51 +0200)]
more style fixes
Bernhard Posselt [Fri, 6 Jun 2014 14:36:10 +0000 (16:36 +0200)]
use more stuff from core :)
Victor Dubiniuk [Thu, 5 Jun 2014 14:48:14 +0000 (17:48 +0300)]
Add missing use
Victor Dubiniuk [Tue, 3 Jun 2014 20:32:19 +0000 (23:32 +0300)]
Fix check for user existence
Victor Dubiniuk [Tue, 3 Jun 2014 15:47:09 +0000 (18:47 +0300)]
Remove debug output
Victor Dubiniuk [Mon, 2 Jun 2014 22:24:27 +0000 (01:24 +0300)]
Change routes. Update templates
Victor Dubiniuk [Wed, 28 May 2014 17:13:07 +0000 (20:13 +0300)]
Changes according to review
Victor Dubiniuk [Tue, 27 May 2014 21:09:08 +0000 (00:09 +0300)]
Use appframework
Victor Dubiniuk [Mon, 24 Mar 2014 22:38:11 +0000 (01:38 +0300)]
Basics
Morris Jobke [Fri, 13 Jun 2014 13:31:35 +0000 (15:31 +0200)]
fix mail settings save function - ref #8854
Morris Jobke [Fri, 13 Jun 2014 11:07:41 +0000 (13:07 +0200)]
Merge pull request #9010 from owncloud/fix_8941_admin_settings_message
move mail template settings to templateeditor repo
Jörn Friedrich Dreyer [Thu, 12 Jun 2014 14:48:45 +0000 (16:48 +0200)]
move mail template editor from core to standalone templateeditor repo
Jörn Friedrich Dreyer [Thu, 12 Jun 2014 13:59:26 +0000 (15:59 +0200)]
access admin settings result message correctly
Morris Jobke [Fri, 13 Jun 2014 06:30:57 +0000 (08:30 +0200)]
Merge pull request #8714 from owncloud/minor-fixes
fix some minor issues
Jenkins for ownCloud [Fri, 13 Jun 2014 05:54:32 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 12 Jun 2014 22:19:07 +0000 (00:19 +0200)]
Merge pull request #9017 from owncloud/maxheartbeatinterval
Added max heartbeat interval to prevent integer overflow
Volkan Gezer [Sun, 25 May 2014 18:59:04 +0000 (20:59 +0200)]
fix some minor issues
Georg Ehrke [Thu, 12 Jun 2014 22:07:43 +0000 (00:07 +0200)]
Update preseed-config.php
macjohnny [Thu, 12 Jun 2014 07:41:23 +0000 (09:41 +0200)]
drastic speedup for nested ldap groups
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
Andreas Fischer [Thu, 12 Jun 2014 18:22:45 +0000 (20:22 +0200)]
Don't specify host when using a socket.
Andreas Fischer [Thu, 12 Jun 2014 18:18:38 +0000 (20:18 +0200)]
Rename variable to indicate that it can be port and socket.
Andreas Fischer [Thu, 12 Jun 2014 18:17:30 +0000 (20:17 +0200)]
No need to check the port number as this will fail anyway.
Andreas Fischer [Thu, 12 Jun 2014 17:59:40 +0000 (19:59 +0200)]
Move getValue() to where required. This actually is not required "global data".
Andreas Fischer [Thu, 12 Jun 2014 17:55:26 +0000 (19:55 +0200)]
Move check for : to where it belongs, getting rid of $socket = false;
Andreas Fischer [Thu, 12 Jun 2014 17:53:33 +0000 (19:53 +0200)]
Extract common variables of $connectionParams.
Andreas Fischer [Thu, 12 Jun 2014 17:48:37 +0000 (19:48 +0200)]
Inline $port expression, getting rid of $port variable.
Vincent Petry [Thu, 12 Jun 2014 16:42:09 +0000 (18:42 +0200)]
Added unit tests for heartbeat interval min/max values
Vincent Petry [Thu, 12 Jun 2014 16:41:19 +0000 (18:41 +0200)]
Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might
overflow and cause the setInterval() call to ping the server in a loop
without any delay.
This fix adds a maximum ping interval of 24 hours.
Forward port of
00ec5fc1935c946e846a8ff28491e5b5b017b3d7 from stable6.
Vincent Petry [Thu, 12 Jun 2014 15:40:44 +0000 (17:40 +0200)]
Merge pull request #8968 from owncloud/scanner-parent-repair
Repair broken parent link in the scanner
Vincent Petry [Thu, 12 Jun 2014 12:40:43 +0000 (14:40 +0200)]
Fixed instanceof to use interface instead of class
Vincent Petry [Tue, 10 Jun 2014 09:47:27 +0000 (11:47 +0200)]
Added RepairStep interface and default repair step lists
The updater is using "before update" repair steps and "regular" repair
steps.
The "regular" repair steps are also used by the CLI tool.
Currently no steps exist but can be added later in the static methods in
the \OC\Repair class.
Added unit test to test messaging, error and exception cases.
Vincent Petry [Tue, 25 Mar 2014 11:51:16 +0000 (12:51 +0100)]
Add support for repair step classes
This also makes it possible to unit test each repair step class
individually
Morris Jobke [Thu, 12 Jun 2014 12:56:46 +0000 (14:56 +0200)]
Revert "Merge pull request #8998 from macjohnny/master"
This reverts commit
482eded8b31b257dfed7761c7cb43f35ddcd3408 , reversing
changes made to
354cace14ae01e7ff34af3c8a4a3335b89596da3 .
Vincent Petry [Thu, 12 Jun 2014 12:50:18 +0000 (14:50 +0200)]
Merge pull request #9004 from owncloud/cleanup-storages
Added check and cleanup for storage/filecache
macjohnny [Thu, 12 Jun 2014 12:49:15 +0000 (14:49 +0200)]
Merge pull request #8998 from macjohnny/master
drastic speedup for nested ldap groups
Bernhard Posselt [Thu, 12 Jun 2014 12:33:13 +0000 (14:33 +0200)]
Merge pull request #9003 from owncloud/fix_liskov_in_admin_mail_template_settings
fix liskov substitution principle in admin mail template settings
Vincent Petry [Thu, 12 Jun 2014 10:49:01 +0000 (12:49 +0200)]
Added check and cleanup for storage/filecache
Some tests don't clean up the file cache and sometimes entries are
reused by mistake in subsequent test suites.
This cleans up the file cache and storage after every test suite and
also shows an annoying warning.
Morris Jobke [Thu, 12 Jun 2014 11:34:32 +0000 (13:34 +0200)]
Merge pull request #8999 from owncloud/issue/8996
Issue/8996 IE8 issues with the new menu
Morris Jobke [Thu, 12 Jun 2014 11:33:32 +0000 (13:33 +0200)]
Move IE8 fixes to fixes.css
Vincent Petry [Thu, 12 Jun 2014 11:28:03 +0000 (13:28 +0200)]
Merge pull request #8980 from owncloud/better-accept-header
handle http accept headers more gracefully
Jörn Friedrich Dreyer [Thu, 12 Jun 2014 10:38:34 +0000 (12:38 +0200)]
fix liskov substitution principle in admin mail template settings, fixes #8997
macjohnny [Thu, 12 Jun 2014 09:29:20 +0000 (11:29 +0200)]
Update manager.php
macjohnny [Thu, 12 Jun 2014 09:28:57 +0000 (11:28 +0200)]
Update group.php
Joas Schilling [Thu, 12 Jun 2014 09:01:35 +0000 (11:01 +0200)]
Fix missing caret in header menu for IE8
Joas Schilling [Thu, 12 Jun 2014 09:00:44 +0000 (11:00 +0200)]
Fix header menu background in IE8
Joas Schilling [Thu, 12 Jun 2014 08:55:25 +0000 (10:55 +0200)]
Reduce size of png files so they match the svg
Fix #8996
macjohnny [Thu, 12 Jun 2014 07:51:23 +0000 (09:51 +0200)]
drastic speedup for nested ldap groups
Changes a function call in getUserGroups to only retrieve group ids instead of objects.
this change significantly improves performance when using owncloud with many groups, e.g. nested ldap hierarchy (1.2.840.113556.1.4.1941), since getUserGroups gets called in oc_share::getItems, which is needed for every page request.
in my particular case, it took more than 10s to load the calendar page and more than 6s to load the file page.
this was in an environment with 100 user groups (nested) per user. The performance was bad due to the following call stack:
self::getManager()->getUserGroups($user)
- getGroupObject() (executed for every group!)
- groupExists() (resulting in many ldap-requests)
since the groups are loaded from ldap, it is unnecessary to check whether the group exists or not.
macjohnny [Thu, 12 Jun 2014 07:41:23 +0000 (09:41 +0200)]
Update manager.php
add a function getUserGroupIds for retrieving group ids instead of group objects. this significantly improves performance when using many (nested) groups.
Vincent Petry [Thu, 12 Jun 2014 07:08:50 +0000 (09:08 +0200)]
Merge pull request #8991 from owncloud/fix-php53-arraycombine
Fixed array_combine for PHP 5.3
Jenkins for ownCloud [Thu, 12 Jun 2014 05:54:34 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
josh4trunks [Thu, 12 Jun 2014 04:47:45 +0000 (21:47 -0700)]
Fixes based on suggestions
I use the term socket for any extension, either unix socket, or internet socket (port).
I check if the socket is all digits
* only integers 0 and larger would pass this test.
I then check if the string is less than or equal to the maximum port number.
By using "if($socket)" I make sure socket isn't false, empty, or the string '0'.
I don't believe I need to initialize $port because $port will always be set if $socket is true. Please show me if I am wrong here. Thanks
Vincent Petry [Wed, 11 Jun 2014 17:13:49 +0000 (19:13 +0200)]
Fixed array_combine for PHP 5.3
Vincent Petry [Wed, 11 Jun 2014 16:34:35 +0000 (18:34 +0200)]
Merge pull request #8986 from owncloud/disable_tests
disable failing tests
Vincent Petry [Wed, 11 Jun 2014 16:28:55 +0000 (18:28 +0200)]
Merge pull request #8901 from owncloud/permissions-update-cache
Save the permissions in the filecache if it's not saved yet
Vincent Petry [Wed, 11 Jun 2014 15:27:26 +0000 (17:27 +0200)]
Use assertNotSame when checking etags
Sometimes etags contain a "e" character which makes PHP believe it's a
number and make the tests fail
Bjoern Schiessle [Wed, 11 Jun 2014 14:23:01 +0000 (16:23 +0200)]
disable failing tests
Vincent Petry [Wed, 11 Jun 2014 15:20:22 +0000 (17:20 +0200)]
Merge pull request #8985 from owncloud/share-grouporderfix
Added ORDER BY to enforce share entry order
Vincent Petry [Wed, 11 Jun 2014 12:28:30 +0000 (14:28 +0200)]
Added ORDER BY to enforce share entry order
Sometimes MySQL decides to return the shares in the wrong order, but
some parts of the code seem to require the order to be known, at least
so that the parent shares come before the children shares.
This fix adds an ORDER BY clause to force the order by id.
Frank Karlitschek [Wed, 11 Jun 2014 08:54:45 +0000 (10:54 +0200)]
increase to 7.0 alpha 1
Vincent Petry [Wed, 11 Jun 2014 08:05:38 +0000 (10:05 +0200)]
Merge pull request #8966 from owncloud/fix_failing_tests_on_master
Fix failing tests on master
Jenkins for ownCloud [Wed, 11 Jun 2014 05:55:07 +0000 (01:55 -0400)]
[tx-robot] updated from transifex