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

11084 Commits

Author SHA1 Message Date
Robin Appelman 0b5f6b9c13 Move autoloader to it's own class 2013-05-07 22:16:17 +02:00
Bart Visscher 175633d380 Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app 
Use === and !== in user_ldap app
 2013-05-07 12:45:43 -07:00
Arthur Schiwon 498eae49b1 LDAP: prepare settings for internal username attribute and clearing user mappings 2013-05-07 19:31:51 +02:00
icewind1991 5b61c5d478 Merge pull request #3044 from owncloud/backgroundwatcher 
Add a background job to watch for external filesystem changes
 2013-05-07 10:00:00 -07:00
Arthur Schiwon 68ecee9771 LDAP: Coypright info 2013-05-07 18:23:49 +02:00
Michael Gapczynski 349a533f66 Merge pull request #3025 from owncloud/move-file 
Cache: only look for child entires when doing a move operation when moving a folder
 2013-05-07 07:52:57 -07:00
Bart Visscher 398fbb61f8 Merge pull request #2813 from owncloud/improve-lib-check 
added correct check for gd and check for php-intl
 2013-05-07 06:12:40 -07:00
Morris Jobke 2b9da8a6c9 remove hard php-intl requirement 2013-05-07 13:51:30 +02:00
Morris Jobke deb0885e46 Merge pull request #3246 from owncloud/newfile-mimetype 
Files: set the proper mimetype when creating a new text file
 2013-05-07 01:53:43 -07:00
Björn Schießle 9b258929c6 allow to set quota to zero, issue #2696 2013-05-07 10:40:25 +02:00
Lukas Reschke 2208313e02 Merge pull request #3245 from owncloud/use-$view 
Use the internal ownCloud view
 2013-05-06 09:20:18 -07:00
Robin Appelman 3de40f7cfb Files: set the proper mimetype when creating a new text file 2013-05-06 17:55:22 +02:00
Lukas Reschke db1e6b5f3b Use $dir instead of $fullpath 2013-05-06 14:28:01 +03:00
Lukas Reschke b13b19c58b Use the internal ownCloud view 2013-05-06 13:43:23 +03:00
Arthur Schiwon d659d8e193 LDAP: do not reset UUID attribute setting when guid is detected 2013-05-06 10:17:52 +02:00
Bart Visscher 51a1f829b8 Merge pull request #3120 from owncloud/ocs_properties 
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
 2013-05-05 23:20:25 -07:00
Thomas Tanghus 83db2c83ad Merge pull request #3177 from owncloud/outerHTML_compatibility 
Add compatibility function for outerHTML
 2013-05-04 12:27:24 -07:00
Pellaeon Lin 3409403893 Modify zh_* language codes 2013-05-04 20:27:40 +08:00
Jenkins for ownCloud a876240b32 [tx-robot] updated from transifex 2013-05-04 02:00:54 +02:00
Bart Visscher a983697e5b Merge pull request #3230 from owncloud/fix_ldap_cachekey 
LDAP: cachekey in set method needs to match with that one from get
 2013-05-03 06:58:24 -07:00
Arthur Schiwon 1e2b872160 LDAP: cachekey in set method needs to match with that one from get 2013-05-03 15:13:37 +02:00
Bart Visscher e0f6d159d6 Merge pull request #3229 from owncloud/fix_3210 
LDAP: remove restriction from group names to be in line with core behavi...
 2013-05-03 06:04:24 -07:00
Bart Visscher a541b80592 Merge pull request #3222 from owncloud/fix-3218 
Fix retrieving of mount points for shared storage, fix #3218
 2013-05-03 06:02:33 -07:00
Bart Visscher cc3f7ba7e1 Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages 
Sort priorized languages as defined in the array
 2013-05-03 05:56:56 -07:00
Bart Visscher dcbbca1f89 Merge pull request #2972 from AndreasErgenzinger/master 
Translations for themes
 2013-05-03 05:41:28 -07:00
Bart Visscher 05a0b4533b Merge pull request #2491 from riso/xsendfile_fix_zip 
improved handling of xsendfile zip generation race condition
 2013-05-03 05:37:01 -07:00
Arthur Schiwon 22a8e7ad55 LDAP: remove restriction from group names to be in line with core behaviour again 2013-05-03 14:11:06 +02:00
Arthur Schiwon 9c3b83e28c Fix retrieval of users with multiple backends 2013-05-03 13:50:14 +02:00
Jenkins for ownCloud 4f6565d8e7 [tx-robot] updated from transifex 2013-05-03 02:05:10 +02:00
Tom Needham cb5a69dd22 Merge pull request #3216 from owncloud/fix-api-3rdparty 
fix bug that would only return error responses for 3rdparty apps
 2013-05-02 15:40:10 -07:00
Thomas Müller 444a209a2a Merge pull request #3183 from miicha/patch-1 
fixing mimetype for "new" ms office formats
 2013-05-02 15:39:10 -07:00
Morris Jobke a204a46d50 Merge pull request #3212 from owncloud/stop-links 
Don't display shared links if disabled
 2013-05-02 15:29:00 -07:00
Michael Gapczynski 73d7cae6df One more mount point fix 2013-05-02 18:22:43 -04:00
Michael Gapczynski 7039421efc Fix retrieving of mount points for shared storage, fix #3218 2013-05-02 17:47:11 -04:00
Frank Karlitschek f47cecc651 Merge pull request #3220 from owncloud/gitignore-themes 
ignore themes
 2013-05-02 09:14:33 -07:00
Jan-Christoph Borchardt 8a2ac273eb don't ignore themes README 2013-05-02 11:51:29 -04:00
Jan-Christoph Borchardt 371b0d9583 ignore themes 2013-05-02 11:47:38 -04:00
Bernhard Posselt 11afb2e5a8 respect format output 2013-05-02 14:51:53 +02:00
Bernhard Posselt 0f38e6ec9c logout before output to not run into header already sent problems 2013-05-02 14:49:05 +02:00
Bernhard Posselt ed0c23a9cc fix bug that would only return error responses for 3rdparty apps 2013-05-02 14:36:16 +02:00
Frank Karlitschek 8a5e88b21c Merge pull request #3211 from owncloud/fix-2816 
Fix #2816 renaming shared files
 2013-05-02 00:54:09 -07:00
Michael Gapczynski 274bf3c6bd Don't display shared links if disabled 2013-05-01 20:39:02 -04:00
Michael Gapczynski 04b7a9902d Fix #2816 renaming shared files 2013-05-01 20:29:07 -04:00
Jenkins for ownCloud ee53e7b3d2 [tx-robot] updated from transifex 2013-05-02 02:19:04 +02:00
Michael Gapczynski 657ff34c6c Merge pull request #3147 from owncloud/storage-mkdir-root 
Dont task external storages with creating their own root
 2013-05-01 16:35:44 -07:00
Frank Karlitschek db49b0aff8 Merge pull request #3202 from owncloud/swift_id 
Set storage id for openstack swift backend
 2013-05-01 05:28:37 -07:00
Morris Jobke f363044b3a Merge pull request #3203 from qzio/patch-1 
typo fix in a comment.
 2013-05-01 04:47:19 -07:00
joel hansson 7f58b0ef7c typo fix in a comment. 2013-05-01 12:29:15 +03:00
Jenkins for ownCloud 6163a85668 [tx-robot] updated from transifex 2013-05-01 02:02:59 +02:00
kondou d8e6db5608 Sort priorized languages as defined in the array 
Also add russian and arabic to the common languages.
 2013-05-01 00:34:13 +02:00