Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
tomneedham
0beaeed713
Remove unused variables
2014-02-18 16:28:04 +00:00
tomneedham
589a7b220b
Fix poor spelling
2014-02-18 16:23:16 +00:00
Robin Appelman
2166683e3b
Allow setting the frequency of which the file watcher checks for updates
2014-02-18 16:34:25 +01:00
Robin Appelman
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
Robin Appelman
ac2e3ab373
remove some unneeded isset's
2014-02-18 14:27:55 +01:00
Robin Appelman
2e97a4cd32
Fix some phpdoc
2014-02-18 14:26:27 +01:00
Lukas Reschke
c19cacb29f
Check whether the app is set
2014-02-18 14:12:49 +01:00
Lukas Reschke
1352c63dca
Check whether the Key is set
2014-02-18 12:47:05 +01:00
Lukas Reschke
dc6f1d875d
An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
...
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-18 12:32:57 +01:00
Robin Appelman
b6f44e9a1d
Add caching to OC\Preferences
2014-02-18 11:21:39 +01:00
Jan-Christoph Borchardt
dafa8fc37e
do not autocapitalize fields on mobile, fix user name input. Also disable autocorrect and specify autocomplete
2014-02-18 10:58:00 +01:00
Vincent Petry
58b1dc5e76
Added loading spinner to users list on scroll
2014-02-18 10:52:05 +01:00
Thomas Müller
92560c5b86
Merge pull request #7243 from owncloud/core-sessionlifetimedefault
...
Now using PHP session lifetime as default value for the JS config
2014-02-18 10:30:25 +01:00
Thomas Müller
5d3fc03750
Merge pull request #7239 from owncloud/cbr-filetype-icon
...
add cbr/cbz file type icon, fix #6953
2014-02-18 10:23:54 +01:00
Vincent Petry
f9763e1fc5
Now using PHP session lifetime as default value for the JS config
...
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
2014-02-17 21:33:04 +01:00
Jan-Christoph Borchardt
323cc1166b
Merge pull request #7235 from DavidVentura/master
...
small change for compatibility
2014-02-17 21:16:39 +01:00
icewind1991
617cbfed54
Merge pull request #7240 from owncloud/mimetype-fallback
...
use file icon as fallback instead of application icon, fix #7237
2014-02-17 21:06:15 +01:00
Vincent Petry
5a80339b51
Merge pull request #7211 from mattcaron/master
...
Fit shared videos to viewer, just like images. Issue #1648
2014-02-17 20:59:29 +01:00
Jörn Friedrich Dreyer
798dc2c39a
Merge pull request #7231 from owncloud/proper-content-type
...
Use the proper content-type
2014-02-17 20:58:52 +01:00
Jan-Christoph Borchardt
c2adf033f2
use file icon as fallback instead of application icon, fix #7237
2014-02-17 20:58:33 +01:00
Jörn Friedrich Dreyer
7e94d98b57
Merge pull request #7233 from owncloud/fix_5567
...
LDAP: improve wizard strings, fixes #5567
2014-02-17 20:57:56 +01:00
Jan-Christoph Borchardt
0f434038a7
add cbr/cbz file type icon, fix #6953
2014-02-17 20:48:32 +01:00
Vincent Petry
c732764eb5
Improve users list scrolling performance
...
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
the server side)
2014-02-17 19:32:45 +01:00
Matthew Caron
aa1a50f5b3
Consolidate two sections, per code review. Issue #1648
2014-02-17 12:57:54 -05:00
Vincent Petry
94b3296a71
Trashbin select all now doesn't send file list
...
- Fixed "delete" and "restore" actions to not send the file list when
all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
value based on the current dir
2014-02-17 18:34:59 +01:00
David
a282afcbbb
small change for compatibility
2014-02-17 13:27:07 -03:00
Arthur Schiwon
54f9db403f
LDAP: improve wizard strings, fixes #5567
2014-02-17 17:19:48 +01:00
Lukas Reschke
8a2cd0355d
Use the proper content-type
...
We should use the proper content-type `application/xml` instead of the default `text/html` here.
Backport requested.
2014-02-17 16:45:22 +01:00
Jan-Christoph Borchardt
84cd6e035e
Merge pull request #7132 from owncloud/issue/6920
...
Do not select input for all text input fields
2014-02-17 15:01:03 +01:00
Lukas Reschke
fe065f5114
Merge pull request #6892 from owncloud/issuetemplate-enhancements
...
Issue template enhancements
2014-02-17 14:59:00 +01:00
Vincent Petry
fe9c982081
Removed quota question
2014-02-17 14:34:15 +01:00
tomneedham
a4b6d66703
Merge branch 'master' into migration_unit_tests
2014-02-17 11:03:57 +00:00
tomneedham
049e03c2b9
Finish basic testing of user export
2014-02-17 10:58:27 +00:00
Björn Schießle
5a8d37023a
Merge pull request #7155 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling
2014-02-17 11:13:44 +01:00
Bjoern Schiessle
6778dc5a4a
don't block login forever if we are stuck in the middle of the initial encryption
2014-02-17 10:03:57 +01:00
Bjoern Schiessle
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
Bjoern Schiessle
2ab062193a
catch errors during initial encryption
2014-02-17 09:58:46 +01:00
Thomas Müller
750ffa8231
Merge pull request #7156 from owncloud/backgroundjob-public
...
Add the background job list to the public server container
2014-02-14 23:11:10 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Morris Jobke
df282d9ef8
Merge pull request #7207 from owncloud/fileinfo-serializable
...
Remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 22:11:54 +01:00
Matthew Caron
2887fb1f48
Fit shared videos to viewer, just like images. Issue #1648
2014-02-14 16:09:51 -05:00
Thomas Müller
41f0ad2d13
Merge pull request #7204 from owncloud/groupexists-duplicate
...
Remove duplicate call to groupExists
2014-02-14 21:53:03 +01:00
Robin Appelman
09502fcb36
remove the JsonSerializable interface from \OC\Files\FileInfo
2014-02-14 19:26:06 +01:00
blizzz
e2c0c0e256
Merge pull request #7206 from owncloud/fix_enc_tests
...
fileinfo is no longer a array
2014-02-14 19:09:46 +01:00
Bjoern Schiessle
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
Arthur Schiwon
d88c6778ff
LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons
2014-02-14 15:34:22 +01:00
icewind1991
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Robin Appelman
b35f679483
Fix test cases for group manager
2014-02-14 15:07:08 +01:00
Vincent Petry
d7f4547717
Merge pull request #6726 from owncloud/fix_6630
...
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00