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

11058 Commits

Author SHA1 Message Date
Thomas Tanghus 2397772847 Merge pull request #3126 from owncloud/json-utf8 
use utf-8 encoding for json
 2013-04-25 03:18:52 -07:00
Bernhard Posselt c9c1e483c5 use utf-8 encoding for json 2013-04-25 11:36:41 +02:00
Bart Visscher 63b2699720 Merge pull request #3094 from owncloud/log-ajax 
fix logical issue while retrieving log via ajax
 2013-04-25 01:21:59 -07:00
Tom Needham b3e7485612 Correct the api response when both a shipped app and/or a third party app fail 2013-04-25 01:08:11 +01:00
Jenkins for ownCloud a0df5903b0 [tx-robot] updated from transifex 2013-04-25 01:55:56 +02:00
Thomas Tanghus c84281990c Merge pull request #2993 from owncloud/resolve_apps_lib_path 
Let autoloader resolve paths under apps lib directory.
 2013-04-24 13:33:05 -07:00
Lukas Reschke b6fee2d257 Remove uneeded link 2013-04-24 22:39:04 +03:00
raghunayyar 175fc0c737 Clubbing Exact styles together. 2013-04-24 23:47:39 +05:30
Lukas Reschke 1ee224d8cb Merge pull request #3108 from owncloud/fileactions-order 
Files: fix the order fileactions are computed for a file
 2013-04-24 10:55:38 -07:00
Lukas Reschke d41b600725 Add an update notification on every page for admin users 2013-04-24 18:47:38 +02:00
Raghu Nayyar 063e1238bf Merge pull request #3096 from owncloud/add_missing_space_for_new_groups 
Fixing #3095
 2013-04-24 09:33:37 -07:00
Jenkins for ownCloud 62b9c88bb9 [tx-robot] updated from transifex 2013-04-24 18:31:36 +02:00
Jenkins for ownCloud 88fd3b088d [tx-robot] updated from transifex 2013-04-24 17:46:20 +02:00
icewind1991 dd1c876009 Merge pull request #3112 from owncloud/markdown-mimetype 
Add markdown to mimetype list
 2013-04-24 08:18:10 -07:00
icewind1991 3b576c5f77 Merge pull request #3111 from owncloud/csp-audio 
Allow loading of external media ressources
 2013-04-24 08:17:42 -07:00
Lukas Reschke a34350c803 Merge pull request #3106 from IMM0rtalis/xframe_restriction_config 
- xframe restriction configurable now
 2013-04-24 08:02:12 -07:00
Robin Appelman 3d42d49d14 Add markdown to mimetype list 2013-04-24 16:54:34 +02:00
Morris Jobke 4660f194ea Merge pull request #3109 from owncloud/fix-2928 
fix wrong shared icon description
 2013-04-24 07:47:14 -07:00
Lukas Reschke 4f96d7fb85 Allow loading of external media ressources 2013-04-24 16:45:51 +02:00
Daniel Molkentin ff6fb0906b Merge pull request #3100 from owncloud/ensure_index_php 
Fix for #3049
 2013-04-24 07:14:33 -07:00
Morris Jobke 637dd685db fix wrong shared icon description 
fix #2928

translation of string "Shared" has to be marked as located in "files" for the translation extractor
 2013-04-24 16:13:17 +02:00
Frank Karlitschek 18debcf6a3 Merge pull request #3103 from owncloud/default-theme 
check if there is a default/ folder in the theme directory if no theme e...
 2013-04-24 07:08:57 -07:00
Robin Appelman ab7fcebeb3 Files: fix the order fileactions are computed for a file 2013-04-24 15:26:36 +02:00
Daniel Molkentin 6ac2fdf44b sync parameters in setup.php with the ones in the actual .htaccess 2013-04-24 15:11:58 +02:00
Daniel Molkentin a86fe7920b Try to prefer index.php over index.html in the same directory 
Add JS redirect if that fails (HTTP-based redirects are disabled by
default in more recent Firefox versions).
 2013-04-24 15:11:53 +02:00
Florian Scholz 03aa86d8a6 - xframe restriction configurable now 2013-04-24 14:45:40 +02:00
Bernhard Posselt a8075943c3 use variable instead of relative path to file 2013-04-24 14:17:52 +02:00
kondou 6f5501bbc8 Fis syntax error and add user icon. 2013-04-24 14:17:13 +02:00
Bernhard Posselt b98b56e4a8 check if there is a default/ folder in the theme directory if no theme exists 2013-04-24 13:45:40 +02:00
kondou e15afcb011 Add space around checkboxes. 2013-04-24 11:58:12 +02:00
Morris Jobke b1c9b296e8 Merge pull request #3089 from guruz/fix_ugly_config_writeability_error 
Fix ugly error style on install
 2013-04-24 02:24:23 -07:00
kondou e8bb998ecc Fix #3095. 2013-04-24 11:13:12 +02:00
Jenkins for ownCloud a7b4469b2e [tx-robot] updated from transifex 2013-04-24 02:01:20 +02:00
David Reagan 4bee02f75c Fixed comment in personal.js. Changed message text in changedisplayname.php. 2013-04-23 14:31:35 -07:00
Florin Peter 25ff32db6b Added post proxy for getFileInfo. 
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
 2013-04-23 22:20:31 +02:00
David Reagan 7312cbec91 Made saving the display name work the same way as the email address. Fixed a few comparison operators. Increased the fadeOut time for the success and error messages. 2013-04-23 12:45:12 -07:00
Bernhard Posselt 9dde43db57 Merge pull request #3080 from owncloud/validate_redirect_mast 
Disallow URLs containing a @
 2013-04-23 12:21:39 -07:00
Florin Peter f8819f54c2 Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption 2013-04-23 19:09:01 +02:00
Florin Peter baa6fd639f improved file size handling 2013-04-23 19:08:52 +02:00
Frank Karlitschek 99cb37a6d1 Merge pull request #3092 from guruz/external_storage_check_for_curl 
External Storage: Check for curl in PHP
 2013-04-23 09:48:04 -07:00
Bart Visscher c357f7b8cd Merge pull request #3082 from owncloud/ldap_confcache_opt 
LDAP: reset user/group-config association only after exists-check, may p...
 2013-04-23 09:44:38 -07:00
Sam Tuke b7d8da87d0 Development snapshot 
working on stream handling (large files) in Util->encryptAll()
 2013-04-23 18:41:01 +02:00
Morris Jobke 8fab7d5afb fix syntax layout 2013-04-23 18:15:34 +02:00
Sam Tuke c6bfc7315b Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside 
.part file paths fixed in stream{}
 2013-04-23 17:36:35 +02:00
Lukas Reschke 495868497c Merge pull request #3077 from owncloud/rename-checksourcepath 
Files: also check if the source path is valid when doing a rename or copy operation
 2013-04-23 07:17:36 -07:00
Morris Jobke e78a464002 remove log sort in admin section 
doesn't work anymore, because now the datetime is saved as string (ref #2975)
 2013-04-23 14:56:33 +02:00
Morris Jobke b9b2e0269a fix logical issue while retrieving log via ajax 2013-04-23 14:40:21 +02:00
Sam Tuke 4aa80d02be Merge branch 'master' into files_encryption 2013-04-23 14:13:40 +02:00
Sam Tuke a1d241783e Updated buglist 2013-04-23 14:12:28 +02:00
kondou 1e2efdddc9 Oneliners, <br>, proper errors & print_unescaped() 2013-04-23 12:38:25 +02:00