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 |
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 |
Michael Gapczynski
|
f2e6df807d
|
Add back check if installed around background jobs
|
2013-01-04 14:16:59 -05:00 |
Thomas Müller
|
913c96ddc5
|
Merge pull request #1081 from owncloud/fix-issue-1075
Remove echo from lost password page
|
2013-01-04 10:17:25 -08:00 |
Michael Gapczynski
|
394cebc90f
|
Remove echo from lost password page
|
2013-01-04 11:12:28 -05:00 |
Michael Gapczynski
|
ceafb5d7d1
|
Add maintenance mode entry to config.sample.php
|
2013-01-04 10:31:59 -05:00 |
Michael Gapczynski
|
e7eea3dd2e
|
Use hooks to send updates from apps
|
2013-01-04 10:21:33 -05:00 |
Jörn Friedrich Dreyer
|
9cd7bb2c8d
|
reverse z-index of a and input to make upload work again in ie8/9
|
2013-01-04 13:48:29 +01:00 |
Jörn Friedrich Dreyer
|
de496ed16d
|
remove initial iframe, is added automatically by jquery upload mechanism
|
2013-01-04 13:47:47 +01:00 |
Jenkins for ownCloud
|
90f39cd703
|
[tx-robot] updated from transifex
|
2013-01-04 13:23:31 +01:00 |
Michael Gapczynski
|
7505837079
|
Basic update progress of database update only
|
2013-01-03 21:32:33 -05:00 |
Arthur Schiwon
|
81489ad860
|
support multiple base DNs
|
2013-01-03 21:38:53 +01:00 |
Arthur Schiwon
|
3b82be5e64
|
Base DNs will be used as array, now, to support usage of multiple DNs
|
2013-01-03 21:18:21 +01:00 |
Michael Gapczynski
|
a52aa69ffe
|
Rearrange code to prepare for updater feedback
|
2013-01-03 14:11:00 -05:00 |
Michael Gapczynski
|
4e1923b01e
|
Merge pull request #1067 from owncloud/fix-logout
Check if oc_token cookie exists during logout
|
2013-01-03 08:36:19 -08:00 |
Thomas Müller
|
b673748151
|
Merge pull request #1063 from owncloud/translate_not_enough_space_available
add translation call for 'Not enough space available' upload error
|
2013-01-03 06:46:36 -08:00 |
Arthur Schiwon
|
72d67ec036
|
Switch to textarea to enable configuration of multiple DNs
|
2013-01-03 14:07:01 +01:00 |
Jörn Friedrich Dreyer
|
fc64e8ec58
|
fix error when wrong dir was specified
|
2013-01-03 13:34:56 +01:00 |
Arthur Schiwon
|
959996c3b4
|
LDAP: fix spelling
|
2013-01-03 12:32:42 +01:00 |
Jörn Friedrich Dreyer
|
f19787f84c
|
move $l to top
|
2013-01-03 12:00:07 +01:00 |
Jörn Friedrich Dreyer
|
ea732e5b29
|
also translate 'No file was uploaded. Unknown error'
|
2013-01-03 11:57:17 +01:00 |
Michael Gapczynski
|
ce443818d4
|
Check if oc_token cookie exists before trying to use it
|
2013-01-02 19:59:04 -05:00 |
Thomas Mueller
|
045c0acc92
|
workaround for 32-bit systems to handle filesizes bigger than 2GB
|
2013-01-03 00:38:44 +01:00 |
Thomas Mueller
|
34e5cb5070
|
fixing indent
|
2013-01-03 00:13:30 +01:00 |