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

21279 Commits

Author SHA1 Message Date
Morris Jobke d5c98add58 fix whitespace 2014-11-04 12:22:15 +01:00
Morris Jobke fde8ef0655 Merge pull request #11916 from owncloud/introduce-bower 
Introduce bower dependency managment for frontend libraries
 2014-11-04 11:59:33 +01:00
Morris Jobke f6cf654354 Merge pull request #11931 from owncloud/fix-js-unit-tests 
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
 2014-11-04 11:38:26 +01:00
Morris Jobke d94606cfa2 use https ... everywhere :) 2014-11-04 10:55:18 +01:00
Morris Jobke 1979ec70a5 JS unit tests fix - use toBeUndefined() instead of toEqual(null) 2014-11-04 10:37:16 +01:00
Morris Jobke 6f0c814164 fix config.sample.php linebreak 2014-11-04 09:23:38 +01:00
Jenkins for ownCloud 287faf9923 [tx-robot] updated from transifex 2014-11-04 01:55:05 -05:00
Morris Jobke 32de664c03 fixes not centered database chooser on setup page 
* fixes #11927
 2014-11-03 22:01:32 +01:00
Morris Jobke 7f1d974796 Merge pull request #11924 from owncloud/firstCheckIfItIsDefaultConfig 
First check whether it is the default config before touching
 2014-11-03 21:20:42 +01:00
Lukas Reschke be5ae6c44f Support HTML in logo claim 2014-11-03 21:14:27 +01:00
Morris Jobke 1a405e56f5 replace moment.js with bower version 
* fix JS unit tests
 2014-11-03 20:54:50 +01:00
Morris Jobke d763b32048 ability to add bower resources 
* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
 2014-11-03 20:54:40 +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 e73ccbd4ca Migrate "setsecurity.php" to the AppFramework 
Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
 2014-11-03 16:53:03 +01:00
Lukas Reschke f8f38b06df Merge pull request #11921 from owncloud/symfony-composer 
Symfony composer
 2014-11-03 16:42:52 +01:00
Lukas Reschke 9790801268 First check whether it is the default config before touchign 
Potentially fixes https://github.com/owncloud/core/issues/11678
 2014-11-03 16:37:04 +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
Robin Appelman 83126ab675 Add unit tests 2014-10-31 15:22:08 +01:00
Robin Appelman 307071cfec Keep the share permissions from mountpoints 2014-10-31 14:43:32 +01:00
Robin Appelman 2705588073 Dont' use mountpoint permissions as share permissions for external storages 2014-10-31 14:43:32 +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 0f3e6cb50a Improved Javascript docs for JSDoc 
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
 2014-10-31 13:43:30 +01:00
Vincent Petry c7dc656b2b Added script to build the JS documentation 2014-10-31 13:27:36 +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
Lukas Reschke d30fd23544 Clear session before setup 
Fixes https://github.com/owncloud/core/issues/11861
 2014-10-31 11:21:00 +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