Thomas Müller
|
d085fdf8ea
|
Merge pull request #842 from owncloud/restrict_keyboard_shortcuts
prevent keyboardshortcuts from catching events outside the main doc - e....
|
2012-12-17 07:38:53 -08:00 |
|
Björn Schießle
|
75a871ecd7
|
expire all operation no longer needed; delete oldest versions if limit of empty space is reached
|
2012-12-17 16:32:09 +01:00 |
|
Lukas Reschke
|
6861d42715
|
Merge pull request #928 from owncloud/fix_permissioncheck
check if admin
|
2012-12-17 05:55:15 -08:00 |
|
Frank Karlitschek
|
c4ecbad009
|
check if admin
|
2012-12-17 14:46:57 +01:00 |
|
Björn Schießle
|
a7bb4b128f
|
personal settings removed, there is no need to expire versions manually
|
2012-12-17 13:34:17 +01:00 |
|
Björn Schießle
|
acc902a0b6
|
remove blacklist
|
2012-12-17 13:30:18 +01:00 |
|
Björn Schießle
|
0a49fcf9d1
|
update files history according the given intervals
|
2012-12-17 13:28:40 +01:00 |
|
Georg Ehrke
|
bbe805b665
|
use regex which was suggested by dragotin
|
2012-12-17 12:28:34 +01:00 |
|
Björn Schießle
|
ee1ce6714b
|
add size to versions array
|
2012-12-17 11:39:57 +01:00 |
|
Björn Schießle
|
24d4f701bf
|
calculate free space for versions
|
2012-12-17 11:39:57 +01:00 |
|
Thomas Müller
|
e16be33384
|
Merge pull request #926 from owncloud/fix_issue_826
Fall back to default log file if logfile config file not found
|
2012-12-17 02:05:06 -08:00 |
|
Michael Gapczynski
|
39eebebd99
|
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
|
2012-12-16 19:43:32 -05:00 |
|
Jenkins for ownCloud
|
dd5e39ca71
|
[tx-robot] updated from transifex
|
2012-12-17 00:10:49 +01:00 |
|
Michael Gapczynski
|
ff3ed54e52
|
Merge pull request #924 from owncloud/versions_write_hook
Change post_write hook to write for files_versions app
|
2012-12-16 15:02:49 -08:00 |
|
Tom Needham
|
3c98f36121
|
Merge branch 'master' into ocs_api
|
2012-12-16 22:29:00 +00:00 |
|
Michael Gapczynski
|
915126cae8
|
Trigger last action before continuing with creating a new file/folder/from link
|
2012-12-16 16:25:08 -05:00 |
|
Michael Gapczynski
|
2607c565b0
|
Trigger the last action before continuing with a file upload, fixes issue #918
|
2012-12-16 16:19:51 -05:00 |
|
Michael Gapczynski
|
63a2271c78
|
Change post_write hook to write to prevent creating a duplicate of the original file on upload
|
2012-12-16 15:08:18 -05:00 |
|
icewind1991
|
811b571cb3
|
Merge pull request #923 from owncloud/hooks_try_catch
wrap hooks into a try, catch to prevent a faulty app from crashing the request
|
2012-12-16 12:06:19 -08:00 |
|
Robin Appelman
|
4301cd7f61
|
wrap hooks into a try, catch to prevent a faulty app from crashing the request
|
2012-12-16 20:29:36 +01:00 |
|
Jenkins for ownCloud
|
0c87f666ad
|
[tx-robot] updated from transifex
|
2012-12-16 00:12:10 +01:00 |
|
Thomas Mueller
|
03f4250ce6
|
Migration of build files from Jenkins
|
2012-12-15 21:03:32 +01:00 |
|
Frank Karlitschek
|
30b0e8b70c
|
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
|
2012-12-15 20:02:16 +01:00 |
|
Tom Needham
|
39b5199775
|
API: PUT and DELETE variables are now accessed from the parameters array
|
2012-12-15 12:37:44 +00:00 |
|
Bart Visscher
|
6ff38624a7
|
Merge pull request #875 from owncloud/multiplefiles_json
use json when deleting multiply files instead of using ; as delimiter
|
2012-12-14 16:26:09 -08:00 |
|
Bart Visscher
|
df7d6cb26c
|
More style fixes
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
68562dafb4
|
More whitespace fixes
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
2ef2dc4dda
|
Fix "There must be a single space between the closing parenthesis and the opening brace"
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
85bd28c508
|
Fix some of "Closing brace must be on a line by itself"
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
f39454ed12
|
Fix "Line indented incorrectly"
|
2012-12-15 00:43:46 +01:00 |
|
Bart Visscher
|
8256650da8
|
Fix "No space found after comma in function call"
|
2012-12-15 00:43:46 +01:00 |
|
Jenkins for ownCloud
|
9f5868cf18
|
[tx-robot] updated from transifex
|
2012-12-15 00:12:10 +01:00 |
|
root
|
f381d2e9ed
|
call it "proxy" instead of "curlproxy"
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
|
2012-12-15 00:09:39 +01:00 |
|
Frank Karlitschek
|
262fecbe39
|
proper escape the mountpoints. Fixes
https://github.com/owncloud/core/issues/557
|
2012-12-14 23:31:50 +01:00 |
|
Jan-Christoph Borchardt
|
74d41b8b96
|
dim Default Storage label color a bit
|
2012-12-14 23:24:51 +01:00 |
|
Jan-Christoph Borchardt
|
4ee9d39422
|
change storage space 'none' to 'Unlimited' and capitalize Default
|
2012-12-14 23:22:55 +01:00 |
|
Jan-Christoph Borchardt
|
4acb2f70e1
|
change technical expression 'Quota' to simpler 'Storage'
|
2012-12-14 23:02:22 +01:00 |
|
Frank Karlitschek
|
2a55beab74
|
make it more readable as deepdiver suggested
|
2012-12-14 22:54:21 +01:00 |
|
Frank Karlitschek
|
b6b4c4c920
|
add curl proxy support. Fixes #504
https://github.com/owncloud/core/issues/504
|
2012-12-14 18:52:16 +01:00 |
|
Tom Needham
|
5fe6129698
|
Merge master into ocs_api, fix conflicts.
|
2012-12-14 15:15:05 +00:00 |
|
Tom Needham
|
4facd766e3
|
Remove 3rdparty repo from ocs_api branch
|
2012-12-14 14:58:31 +00:00 |
|
Tom Needham
|
c7a665a1e4
|
API: Tidy up routes.php, remove redundant call registration
|
2012-12-14 14:55:02 +00:00 |
|
Thomas Mueller
|
e7c288a719
|
fixing links docu/ ->doc/
|
2012-12-14 15:25:52 +01:00 |
|
Frank Karlitschek
|
cde74fe248
|
make it more readable
|
2012-12-14 14:41:09 +01:00 |
|
Frank Karlitschek
|
5689c78ee6
|
rename to doc
|
2012-12-14 14:39:05 +01:00 |
|
Frank Karlitschek
|
4b80e500a5
|
add pointer to the existing documentation. This will be replaced by the rel documentation during packaging
|
2012-12-14 14:38:22 +01:00 |
|
Arthur Schiwon
|
f0893fb8fe
|
Give also hint about possible conflicts in the user_webdavauth description
|
2012-12-14 12:03:46 +01:00 |
|
Arthur Schiwon
|
414b7e8e03
|
Also show a more prominent warning when php_ldap is not installed
|
2012-12-14 12:03:29 +01:00 |
|
Arthur Schiwon
|
b54390f432
|
Show conflict warning when user_ldap and user_webdavauth are enabled
|
2012-12-14 12:03:21 +01:00 |
|
Arthur Schiwon
|
5cbe8d637b
|
Show conflict warning when user_ldap and user_webdavauth are enabled
|
2012-12-14 12:03:15 +01:00 |
|