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

8622 Commits

Author SHA1 Message Date
Michael Gapczynski 2012603b74 Merge branch 'master' into fix-issue-1085 2013-01-07 14:16:32 -05:00
Michael Gapczynski d39655e126 Move template parameters around so database error page is properly rendered 2013-01-07 14:15:51 -05:00
Frank Karlitschek 861f32a22b Update apps/user_webdavauth/user_webdavauth.php 
Fixing wrong documentation. Fixes https://github.com/owncloud/core/issues/1110
 2013-01-07 16:45:03 +01:00
Bernhard Posselt 5ccbfd9079 readded ocs routes 2013-01-07 15:48:45 +01:00
Bernhard Posselt f80bc4ed53 fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge 2013-01-07 15:34:42 +01:00
Björn Schießle a0b0a1d294 adjust timestamp of the file copied from the version history 2013-01-07 15:13:32 +01:00
Jörn Friedrich Dreyer 0dda8f5d1c ie8 ignores rgba, show button border in ie8 by adding second border css row 2013-01-07 13:09:52 +01:00
Jörn Friedrich Dreyer 3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Björn Schießle 619c3ef56d use limits defined in issue https://github.com/owncloud/core/issues/860 2013-01-07 12:06:31 +01:00
Jörn Friedrich Dreyer da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Jörn Friedrich Dreyer 3dbb148567 Merge pull request #1061 from owncloud/remove_css_not_selector_to_fix_ie8_input_fields 
remove css not selector - incompatible with ie8
 2013-01-07 01:17:19 -08:00
Jenkins for ownCloud 0b007235b9 [tx-robot] updated from transifex 2013-01-07 00:06:32 +01:00
Thomas Mueller a21da9f9fd fixing returns 2013-01-06 23:59:02 +01:00
Thomas Mueller 1093cdd823 fixing returns 2013-01-06 23:57:27 +01:00
Thomas Mueller 19edb29cc3 add missing return 2013-01-06 23:54:18 +01:00
Thomas Mueller 7042b5bf1f remove silly assignment 2013-01-06 23:53:05 +01:00
Thomas Mueller cdd28fcc46 fixing undefined variable $where 2013-01-06 23:48:04 +01:00
Thomas Mueller 408b2cba58 fixing undefined variable $result - should be $query I assume 2013-01-06 23:45:12 +01:00
Thomas Mueller 01cecc9522 initialize $result 2013-01-06 23:43:02 +01:00
Thomas Mueller a0d6f0e127 fixing undefined $eventSource 2013-01-06 23:36:31 +01:00
Thomas Mueller 19e604c104 fixing call of OC_Log::write() - missing parameter 2013-01-06 23:30:17 +01:00
Thomas Mueller a143e77ee4 removing unused parameter $parameters 
fixing undefined variable $useDir
 2013-01-06 23:29:43 +01:00
Thomas Mueller 4a345fd911 removing undefined $response 2013-01-06 23:28:58 +01:00
Thomas Müller 7ca740fa3d Merge pull request #632 from owncloud/fix_629 
fix pattern for database names - #629
 2013-01-06 14:03:02 -08:00
Thomas Mueller 9671ace32e Merge branch 'master' into fix_minor_files_annoyances 
Conflicts:
	apps/files/js/files.js
 2013-01-06 22:46:40 +01:00
Thomas Mueller bae1755184 Merge branch 'master' into fixing-784-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
	lib/helper.php
 2013-01-06 22:40:35 +01:00
Sam Tuke a68b597e83 Merge branch 'master' into files_encryption 2013-01-06 18:53:32 +00:00
Sam Tuke 015787fbb3 All in-use unit tests now passing after merge 2013-01-06 18:38:35 +00:00
Thomas Müller 08d7b8ce30 Merge pull request #1092 from owncloud/rename_dot 
Files: prevent people from renaming files to '.'
 2013-01-06 07:25:12 -08:00
Sam Tuke 2d98afa1ea Removed debugging line 2013-01-06 14:06:22 +00:00
Sam Tuke b024db9f98 Made Keymanager::getFileKey() dependencies explicit, fixed client code and tests accordingly 2013-01-06 13:56:45 +00:00
Thomas Mueller b4191b7da5 rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed! 
adding file name checks and notifications to isFileNameValid() for . and empty file name
 2013-01-06 12:52:00 +01:00
Michael Gapczynski da7a14e9a6 Merge pull request #1079 from owncloud/update-progress 
Updater progress feedback
 2013-01-05 09:33:29 -08:00
Michael Gapczynski 035d0aa9d5 Merge branch 'master' into update-progress 2013-01-05 12:24:21 -05:00
Sam Tuke 69e86c0213 Merge branch 'master' into files_encryption 2013-01-05 17:22:01 +00:00
Michael Gapczynski 5ea8adc7c7 Reformat long line 2013-01-05 12:21:57 -05:00
Michael Gapczynski f6426cee04 Tweak failure message and throw exceptions from updateDbFromStructure() 2013-01-05 12:13:36 -05:00
Sam Tuke 7fe9245636 Development snapshot 
Crypt{} & Util{} unit tests now passing locally
Added keymanager unit tests
 2013-01-05 17:12:23 +00:00
Michael Gapczynski 89823ef4f9 Modify and include additional update messages from updating apps 2013-01-05 11:28:01 -05:00
Michael Gapczynski 6b2216f0d6 Remove old data directory protection from update, should already have taken place or not working because the server isn't Apache 2013-01-05 11:09:48 -05:00
Thomas Müller 0c6213a371 Merge pull request #1066 from owncloud/fix-388-master 
workaround for 32-bit systems to handle filesizes bigger than 2GB
 2013-01-05 06:21:28 -08:00
Robin Appelman a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +01:00
Michael Gapczynski 0b13b41189 Merge pull request #1053 from owncloud/ocs_api 
External API for ownCloud based on OCS
 2013-01-04 17:18:58 -08:00
Michael Gapczynski a94405b4e4 Only show the version updating to instead of worrying about converting internal to a formatted version 2013-01-04 20:13:00 -05:00
Thomas Mueller da28ae0069 remove duplicate return 2013-01-05 00:09:37 +01:00
Jenkins for ownCloud 934d9dcc42 [tx-robot] updated from transifex 2013-01-05 00:03:58 +01:00
Arthur Schiwon ec1caa7d35 support LDAP search using multiple base DNs also with paged results, implements #395 2013-01-04 23:57:55 +01:00
Thomas Mueller 2cb6632752 enhanced log message 2013-01-04 23:44:01 +01:00
Thomas Mueller ac50c2f973 documentation adjusted on the way 2013-01-04 23:04:23 +01:00