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

8148 Commits

Author SHA1 Message Date
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher 6ff38624a7 Merge pull request #875 from owncloud/multiplefiles_json 
use json when deleting multiply files instead of using ; as delimiter
 2012-12-14 16:26:09 -08:00
Bart Visscher df7d6cb26c More style fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Bart Visscher 85bd28c508 Fix some of "Closing brace must be on a line by itself" 2012-12-15 00:43:46 +01:00
Bart Visscher f39454ed12 Fix "Line indented incorrectly" 2012-12-15 00:43:46 +01:00
Bart Visscher 8256650da8 Fix "No space found after comma in function call" 2012-12-15 00:43:46 +01:00
Jenkins for ownCloud 9f5868cf18 [tx-robot] updated from transifex 2012-12-15 00:12:10 +01:00
Arthur Schiwon f0893fb8fe Give also hint about possible conflicts in the user_webdavauth description 2012-12-14 12:03:46 +01:00
Arthur Schiwon 414b7e8e03 Also show a more prominent warning when php_ldap is not installed 2012-12-14 12:03:29 +01:00
Arthur Schiwon b54390f432 Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:21 +01:00
Arthur Schiwon 5cbe8d637b Show conflict warning when user_ldap and user_webdavauth are enabled 2012-12-14 12:03:15 +01:00
Frank Karlitschek a871e300e2 Merge pull request #850 from owncloud/icons-for-login 
Icons for login
 2012-12-14 00:12:41 -08:00
Arthur Schiwon 627da205b3 implement getCurrentUser in Sabre Auth Connector, fixes #508 2012-12-14 01:06:09 +01:00
Arthur Schiwon 4466e06e7d use username, not passed loginname, might differ 2012-12-14 01:06:00 +01:00
Jenkins for ownCloud 6d7ae463df [tx-robot] updated from transifex 2012-12-14 00:17:42 +01:00
icewind1991 b156150b34 Merge pull request #876 from owncloud/mimicon_fix 
fix mimetype icons for new files
 2012-12-13 14:41:22 -08:00
Robin Appelman 1443d6c3ef fix mimetype icons for new files 2012-12-13 22:31:43 +01:00
Robin Appelman fda7d932ef remove unneeded line 2012-12-13 22:12:27 +01:00
Robin Appelman 6a2b41e5e8 use json encoding when deleting multiply files instead of using ; as delimiter 2012-12-13 18:11:00 +01:00
blizzz 77c16b2933 Merge pull request #855 from owncloud/ungreenify 
ungreenify new & upload buttons
 2012-12-13 04:19:38 -08:00
Jan-Christoph Borchardt 2c41ae4372 small code reordering of inputs and buttons 2012-12-13 12:51:45 +01:00
Jan-Christoph Borchardt 7881bf1d4d improve general button coloring 2012-12-13 12:49:59 +01:00
blizzz 680ff3a51b Merge pull request #584 from wardragon/ldap_access_userExists_fix 
Really fix OCP\Share::shareItem with LDAP users
 2012-12-12 16:59:43 -08:00
Jenkins for ownCloud 8686a448c7 [tx-robot] updated from transifex 2012-12-13 00:18:20 +01:00
Jan-Christoph Borchardt e7c4a2c8e1 ungreenify new & upload buttons 2012-12-13 00:12:21 +01:00
Thomas Müller 4018ba0654 Merge pull request #847 from owncloud/webdav-quota-fix-exception 
throwing InsufficientStorage in case the quota is reached
 2012-12-12 14:02:45 -08:00
Jan-Christoph Borchardt 9d8bdff51b tweak icons for username and password fields, now it’s good 2012-12-12 22:40:08 +01:00
Thomas Mueller 84420035df throwing InsufficientStorage in case the quota is reached 2012-12-12 20:09:57 +01:00
Thomas Mueller b8b64d6ffc set the session name to the instance id - which is unique 
Conflicts:
	lib/base.php
 2012-12-12 16:07:51 +01:00
Thomas Müller 8b4aad73c7 Merge pull request #810 from owncloud/send-share-link-by-email 
restoring feature to send sharing link via email
 2012-12-12 04:54:51 -08:00
Thomas Müller 72fe339c10 Merge pull request #766 from btactic/language_autodetect 
Improve autodetection of language.
 2012-12-12 03:43:17 -08:00
Thomas Mueller c938a4f791 feedback to the user while request is being processed 2012-12-12 12:34:28 +01:00
Jenkins for ownCloud bac4e011dc [tx-robot] updated from transifex 2012-12-12 00:14:08 +01:00
Robin Appelman 7969d6e646 Merge branch 'master' into filesystem 2012-12-11 23:57:59 +01:00
Bart Visscher ddba90679d Merge pull request #829 from owncloud/contacts_api_namespace_fix 
[contacts_api] IAddressBook moved to OCP as it's used by apps to provide...
 2012-12-11 13:38:57 -08:00
Thomas Müller 2361639a0d Merge pull request #825 from owncloud/oc_namespace 
Autoload classes with 'OC' namespace prefix.
 2012-12-11 10:31:42 -08:00
Jan-Christoph Borchardt 90e8e94909 icons for username and password field, not sure if it’s good 2012-12-11 18:54:43 +01:00
Thomas Müller 2afc5abe19 Merge pull request #813 from owncloud/check_external_dependencies 
Check external dependencies
 2012-12-11 08:53:34 -08:00
Thomas Mueller 8ed0ce7801 [contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data 2012-12-11 17:42:09 +01:00
Thomas Tanghus af12b0f5da Autoload classes with 'OC' namespace prefix. 2012-12-11 16:00:48 +01:00
Frank Karlitschek 728ea711b2 Merge pull request #824 from owncloud/add_user_backend_registration_debug_log 
add debug logging for user backend registration
 2012-12-11 06:34:20 -08:00
Jörn Friedrich Dreyer 8126b09bfe add debug logging for user backend registration 2012-12-11 14:56:04 +01:00
Thomas Müller eb7dbf3701 Merge pull request #697 from eMerzh/revoke_on_create 
Revoke DB rights on install only if the db is newly created
 2012-12-11 05:20:41 -08:00
Thomas Müller b11912f9bc Merge pull request #623 from owncloud/contacts_api_2 
Contacts API has been implemented and unit tests are provided
 2012-12-11 05:10:54 -08:00
Thomas Mueller e427197dce ctor of OC_L10N requires the app name 2012-12-11 14:07:01 +01:00
Thomas Müller c728d542d5 Merge pull request #807 from owncloud/add-changes-again 
add my install changes back again
 2012-12-11 04:35:10 -08:00
Frank Karlitschek e55a3637ce don't call shell_exec if safe_mode is on. 2012-12-11 13:20:20 +01:00
Jan-Christoph Borchardt b72a0f5680 remove obsolete CSS, fix database host label position 2012-12-11 13:02:45 +01:00