9bb244cc59
check every enabled app if the remember login feature needs to be disabled
2013-09-26 19:34:28 +02:00
c486fc7608
introduce OC_Util::rememberLoginAllowed()
2013-09-24 18:01:34 +02:00
b693b5085c
don't remember login if the encrypion app is enabled because the user
...
needs to log-in again in order to decrypt his private key with his password
2013-09-24 13:08:55 +02:00
40871bab88
Merge pull request #4930 from owncloud/fix-apps-settings
...
Fix the apps enabling/disabling in settings
2013-09-24 01:02:50 -07:00
759f732aaa
Merge pull request #4917 from owncloud/scan-clear-permissions
...
clear permissions cache when scanning a file
2013-09-24 00:50:33 -07:00
2129974584
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
2013-09-24 00:59:23 +02:00
235517f111
clear permissions cache when scanning a file
2013-09-24 00:57:58 +02:00
bc1c6039b7
Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent
...
Fix not displaying "Upload something!" message
2013-09-23 13:09:47 -07:00
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
5d671a84b2
Merge pull request #4869 from owncloud/fixing-4866-master
...
recreate an etag within the scanner if the cache contains an empty etag
2013-09-23 07:13:12 -07:00
46f64cc39a
Merge pull request #4950 from owncloud/fix_preview_shared_folder
...
Fix preview for shared folder and public upload
2013-09-23 06:31:50 -07:00
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)
* owncloud/fix-link-expiration:
Perform expiration date checking before returning share data for token.
Tests whether expired/valid link share is still accessible.
2013-09-23 15:12:38 +02:00
d9a36ee82e
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
2013-09-23 12:45:02 +02:00
4a9f1cc74d
Merge remote-tracking branch 'owncloud/master' into fixing-4866-master
...
* owncloud/master: (98 commits)
[tx-robot] updated from transifex
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
setting a default on filecache column unencrypted_size
[tx-robot] updated from transifex
remove unneccessary lib in namespace
namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
initialize variable
calculate correct permissions while toggle the password protection
make sure that both $permissions and $oldPermissions have the same type
Add copyright, remove starting blank line
update inherit docs comment
Fix insert/update/delete helper functions for oracle
Add missing return true statements to legacy preferences functions
Add missing static
Convert OC_Preference to object interface
fix race condition in lazy preview loading
use {count} instead of 'One' for more versatile translation
fix double translation of error message
use n to translate title
fixing typos and l10n
...
Conflicts:
tests/lib/files/cache/scanner.php
2013-09-23 12:44:11 +02:00
8a1618bce5
implement previews for public upload
2013-09-23 12:27:05 +02:00
edd38e5948
fix previews in shared folders
2013-09-23 10:26:46 +02:00
9851f0f4f2
Merge pull request #4896 from owncloud/sharing_allow_disable_password
...
sharing, allow user to disable password protection
2013-09-23 01:20:09 -07:00
03eedb58fc
Merge pull request #4327 from owncloud/scanfile-remove
...
remove deleted files while scanning
2013-09-22 22:40:13 -07:00
811f680457
Merge pull request #4623 from owncloud/convert-oc_preferences
...
Convert OC_Preference to object interface
2013-09-22 10:45:56 -07:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
37bd489d2b
Merge pull request #4929 from owncloud/fixing-4416-master
...
Fixing 4416 master
2013-09-22 08:40:20 -07:00
a1be01c66f
Merge pull request #4938 from owncloud/scan-filter-outside-view
...
When filtering search results, ensure results are children of the...
2013-09-22 01:01:59 -07:00
a1d4eb1f95
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
2013-09-22 01:24:12 +02:00
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
2a17025d53
Move bool to int conversion to buildParts(), so it also happens for update().
2013-09-21 02:20:01 +02:00
de2e6e137b
Do not convert boolean to integer in tests. put() already does this.
2013-09-21 00:12:13 +02:00
011bca7b7f
Only update the etag. Do not re-submit any other unchanged data.
2013-09-20 23:53:02 +02:00
a2f82da572
Use update() instead of put().
2013-09-20 23:52:05 +02:00
3189ee2daf
setting a default on filecache column unencrypted_size
2013-09-20 20:47:24 +02:00
d84d548618
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
2013-09-20 20:34:17 +02:00
45a7b0dbac
Fix the apps enabling/disabling in settings
2013-09-20 20:29:15 +02:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
71e129f295
initialize variable
2013-09-20 15:47:33 +02:00
12b4e79201
calculate correct permissions while toggle the password protection
2013-09-20 13:11:05 +02:00
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
8e26f291a7
Merge pull request #4684 from owncloud/improved-console
...
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
f9549a4465
Merge pull request #4908 from owncloud/fix_css_selector
...
css selectors never have a : before []
2013-09-19 10:59:45 -07:00
a9ea99e93d
Add copyright, remove starting blank line
2013-09-19 19:12:16 +02:00
0a2a4cb12e
update inherit docs comment
2013-09-19 18:59:06 +02:00
55efe1e56c
Fix insert/update/delete helper functions for oracle
2013-09-19 18:13:39 +02:00
f6284bdce7
Add missing return true statements to legacy preferences functions
2013-09-19 18:13:06 +02:00
395cc737a1
Add missing static
2013-09-19 18:13:06 +02:00
445d34a2a9
Convert OC_Preference to object interface
2013-09-19 18:13:06 +02:00
09cfebe936
Merge pull request #4766 from owncloud/fix_3728_with_file_exists_dialog
...
file upload conflicts dialog
2013-09-19 08:23:07 -07:00
7e0631b3b8
Merge branch 'master' into fix_3728_with_file_exists_dialog
...
Conflicts:
apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
bd5cb1d801
Merge pull request #4900 from owncloud/fixing-4488-master
...
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
9f9eb1b08f
Merge pull request #4263 from owncloud/search_scrollto
...
initial scrollto implementation
2013-09-19 05:49:45 -07:00
98ff847830
fix race condition in lazy preview loading
2013-09-19 14:46:33 +02:00
Bjoern Schiessle
Thomas Müller
Andreas Fischer
Robin Appelman
kondou
Georg Ehrke
Björn Schießle
Bart Visscher
Morris Jobke
Jörn Friedrich Dreyer