wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19559 commits 157 branches 562 tags 714 MiB
Commit graph

19559 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
acafb4a426 Merge pull request #9669 from owncloud/group-public 
Add group management to the public api
 2014-07-25 17:55:12 +02:00
Björn Schießle
40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update 
fix sharing update, add proper escaping
 2014-07-25 10:16:22 +02:00
Jenkins for ownCloud
3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle
c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Vincent Petry
63ffae8373 Merge pull request #9861 from owncloud/console-dontloadappsonupdate 
Do not load apps in console.php when an upgrade is due
 2014-07-24 18:30:33 +02:00
Vincent Petry
2b1cd84fcc Do not load apps when an upgrade is due 
This makes it still possible to update from the command line, but
disables custom commands from apps
 2014-07-24 16:53:30 +02:00
Thomas Müller
788a2eca2f Merge pull request #9841 from owncloud/fix-password-reset-master 
Fix password reset in console command and lost password controller
 2014-07-24 15:58:02 +02:00
Thomas Müller
b72a3e5be7 Merge pull request #9837 from owncloud/ignore-non-oc-tables-master 
Adding test which breaks because bit and/or enum datatypes are used
 2014-07-24 15:36:17 +02:00
Morris Jobke
fa333c02a0 Merge pull request #9703 from owncloud/files-preview-animate 
[OC 7] Fix preview animation on uploading
 2014-07-24 14:19:00 +02:00
Thomas Müller
a8b6cc6a07 - adding default value for $recoveryPassword 
- set password correctly in lost password
 2014-07-24 12:50:39 +02:00
Thomas Müller
7d60f7a222 register type mappings for unknown/unsupported mysql types 2014-07-24 12:17:26 +02:00
Thomas Müller
65c824a2c0 Adding test which breaks because bit and/or enum datatypes are used 2014-07-24 12:10:05 +02:00
Jenkins for ownCloud
e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Thomas Müller
4c99869e1f Merge pull request #9815 from owncloud/update-preventupdatethroughcron 
Prevent cron.php to trigger apps updating
 2014-07-23 22:41:55 +02:00
Thomas Müller
fb0416884f Merge pull request #9809 from owncloud/check-transaction-before-commit-migration-master 
only commit in case a transaction is active
 2014-07-23 21:35:54 +02:00
Vincent Petry
547927bdd2 Prevent cron.php to trigger apps updating 2014-07-23 21:29:24 +02:00
Thomas Müller
363ba04f5e only commit in case a transaction is active 2014-07-23 20:13:19 +02:00
Vincent Petry
a547bf8fe6 Merge pull request #9788 from owncloud/design-app-styles 
Simplify app navigation look
 2014-07-23 18:39:12 +02:00
icewind1991
e495b4ea19 Merge pull request #9789 from owncloud/external-share-root 
Fix remote share when remote server is installed at the root
 2014-07-23 15:35:55 +02:00
Robin Appelman
97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Jan-Christoph Borchardt
4e209c635d fix settings entry width 2014-07-23 13:06:43 +02:00
Jan-Christoph Borchardt
4dca6d44d8 remove superfluous border from settings entry 2014-07-23 13:02:35 +02:00
Jan-Christoph Borchardt
6ee43255b7 simplify app navigation look, remove superfluous border as it is distinguished enough via background color 2014-07-23 13:01:10 +02:00
Jenkins for ownCloud
9834e38542 [tx-robot] updated from transifex 2014-07-23 01:54:36 -04:00
Sander
4e2954673a Revert change 2014-07-22 19:45:01 +02:00
Sander
eacdf26cde Allow getAppFolder to get another apps path 
cc @Raydiation
 2014-07-22 16:07:43 +02:00
Thomas Müller
0567fd031f Merge pull request #9772 from owncloud/fix-chunked-upload-master-2 
adding special handling of checkPrecondition() for chunked upload
 2014-07-22 15:47:55 +02:00
Thomas Müller
8ed6adaf85 Merge pull request #9738 from owncloud/remove-uneeded-strip 
Remove uneeded strip_tags
 2014-07-22 15:06:23 +02:00
Thomas Müller
31149fb1c3 adding special handling of checkPrecondition() for chunked upload 2014-07-22 13:06:20 +02:00
Vincent Petry
5565eabb81 Merge pull request #9683 from owncloud/fix_#8819_sorting 
Fix #8819 sorting
 2014-07-22 10:11:00 +02:00
Jenkins for ownCloud
5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Remco Brenninkmeijer
319caa7089 Sorting triangles pointing up for ascending, down for descending 2014-07-21 23:07:52 +02:00
Vincent Petry
675e3eec32 Merge pull request #9750 from owncloud/issue/9745 
Correctly use groups parameter only when its not empty
 2014-07-21 20:45:24 +02:00
Joas Schilling
677c0288fb Merge pull request #9757 from owncloud/issue/9756 
Add language parameter to public API for getL10N()
 2014-07-21 16:50:48 +02:00
Matthias Rieber
764e695cb6 use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation 2014-07-21 15:39:46 +02:00
Morris Jobke
1173a55ddb Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-master 
perm -> permissions
 2014-07-21 15:18:40 +02:00
Joas Schilling
01878153e0 Add language parameter to public API for getL10N() 
Fix #9756
 2014-07-21 14:50:34 +02:00
Vincent Petry
61598e7bb5 Merge pull request #9751 from owncloud/issue/9748 
Fix username for subadmins and only send subadmin groups
 2014-07-21 14:22:11 +02:00
Thomas Müller
0a9e0d1051 perm -> permissions 2014-07-21 13:49:22 +02:00
Vincent Petry
3df7a83c72 Merge pull request #9406 from philfry/master 
silently discard the response body, needed for apache/mod_dav and maybe ...
 2014-07-21 12:22:06 +02:00
Joas Schilling
0dc67cb1c2 Do not force isAdmin as true and so the list is filtered correctly 2014-07-21 11:30:47 +02:00
Joas Schilling
e6c75aa974 Fix username for subadmins and only send subadmin groups 
Fix #9748
 2014-07-21 11:20:55 +02:00
Joas Schilling
c84c1f519f Correctly use groups parameter only when its not empty 
Fix #9745
 2014-07-21 10:46:21 +02:00
Jenkins for ownCloud
ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Morris Jobke
76a5fa11f5 Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master 
check if $tables is an array
 2014-07-20 21:40:53 +02:00
Andreas Fischer
8cd1f7464e Merge pull request #9672 from owncloud/mysql-affectedrows 
Make MySQL affected row count consistent with other DBMSes

* owncloud/mysql-affectedrows:
  Added test of OCS privatedata to trigger key duplication
  Document why we have to check with defined() first.
  Make MySQL return "number of found rows" instead of number of "affected rows".
 2014-07-20 21:29:16 +02:00
Morris Jobke
252c239a2a Merge pull request #9732 from owncloud/fix-9716 
do not show selected groups twice after user creation
 2014-07-20 16:08:39 +02:00
Jenkins for ownCloud
ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Thomas Müller
f0c0bd5251 check if $tables is an array 2014-07-19 20:23:38 +02:00
Lukas Reschke
1c16d012ab Remove uneeded strip_tags 
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)

Needs https://github.com/owncloud/core/pull/9735 to be merged first.
 2014-07-19 10:17:24 +02:00