fee3f80501
Merge pull request #1434 from owncloud/trashbin_CSRF
...
[files_trashbin] Add CSRF token
2013-02-04 02:14:52 -08:00
07a7478fde
PHPUnit support for Windows added
2013-02-04 10:15:00 +01:00
8add89ced1
OCP\JSON instead of OCP\User
2013-02-04 09:15:11 +01:00
04b97a1906
Merge pull request #1229 from owncloud/from_live_to_on
...
replace live() with on() in core js
2013-02-03 21:55:54 -08:00
5ceddabaa6
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
...
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
95fd2d8d1e
Merge pull request #1435 from owncloud/make_BlacklistConfigurable
...
Make file blacklist configurable
2013-02-03 19:05:31 -08:00
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
bb9be6f629
Add box-sizing to controls.
2013-02-04 00:24:34 +01:00
da6e79a381
[tx-robot] updated from transifex
2013-02-04 00:05:52 +01:00
80dd8d7802
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-03 23:34:27 +01:00
3def7f8187
Make fileblacklist configurable
2013-02-03 23:03:06 +01:00
018c5f69c0
[files_trashbin] Add CSRF token
2013-02-03 22:49:12 +01:00
bc886ac496
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-03 21:26:20 +01:00
bce59c3945
[user_webdavauth] add requesttoken
2013-02-03 19:58:55 +01:00
88ad1e5fbd
Make app icon linkable when enabling app.
2013-02-03 16:02:25 +01:00
1557b6d99d
Fix leftcontent positioning. Ref #1255
2013-02-03 14:44:33 +01:00
b8e6b8692b
fix CSS to coding guideline
2013-02-03 12:24:24 +01:00
3bcf3c91e1
Password Toggle Support for Login
2013-02-03 11:56:00 +01:00
d03155a8d5
translate the mimtype/mimepart to readable in the searchByMime function
2013-02-03 11:06:26 +01:00
a3b922763e
Merge pull request #1416 from herbrechtsmeier/set_include_path_early
...
initPaths: set include path before any owncloud function is called
2013-02-03 00:25:21 -08:00
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
6093d961a0
Add getOwner to Filesystem and View classes
2013-02-02 18:50:40 -05:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
42d59d5a16
Remove a warning by making sure the renamed file is a dir before trying and opening it
2013-02-02 23:18:29 +01:00
561e6c4c5b
Merge pull request #1419 from owncloud/etag_fix
...
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 12:06:48 -08:00
ed4130474a
Dav: update etag in filecache when doing a PROPSET
2013-02-02 18:26:27 +01:00
c61c98cbef
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 15:44:05 +01:00
37e6ac9a2a
initPaths: set include path before any owncloud function is called
...
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.
This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
7e3aa0de86
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-02 09:44:09 +01:00
23166aa016
Merge pull request #1415 from owncloud/ldap_fix_settings
...
LDAP settings Advanced tab has grown too long by far. Structure it using accordion.
2013-02-01 16:35:55 -08:00
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
10ad5f923a
remove ugly whitespace
2013-02-01 23:52:41 +01:00
a7d82ad0ee
LDAP: settings Advanced tab has grown too long by far. Structure it using accordion
2013-02-01 23:48:22 +01:00
d8f6595c5e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-02-01 23:28:20 +01:00
0677d56ee2
Added debugging output relating to recrypting legacy files
2013-02-01 19:31:15 +00:00
469b1e8dd2
Correct it
2013-02-01 20:29:02 +01:00
03c18a6186
Merge pull request #1413 from owncloud/enable_removing_search_providers
...
add function to remove a search provider
2013-02-01 10:34:39 -08:00
48022f4525
Merge pull request #1395 from raghunayyar/webkit-scrollbar-534
...
Adds webkit scrollbar to ownCloud
2013-02-01 10:26:23 -08:00
0c85250380
add function to remove a search provider
2013-02-01 19:21:54 +01:00
2488a495c6
Merge pull request #1384 from owncloud/upgrade_fix
...
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
88f4aced38
Merge pull request #1404 from owncloud/fixing-1276-master
...
fix #1276 - use registerLoadedCallback()
2013-02-01 03:13:23 -08:00
cc73568d68
Updateing -> Updating
2013-02-01 00:51:00 +01:00
fb0a5f3224
undelete -> restore
2013-02-01 00:43:52 +01:00
402263bd5c
fix #1276 - use registerLoadedCallback()
2013-02-01 00:33:14 +01:00
94f7446724
[tx-robot] updated from transifex
2013-02-01 00:19:28 +01:00
5dd2c9152e
fix breadcrumbs for gallery and texteditor
2013-02-01 00:14:39 +01:00
b20529ee44
Merge pull request #1171 from owncloud/move-datadirectory-checks
...
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
caec0c476d
Merge pull request #1287 from owncloud/ocs_xml_attributes
...
API: Treat array keys starting with '@' as XML attributes
2013-01-31 14:39:31 -08:00
a9e1c9bf6d
Merge pull request #1351 from owncloud/navigation
...
New navigation design
2013-01-31 14:37:39 -08:00
b1da1db0eb
Merge branch 'master' into from_live_to_on
...
Conflicts:
apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
Björn Schießle
Thomas Mueller
Lukas Reschke
Michael Gapczynski
Robin Appelman
Thomas Tanghus
TheSFReader
Jan-Christoph Borchardt
raghunayyar
herbrechtsmeier
Arthur Schiwon
Sam Tuke
Frank Karlitschek
Jörn Friedrich Dreyer
Bart Visscher