wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8388 commits 157 branches 562 tags 714 MiB
Commit graph

8388 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Tuke
fed74eda1c Removed old and unnecessary comments 2013-01-10 18:48:40 +00:00
Sam Tuke
2e30641caa Removed misleading crypto gen comment 2013-01-10 18:19:37 +00:00
Sam Tuke
3e83023bf6 Removed unnecessary line 2013-01-10 18:16:56 +00:00
Sam Tuke
0579b52092 Removed phantom depreciated files 2013-01-10 18:14:15 +00:00
Sam Tuke
9ca9124dc1 Merge branch 'master' into files_encryption 2013-01-10 18:07:15 +00:00
Sam Tuke
61104d1441 Re-added 'checkAdminUser' 
Improved code formatting
 2013-01-10 18:04:52 +00:00
Thomas Müller
23dd7f1bea Merge pull request #1127 from owncloud/fixing-641-for-webdav-master 
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
 2013-01-10 02:27:00 -08:00
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Lukas Reschke
fda1ada4f0 Merge pull request #1131 from owncloud/more_translations 
translate move and rename error messages
 2013-01-09 12:07:39 -08:00
Lukas Reschke
ca027f3749 Merge pull request #1124 from schiesbn/sabredav2 
OC_Connector_Sabre_Client no longer needed
 2013-01-09 12:06:25 -08:00
Jörn Friedrich Dreyer
a40c95242f more translations 2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f Merge pull request #938 from owncloud/fix_minor_files_annoyances 
Fix minor files annoyances
 2013-01-08 15:02:06 -08:00
Björn Schießle
43415386a8 Upstream merged my patch to add additional ssl root certificates to the webdav client. 
This means that OC_Connector_Sabre_Client is no longer needed
 2013-01-08 17:44:28 +01:00
Thomas Mueller
7b9e6d2f2c fixing string concatenation in javascript 
refs ae54364d7c
 2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01: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
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
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 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
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
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
Thomas Mueller
cedec593ee Fallback to use COM or exec('stat ..') is only executed if stat or filesize return negative values. 
Special case of BSD has been added as stat syntax differs
In addition unknown OS is logged
 2013-01-04 23:03:26 +01:00
Thomas Mueller
dfc8d757b5 OC_Helper::is_function_enabled() added to find out if a function is available 
And some documentation adjusted on the way
 2013-01-04 23:00:51 +01:00