mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,106 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

21106 Commits

Author SHA1 Message Date
Lukas Reschke be5ae6c44f Support HTML in logo claim 2014-11-03 21:14:27 +01:00
Morris Jobke d2276215a4 update 3rdparty to master 2014-11-03 20:31:53 +01:00
Morris Jobke 2b691b9915 update 3rdparty to master 2014-11-03 20:30:59 +01:00
Thomas Müller 6d85a2995b Merge pull request #11918 from owncloud/pimple-composer 
Update Pimple to V3.0
 2014-11-03 16:58:30 +01:00
Thomas Müller 994768d99f Update Pimple to V3.0 2014-11-03 16:57:16 +01:00
Lukas Reschke f8f38b06df Merge pull request #11921 from owncloud/symfony-composer 
Symfony composer
 2014-11-03 16:42:52 +01:00
Thomas Müller 13b18aafcc Merge pull request #11923 from owncloud/admin-connectivitycheckscapitalized 
Capitalize Checks in admin page
 2014-11-03 15:44:39 +01:00
Vincent Petry 2a454fd04d Capitalize Checks in admin page 2014-11-03 15:41:40 +01:00
blizzz dc9ea893fd Merge pull request #11172 from owncloud/user-ldap-no-bcmath 
Fix ldap convertSID2Str() / Remove BCMath dependency
 2014-11-03 14:03:26 +01:00
Thomas Müller 136b0c22c9 Fix ctor call in OC\Core\Command\Upgrade 2014-11-03 13:53:59 +01:00
Thomas Müller a4f0483f56 Update Symfony/Console to 2.5 & Update Symfony/Routing to 2.5 2014-11-03 13:52:47 +01:00
Björn Schießle 79b650a023 Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder 
move versions if a file was renamed in a shared folder
 2014-11-03 12:53:14 +01:00
Andreas Fischer d1410b46a9 user_ldap: Reimplement convertSID2Str() without BCMath dependency. 
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
 2014-11-03 12:07:53 +01:00
Jenkins for ownCloud 1a5d860be8 [tx-robot] updated from transifex 2014-11-03 01:54:31 -05:00
Morris Jobke feb42f357f Merge pull request #11902 from unclejamal3000/master 
Enhance question in DB migration script
 2014-11-02 09:22:25 +01:00
Jenkins for ownCloud fd480d6c40 [tx-robot] updated from transifex 2014-11-02 01:54:24 -05:00
Jenkins for ownCloud 469b2655d5 [tx-robot] updated from transifex 2014-11-02 01:54:29 -04:00
unclejamal3000 17f54a5fb6 Enhance question in DB migration script 2014-11-02 00:30:44 +01:00
Jenkins for ownCloud d8f7780f4f [tx-robot] updated from transifex 2014-11-01 01:54:37 -04:00
Vincent Petry 46d8c0a2d6 Merge pull request #11894 from owncloud/fix-unreachable-code 
fix odd behaviour
 2014-10-31 19:53:47 +01:00
Morris Jobke 56cf1d9d27 fix odd behaviour 2014-10-31 18:46:47 +01:00
Bjoern Schiessle ebe1d3df0a don't move versions if only the mount point was renamed 2014-10-31 16:42:54 +01:00
Jörn Friedrich Dreyer fe9e6be35c test files external amazon s3 storage id migration 2014-10-31 14:26:09 +01:00
Jörn Friedrich Dreyer 69a3d8eb1a fix files_external storage id migration 2014-10-31 14:25:55 +01:00
Lukas Reschke ea3fc401e9 Merge pull request #11888 from owncloud/add-code-climeate 
Add CodeClimate indicator
 2014-10-31 13:57:35 +01:00
Lukas Reschke 67f1ddf2c8 Add CodeClimate indicator 2014-10-31 13:52:14 +01:00
Vincent Petry fd4b97d758 Merge pull request #9044 from owncloud/add-missing-email-principal 
adding missing email address for principal
 2014-10-31 13:24:42 +01:00
Lukas Reschke e0528c7598 Merge pull request #11876 from owncloud/remove-pointless-requires 
remove unnecessary require calls - the ownCloud class loader is supposed...
 2014-10-31 13:10:59 +01:00
Vincent Petry 55658e7bb2 Merge pull request #11539 from owncloud/mount-setup-once 
Only mount the storages for the user once
 2014-10-31 10:42:29 +01:00
Vincent Petry a9b41cbf54 Merge pull request #11850 from owncloud/fix-11848 
on xp'ed mode and switching configurations: save raw mode instead of tog...
 2014-10-31 08:38:05 +01:00
Jenkins for ownCloud e00f25e5b0 [tx-robot] updated from transifex 2014-10-31 01:55:39 -04:00
Morris Jobke 1c7f1a8787 Merge pull request #11877 from owncloud/fix-11875-master 
prevent PHP notice
 2014-10-30 21:43:38 +01:00
Vincent Petry bed81ea854 Merge pull request #11080 from owncloud/addheader-text-2 
Fix the addHeader tag attributes text methods to not ignore the text parameter
 2014-10-30 18:13:46 +01:00
Vincent Petry 146c46b73a Merge pull request #11659 from jknockaert/master 
rework getFileSize
 2014-10-30 18:06:25 +01:00
Thomas Müller 99921489cf prevent PHP notice 2014-10-30 17:24:25 +01:00
Thomas Müller f776bcd4a0 remove unnecessary require calls - the ownCloud class loader is supposed to take care of this 2014-10-30 17:20:40 +01:00
Thomas Müller 9b293537a6 Merge pull request #11740 from owncloud/update-archive-tar 
Update pear/archive_tar to 1.3.13
 2014-10-30 17:14:07 +01:00
Jan-Christoph Borchardt 108cdeb892 Merge pull request #11867 from owncloud/settings-sidebar-admin 
introduce sidebar for admin page
 2014-10-30 17:03:03 +01:00
Lukas Reschke 6db69c5d05 Merge pull request #11864 from owncloud/clear-session-after-logout 
Clear session after logout
 2014-10-30 16:47:46 +01:00
Morris Jobke 90e523ead0 Merge pull request #11858 from owncloud/fix-11064 
Allow any outgoing XHR connections
 2014-10-30 16:19:39 +01:00
Thomas Müller 08b46ccc17 Update pear/archive_tar to 1.3.13 2014-10-30 16:10:00 +01:00
Jan-Christoph Borchardt 1dfabfb491 admin settings: fix LDAP settings header layout 2014-10-30 16:04:26 +01:00
Thomas Müller 1076a77840 fix loading of more log entries 2014-10-30 14:59:13 +01:00
Thomas Müller 18f7f582ac Merge pull request #11860 from owncloud/fix-stupid-error-because-im-a-moro 
Fix stupid copy paste fail
 2014-10-30 14:45:58 +01:00
Morris Jobke e2001c6d31 Merge pull request #11821 from owncloud/generic-response 
Add a generic data response
 2014-10-30 14:05:25 +01:00
Thomas Müller 24feb74638 fixing ldap listing in admin sidebar - needs styling review 2014-10-30 13:55:33 +01:00
Thomas Müller d9db791c67 introduce sidebar for admin page 2014-10-30 13:44:40 +01:00
Morris Jobke 5f76f82573 Merge pull request #11863 from owncloud/fix-enc-sharingtests 
Properly register sharing hooks and proxies
 2014-10-30 13:38:48 +01:00
Morris Jobke ea1ee5ba89 update 3rdparty to match it's master branch 2014-10-30 13:34:29 +01:00
Lukas Reschke 770c62c5d8 Clear session after logout 
Fixes https://github.com/owncloud/core/issues/8420
 2014-10-30 12:10:39 +01:00