Commit Graph

4456 Commits

Author SHA1 Message Date
Thomas Müller d42d88d391 Merge pull request #289 from zimba12/master
Move function that relativizes dates from Files app to core
2012-11-07 03:43:59 -08:00
Björn Schießle 12983cf0b0 urlencode file/dir to allow special characters in filename/path (issue #95) 2012-11-07 10:47:19 +01:00
Jenkins for ownCloud 3e01fe1dbb [tx-robot] updated from transifex 2012-11-07 00:02:51 +01:00
Arthur Schiwon 6339e71bdc LDAP: fix typo in config value handling. 2012-11-06 20:16:37 +01:00
Alessandro Cosentino 50dbb30eb9 Moved relative_modified_date from file/js to core/js 2012-11-06 10:56:42 -05:00
blizzz 64ac208fb2 Merge pull request #258 from wardragon/ldap_existence_check_no_refactor
LDAP: improved object existence check
2012-11-06 07:24:15 -08:00
Jenkins for ownCloud 4d052c1eee [tx-robot] updated from transifex 2012-11-06 00:01:40 +01:00
Thomas Müller b7e9d8d00e Merge pull request #267 from owncloud/improve_files_update
Improve performance of files update (on larger setups)
2012-11-05 14:06:07 -08:00
Arthur Schiwon 8b3ae4309b Fix mkdir and opendir warnings when path does not exist 2012-11-05 21:37:59 +01:00
Arthur Schiwon 85d6a08ae9 prepare SQL query only once, that's what prepared statements are for. Should improve upgrade time with larger setups 2012-11-05 20:47:26 +01:00
Georg Ehrke bb0164c9fc fix file delete in opera - fixes #188 2012-11-05 18:42:44 +01:00
Lorenzo M. Catucci ca24f4767b Return an empty array on succesful existence check 2012-11-05 17:35:09 +01:00
Robin Appelman 972243d564 support string values ('true' and 'false') for configuring the secure parameter on external storage backends
fixes #78
2012-11-05 16:39:03 +01:00
Lorenzo M. Catucci 510191db68 Return true or false from readAttribute if $attr is empty
This way, readAttribute can act as an existence checker.
2012-11-05 15:38:49 +01:00
Thomas Müller 5c72d28ffd Merge pull request #245 from owncloud/fileactions
some more reuse for fileactions
2012-11-05 05:52:52 -08:00
Frank Karlitschek 59381b90a0 Merge pull request #252 from owncloud/fix_user_webdavauth
Fix user webdavauth
2012-11-05 05:38:06 -08:00
Frank Karlitschek 6fba4ba87d fix the webdavauth app 2012-11-05 14:22:16 +01:00
Robin Appelman 34fee8afaa remove debug statements 2012-11-05 13:52:02 +01:00
Frank Karlitschek 01b0e9b133 fix the webdav user backend. still not completel working but a frist step 2012-11-05 10:46:28 +01:00
Thomas Müller 135680e50b Merge pull request #242 from fmms/checkstyle05
Checkstyle fixes
2012-11-05 01:34:11 -08:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Robin Appelman 4b940955dd merge master into filesystem 2012-11-04 21:12:18 +01:00
Robin Appelman 4f32f49fb1 this line shouldn't be here 2012-11-04 21:00:36 +01:00
Robin Appelman f187aa6c93 some more code reuse for fileactions
also fixes an issue where some fileactions always worked on the last file in the list
2012-11-04 20:48:38 +01:00
Arthur Schiwon 00bb246a0d merge from master 2012-11-04 19:58:48 +01:00
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Felix Moeller 0e70ea9d8b Checkstyle: Fix the last 25 NoSpaceAfterComma 2012-11-04 18:28:29 +01:00
Felix Moeller 1205749f8c Checkstyle: Fix the last two SpaceBeforeOpenBrace 2012-11-04 18:18:03 +01:00
Thomas Müller 8ac3849a95 Merge pull request #238 from fmms/checkstyle04
Checkstyle fixes
2012-11-04 08:59:45 -08:00
Lukas Reschke 80b9854710 Remove uneeded debug output 2012-11-04 14:26:45 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller f8d1d7787e Checkstyle fixes for SpaceBeforeOpenBrace 2012-11-04 10:46:32 +01:00
Jenkins for ownCloud 17d466b03b [tx-robot] updated from transifex 2012-11-04 00:01:42 +01:00
Jenkins for ownCloud 2f0fd84477 [tx-robot] updated from transifex 2012-11-03 00:02:24 +01:00
Robin Appelman 4a5a36577e merge master into filesystem 2012-11-02 21:42:29 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Arthur Schiwon df8c67721d code style 2012-11-02 09:42:10 +01:00
Lukas Reschke d9e9761099 Fix a typo 2012-11-02 00:16:40 +01:00
Lukas Reschke 0f02b7dea6 Add CSRF token 2012-11-02 00:09:28 +01:00
Jenkins for ownCloud 627509875e [tx-robot] updated from transifex 2012-11-02 00:04:59 +01:00
Jan-Christoph Borchardt e66482430e Files: change wording 'From url' to 'From link' 2012-11-01 18:09:16 +01:00
Arthur Schiwon 5252fc52ed LDAP: clear the cache not only when TTL changes, but with every settings update. Fixes #194 2012-11-01 16:48:17 +01:00
Robin Appelman 51ba12890d Merge branch 'master' into filesystem 2012-11-01 16:16:02 +01:00
Björn Schießle a9ce43de41 adapted comments to the code changes 2012-11-01 00:20:50 +01:00
Björn Schießle 3878950af4 load logging apps for webdav connections
Backport of de1b95c
2012-11-01 00:20:43 +01:00
Jenkins for ownCloud a327087c8b [tx-robot] updated from transifex 2012-11-01 00:02:14 +01:00
Jörn Friedrich Dreyer b76306c144 Merge pull request #155 from owncloud/token-expired-IE
Send the requesttoken as form value
2012-10-31 04:50:18 -07:00
Tom Needham 43917e187b External Share API: Move url down one level in response 2012-10-31 11:31:19 +00:00
Thomas Müller f851738169 Merge pull request #152 from scambra/webdav-quota
checking quota in webdav
2012-10-31 03:03:46 -07:00
Jenkins for ownCloud aca6d3252f [tx-robot] updated from transifex 2012-10-31 00:02:32 +01:00
Robin Appelman 6e9e263497 merge master into filesystem 2012-10-30 22:59:55 +01:00
Lukas Reschke 116fa64294 Change IE8 to "older IE versions"
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke ee1e4a7602 Send the requesttoken as form value
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.

Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
scambra d9c14292a4 fix checking quota in webdav, adding a sabredav plugin 2012-10-30 10:32:30 +01:00
Jenkins for ownCloud 56cf7660bd [tx-robot] updated from transifex 2012-10-30 00:01:50 +01:00
Lukas Reschke 2e1199acb8 Merge pull request #133 from fmms/checkstyle02
NoSpaceAfterComma -- checkstyle cleanup
2012-10-29 12:35:12 -07:00
blizzz 629d33967c Merge pull request #142 from denis-b/patch-2
fix moving (in) dirs containing "+"
2012-10-29 09:25:09 -07:00
denis-b 2aa5a185d4 Update apps/files/ajax/move.php
fix moving dirs containing "+"
2012-10-29 16:46:22 +01:00
denis-b b563935498 Update apps/files/index.php
fix dirnames containing "+" not displayed
2012-10-29 16:44:50 +01:00
Bart Visscher ccbf4e993c Use files remote webdav in compatibility files/webdav.php 2012-10-29 15:04:56 +01:00
Bart Visscher ab4ade0d24 Remove fixme, problem is solved already 2012-10-29 15:04:55 +01:00
Jenkins for ownCloud dbb4e74c79 [tx-robot] updated from transifex 2012-10-29 00:02:45 +01:00
Felix Moeller dfc8228fb4 NoSpaceAfterComma 2012-10-28 23:58:08 +01:00
Michael Gapczynski 60e5054ae8 Fix shared status icons 2012-10-28 16:02:05 -04:00
Robin Appelman 0fbb99690b properly replace fileaction icons with pngs when needed 2012-10-28 16:03:52 +01:00
Tom Needham 6675a46679 Fix url generated for public shared files 2012-10-28 15:03:21 +00:00
Georg Ehrke 4fd0514f0a don't move file into subdirectory if a file with the same name already exists (fixes #92) 2012-10-28 15:23:40 +01:00
Robin Appelman fe6b987b3d use css to show/hide fileactions 2012-10-28 12:47:42 +01:00
Robin Appelman d9ef6da2e4 code style 2012-10-28 12:47:42 +01:00
Tom Needham bcdf3a23db Merge master into ocs_api 2012-10-28 11:16:04 +00:00
Tom Needham b079447988 Add API method for sharing a file, currently only via a link. 2012-10-28 11:06:47 +00:00
Robin Appelman c4a793913c Merge branch 'master' into filesystem 2012-10-28 10:28:25 +01:00
Jenkins for ownCloud 1a08ef6a06 [tx-robot] updated from transifex 2012-10-28 00:02:29 +02:00
Arthur Schiwon 58828d205f LDAP: usersInGroup now also does LDAP serverside search. 2012-10-27 19:43:07 +02:00
Arthur Schiwon 3f85432df9 LDAP: make filter in readAttribute configurable 2012-10-27 19:43:07 +02:00
Robin Appelman c964fe9f8d merge master into filesystem 2012-10-27 18:11:52 +02:00
Björn Schießle 72aebe3aa3 fix broken paths in versions app 2012-10-27 18:08:00 +02:00
Björn Schießle 7891add286 don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning 2012-10-27 18:06:14 +02:00
Arthur Schiwon 1b2279c935 LDAP: getGroups to use paged searches 2012-10-27 17:46:01 +02:00
Arthur Schiwon 5b3c9518dc LDAP: improve slicing 2012-10-27 17:46:01 +02:00
Arthur Schiwon 33aa630af3 LDAP: add error handling for failed searches 2012-10-27 17:46:01 +02:00
Arthur Schiwon a053da58ce LDAP: be careful which limit is send to possible paged LDAP search 2012-10-27 17:46:01 +02:00
Arthur Schiwon 977c4d1844 LDAP: use the correct attribute in filter 2012-10-27 17:46:01 +02:00
Arthur Schiwon 246221a677 LDAP: fix again proper check if groups are enabled 2012-10-27 17:46:01 +02:00
Arthur Schiwon b942c1253e remove TODO comment, it's done 2012-10-27 17:46:01 +02:00
Bart Visscher d6953fa5ed Remove wrongly committed files 2012-10-27 17:45:15 +02:00
Björn Schießle f151376ad5 remove remaining line from merge conflict 2012-10-27 17:06:13 +02:00
Bart Visscher 894d44e796 Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git'
Conflicts:
	lib/base.php
2012-10-27 16:33:10 +02:00
Björn Schießle a93660d37a fix broken paths in versions app 2012-10-27 15:52:48 +02:00
Björn Schießle c1a0e809bf don't call $('#found_versions').chosen(); after opening the history drop-down since no version is selected at the beginning 2012-10-27 15:50:17 +02:00
Robin Appelman 8973124574 Merge branch 'master' into filesystem 2012-10-27 15:31:27 +02:00
Bart Visscher 939b51e46f Fix download url generation 2012-10-27 15:10:21 +02:00
Robin Appelman 38371d1275 Merge branch 'master' into filesystem 2012-10-27 14:28:24 +02:00
Robin Appelman 0fb707d2c9 some more porting of the sharing 2012-10-27 14:25:15 +02:00
Robin Appelman 86be7e8872 remove last uses of depricated OC_Filesystem 2012-10-27 12:23:13 +02:00
Arthur Schiwon 605281da9b LDAP: let result processing in Access::search slice the array for not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow. 2012-10-27 12:19:08 +02:00
Arthur Schiwon 67cd268df9 LDAP: debug messaged 2012-10-27 12:19:08 +02:00
Arthur Schiwon ee6fc22d4b LDAP: sourced out paged search init into initPagedSearch method, making search slicker again 2012-10-27 12:19:08 +02:00
Robin Appelman dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Bart Visscher 0120f3fd62 Merge branch 'routing'
Conflicts:
	core/lostpassword/index.php
	core/lostpassword/resetpassword.php
2012-10-27 11:58:02 +02:00
Robin Appelman cbc71784c0 Merge branch 'master' into filesystem 2012-10-27 10:02:26 +02:00
Jenkins for ownCloud 3bef19c623 [tx-robot] updated from transifex 2012-10-27 00:02:05 +02:00
Robin Appelman 6db81afab9 move some stuff to the new api 2012-10-26 23:05:02 +02:00
Robin Appelman 4b616764e8 Merge branch 'master' into filesystem 2012-10-26 22:32:44 +02:00
Arthur Schiwon 1313cad1b9 LDAP: let getUsers make use of paged search 2012-10-26 21:54:35 +02:00
Arthur Schiwon 84130b885f LDAP: add support for paged searches. 2012-10-26 21:54:34 +02:00
Arthur Schiwon fc446d0af4 LDAP: know, wether server supports paged search 2012-10-26 21:54:34 +02:00
Arthur Schiwon 3f78a8190f LDAP: check for resource before unbinding 2012-10-26 21:54:34 +02:00
Robin Appelman ad5957207d merge master into filesystem 2012-10-26 18:29:24 +02:00
Jan-Christoph Borchardt f477fda785 separate buttons for new file and upload 2012-10-26 18:16:42 +02:00
Robin Appelman 0e2bf8d373 Merge branch 'master' into filesystem 2012-10-26 10:42:41 +02:00
Jenkins for ownCloud c7d64811d6 [tx-robot] updated from transifex 2012-10-26 02:05:56 +02:00
Robin Appelman 7bc49d2a57 merge master into filesystem 2012-10-25 18:26:08 +02:00
Bart Visscher 43ac43d7af dir in newfile has to start with / 2012-10-25 08:37:13 +02:00
Jenkins for ownCloud 43bae1b473 [tx-robot] updated from transifex 2012-10-25 02:11:53 +02:00
Lukas Reschke 515e1b467e Merge pull request #81 from fmms/master
Codestyle add some needed spaces.
2012-10-24 10:16:32 -07:00
Lukas Reschke 7454186806 Forget to urlencode the path 2012-10-24 18:00:19 +02:00
Lukas Reschke ff6d2f16c4 urlencode 2012-10-24 17:58:52 +02:00
Lukas Reschke 694b1d397d Revert e1a4fe9890 2012-10-24 17:58:52 +02:00
Robin Appelman 5a3d6805a2 cleanup OC_Files a bit 2012-10-24 15:52:30 +02:00
Björn Schießle 07e08d5928 urldecode target directory 2012-10-24 15:37:51 +02:00
Robin Appelman 7b150dfa96 merge master into filesystem 2012-10-24 15:32:29 +02:00
Thomas Müller 41898a473e Apply coding style guide 2012-10-24 14:43:34 +03:00
Björn Schießle a9a27306de fix copy&paste bug from previous commit 2012-10-24 13:11:29 +02:00
Björn Schießle 1d200c554f Shared files are not stored in the file cache. Therefore we need to
use the share table from the db to find the item source if the public
link re-shares a already shared file.
2012-10-24 13:11:29 +02:00
Lukas Reschke 916e0fc343 Place the brackets in the first line 2012-10-24 13:09:09 +02:00
Thomas Müller 4c234bd666 Apply coding style guide
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
Björn Schießle 070fe02448 calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem. 2012-10-24 10:06:00 +02:00
Lukas Reschke a7eb56c799 Merge pull request #76 from fmms/master
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
Jenkins for ownCloud f33af71eb0 [tx-robot] updated from transifex 2012-10-24 02:08:34 +02:00
Arthur Schiwon c443993fc2 LDAP: properly check if Groups-feature is enabled 2012-10-24 00:23:31 +02:00
Lukas Reschke f112d8cd69 Merge pull request #75 from fmms/master
More Checkstyle cleanup
2012-10-23 15:07:14 -07:00
Lukas Reschke dfecdb9700 Remove uneeded vendor prefixes 2012-10-24 00:00:33 +02:00
Lukas Reschke f363bde121 Format the CSS in a readable way 2012-10-23 23:57:55 +02:00
Felix Moeller 561cbb2de6 NoSpaceAfterComma II 2012-10-23 23:01:10 +02:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Lukas Reschke e1a4fe9890 Fix urlencoding in the breadcrumb 2012-10-23 17:50:36 +02:00
Lukas Reschke 73f85c3b81 Merge pull request #62 from fmms/master
More Checkstyle warnings
2012-10-23 08:07:01 -07:00
Robin Appelman 7424f3aef6 merge master into filesystem 2012-10-23 16:16:46 +02:00
icewind1991 ab944094e2 Merge pull request #12 from scambra/fixes
check free space using folder's owner
2012-10-23 07:02:21 -07:00
icewind1991 fbe059afd3 Merge pull request #59 from fmms/master
Starting point to take care of Checkstyle warnings
2012-10-23 06:58:15 -07:00
Arthur Schiwon 6a2a915559 Files: urldecode urlencoded dir names, fixes oc-2111 2012-10-23 13:50:24 +02:00
Felix Moeller 36d0d75901 Codestyle: FunctionCallArgumentSpacing 2012-10-23 08:35:54 +02:00
Felix Moeller 2d61f03452 More Checkstyle cleanup
This is for all LowerCaseConstant warnings
2012-10-23 08:01:09 +02:00
Jenkins for ownCloud bc2a648f2d [tx-robot] updated from transifex 2012-10-23 02:06:03 +02:00
Felix Moeller 6a00a6b9ed Make Jenkins more happy.
This is NoSpaceAfterComma
2012-10-23 00:28:12 +02:00
Arthur Schiwon 78a1b987bb LDAP: fix db update for Postgres 2012-10-23 00:18:43 +02:00
Arthur Schiwon b879cd709e LDAP: fix cache save and check, fixes oc-2118 2012-10-22 22:46:28 +02:00
Felix Moeller 03581ef463 Correct a first issue Checkstyle is complaining about ...
This is BracketsNotRequired
2012-10-22 21:40:33 +02:00
Jenkins for ownCloud d8e945466d [tx-robot] updated from transifex 2012-10-22 02:06:18 +02:00
Robin Appelman 33cabcf590 postpone the cost of setting up some of the external storage backends untill we actually need it 2012-10-21 22:04:45 +02:00
Robin Appelman 5217ca219a Merge branch 'master' into filesystem 2012-10-21 15:16:23 +02:00
Jenkins for ownCloud 16c4eb66d7 [tx-robot] updated from transifex 2012-10-21 02:06:44 +02:00
Robin Appelman 6f1fbf97f7 some namespaces fixed for the shared backend 2012-10-21 00:27:55 +02:00
Robin Appelman cfa036eaa9 drop filectime from the filesystem api's 2012-10-20 23:58:07 +02:00
Robin Appelman f7722abcb0 Merge branch 'master' into filesystem 2012-10-20 23:50:14 +02:00
Jenkins for ownCloud cfbd310d34 [tx-robot] updated from transifex 2012-10-20 02:03:53 +02:00
Jenkins for ownCloud f5043c0661 [tx-robot] updated from transifex 2012-10-19 02:08:00 +02:00
Robin Appelman 9712a78559 merge master into filesystem 2012-10-18 23:24:28 +02:00
Arthur Schiwon 81cf726b18 unset UserID after Update 2012-10-18 18:45:03 +02:00
Thomas Müller e4c0bb59e5 Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
2012-10-18 08:09:58 -07:00
Jörn Friedrich Dreyer e307bf31c8 fix oc-605 2012-10-18 14:19:34 +02:00
Jenkins for ownCloud 519a0ae4ab [tx-robot] updated from transifex 2012-10-18 02:09:32 +02:00
Thomas Müller 9f01cd05fb Merge pull request #37 from scambra/js-interpolation-l10n
use interpolation for some translations in js
2012-10-17 13:28:46 -07:00
Sam Tuke 265f3654af all unit files_encryption crypt unit tests now passing after merge 2012-10-17 16:35:19 +01:00
Bart Visscher 6081bfa2bc Merge branch 'master' into routing
Conflicts:
	lib/search/provider/file.php
	settings/ajax/changepassword.php
	settings/settings.php
2012-10-17 16:38:11 +02:00
Susinthiran Sithamparanathan b2b84f3a6f Update Sabre to version 1.7.1 2012-10-17 16:17:36 +02:00
Robin Appelman 77cef5f514 merge master into filesystem 2012-10-17 13:14:17 +02:00
Jenkins for ownCloud fd6adc7d08 [tx-robot] updated from transifex 2012-10-16 23:39:13 +02:00
scambra c814a7a841 use interpolation for some translations in js 2012-10-16 20:53:31 +02:00
scambra 5ecce8bfb7 Translate modification date when file is created/uploaded, use same strings as lib/template.php 2012-10-16 20:25:11 +02:00
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Sam Tuke 06ea9c18f8 Development snapshot
Stream reading and writing of small and large files working, using write cache
2012-10-16 15:02:51 +01:00
Björn Schießle b08a1696f5 normalize path to avoid problems with trailing slashes, double-slashes, etc. 2012-10-16 12:48:56 +02:00
Jenkins for ownCloud c3823aa864 [tx-robot] updated from transifex 2012-10-16 02:08:21 +02:00
Arthur Schiwon 24ad6b5a62 LDAP: fix retrieval of Quota and Email 2012-10-15 18:47:28 +02:00
Arthur Schiwon 5708488b3e make files_versions use OC_User::getHome, fixes 'PHP Warning: Missing argument 1 for OC_FilesystemView::getAbsolutePath' with custom user home dirs 2012-10-15 18:16:27 +02:00
Arthur Schiwon 800fd5fd79 LDAP: check if index is set, fix Notices 2012-10-15 17:17:37 +02:00
Jenkins for ownCloud cf7df2db7a [tx-robot] updated from transifex 2012-10-15 02:09:11 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Jenkins for ownCloud c88cf5cae5 [tx-robot] updated from transifex 2012-10-14 02:08:47 +02:00
Robin Appelman 11e9ce25e6 merge master into filesystem 2012-10-13 04:29:20 +02:00
Jenkins for ownCloud d386bc8737 [tx-robot] updated from transifex 2012-10-13 02:08:50 +02:00
Robin Appelman 5b2f3c7f72 fix blocking drag & drop upload of folders 2012-10-12 15:30:16 +02:00
Robin Appelman c099545b6d don't throw errors if certificate folder doesn't exist 2012-10-12 14:52:22 +02:00
Lukas Reschke e5f2d46c6f Sanitize user input 2012-10-12 14:10:05 +02:00
Lukas Reschke e45f36c2d4 Sanitize user input 2012-10-12 14:09:58 +02:00
Jenkins for ownCloud b761143047 [tx-robot] updated from transifex 2012-10-12 02:07:10 +02:00
Robin Appelman 141ff806c6 fix namespace problems for external storage backends 2012-10-11 23:17:59 +02:00
Robin Appelman 542869114a implement getId for the external storage providers 2012-10-11 23:06:57 +02:00
Robin Appelman fb2d2bc201 merge master into filesystem 2012-10-11 22:54:39 +02:00
Robin Appelman 92ddefe5a6 fix filetype for smb storage backend 2012-10-11 22:18:34 +02:00
Robin Appelman 5698c8519a fix webdav storage backend when trying to open a non existing file for reading 2012-10-11 22:18:34 +02:00
Robin Appelman 5256301a53 skip the files_external test cases the correct way 2012-10-11 22:18:34 +02:00
Benjamin Liles 8336b3287e Various bug fixes for swift 2012-10-11 08:52:21 -05:00
Björn Schießle 77d91d5a03 generate correct link for shared files and shared directories 2012-10-11 13:45:16 +02:00
Jenkins for ownCloud 673e3dae3f [tx-robot] updated from transifex 2012-10-11 02:07:32 +02:00
Sam Tuke 4da67b0a08 Development snapshot; encryption stream wrapper now successfully writes files, and passes unit tests 2012-10-10 18:40:59 +01:00
Robin Appelman 5c6e9518ed drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath 2012-10-10 17:46:29 +02:00
Björn Schießle 41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Björn Schießle 4a712bdd48 only check if #dropdown hasClass drop-versions if a drop down is open. Otherwise it will never open the history drop-down 2012-10-10 13:46:51 +02:00
Robin Appelman aaa1b73364 don't use depricated OC_Filesystem 2012-10-10 13:18:36 +02:00
Björn Schießle 33dcb3b1f4 fix missing dir creation for file versions (OC_Filesystemview::mkdir doesn't work here because it doesn't create directories recursively) 2012-10-10 11:49:16 +02:00
Robin Appelman 13e7e82d19 merge master into filesystem 2012-10-10 11:30:44 +02:00
Thomas Müller 29fa9dfb79 Merge pull request #25 from visit1985/uploadfilesize
fixed max possible upload size for files app in admin screen
2012-10-10 00:41:19 -07:00
Jenkins for ownCloud fce6ce9bc6 [tx-robot] updated from transifex 2012-10-10 02:09:28 +02:00
Michael Gapczynski 4e6f720f14 Fix closing the sharing dropdown by clicking on the share button 2012-10-09 19:23:44 +02:00
Björn Schießle 293484d1ee add directory while creating mount point 2012-10-09 15:18:21 +02:00
VicDeo f29f1cad1d Prevent Versions click handler from closing sharing dropdown 2012-10-09 13:00:33 +03:00
Jenkins for ownCloud f1fc73ea5b [tx-robot] updated from transifex 2012-10-09 02:07:41 +02:00
Björn Schießle 32e2d7ef8f check if ID was assigned 2012-10-08 17:47:02 +02:00
Björn Schießle 277dd2b0a9 remove debug output 2012-10-08 17:32:04 +02:00
Björn Schießle 2923d24921 add data-id directly after upload/creation to the file list (bugfix for #1917) 2012-10-08 17:30:35 +02:00
Robin Appelman c815fd5a5c fix files_external test cases 2012-10-08 14:31:13 +02:00
Robin Appelman e7899e17de merge phpunit into filesystem 2012-10-08 13:53:53 +02:00
Björn Schießle 4dba91838f add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views. 2012-10-08 10:28:29 +02:00
Jenkins for ownCloud b934668b9e [tx-robot] updated from transifex 2012-10-08 02:07:01 +02:00
Michael Gapczynski 995b8bf12a Remove old Shared folders from the file cache, fixes bug oc-1911 2012-10-07 17:34:21 -04:00
Michael Gapczynski 4b446f3edd Revert part of 5beca59b, fixes file upload bug oc-1926 2012-10-07 17:17:37 -04:00
Jenkins for ownCloud e36317c21a [tx-robot] updated from transifex 2012-10-07 02:08:12 +02:00
Michael Göhler 7f2208b9a1 fixed max possible upload size for files app in admin screen
used get_cfg_var() to get the real limit from php.ini instead of .ht_access
dont know why we used PHP_INT_MAX here...
2012-10-07 00:31:07 +02:00
Robin Appelman a203a4a1c7 add support to mount a specific folder from dropbox 2012-10-06 13:44:53 +02:00
Robin Appelman 54695b11eb test case for dropbox storage 2012-10-06 13:43:34 +02:00
Jenkins for ownCloud 35c5f71989 [tx-robot] updated from transifex 2012-10-06 02:06:49 +02:00
Arthur Schiwon 68bb3809c7 LDAP: we're good for 0.3 now. No code change 2012-10-06 00:38:10 +02:00
Björn Schießle 4f7c7c615e prevent xss attacks 2012-10-05 17:05:23 +02:00
Björn Schießle 5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle c99f62891a breadcrumbs fixed for public share view 2012-10-05 15:06:59 +02:00
Björn Schießle 0d081ac5ac register download action for directories 2012-10-05 14:28:23 +02:00
Björn Schießle ef8a4a1629 register download action for files 2012-10-05 14:28:23 +02:00
Björn Schießle 99f4d949c1 fix download link for single files in publicly shared directory 2012-10-05 14:28:23 +02:00
Björn Schießle 72a48ca35e fix download of single publically shared files. 2012-10-05 12:01:18 +02:00
Björn Schießle dcad7aec82 fixed download of complete publically shared folder 2012-10-05 11:38:00 +02:00
Björn Schießle f4136854b6 stripsplashes doesn't work if the slash is the only character -> creating file in root dir leads to "//filename" 2012-10-05 11:15:32 +02:00
Björn Schießle a611ce4f33 baseDir has to be the whole path to work with shared directories below the root directory. 2012-10-05 10:32:38 +02:00
Björn Schießle b88a61c633 no content area, it overlaps the file list 2012-10-05 10:32:38 +02:00
Björn Schießle 5beca59b9c check if element really exists before calling it. (e.g. for public shared files view, elements like "navigation" doesn't exist) 2012-10-05 10:32:38 +02:00
Jenkins for ownCloud 4fd53eca06 [tx-robot] updated from transifex 2012-10-05 02:06:09 +02:00
Jenkins for ownCloud 5c042d88ad [tx-robot] updated from transifex 2012-10-04 02:07:35 +02:00
Michael Gapczynski 51321526e2 Prevent displaying errors if public link url parameters are incorrect 2012-10-03 16:14:54 -04:00
Jenkins for ownCloud 6fada7a4c0 [tx-robot] updated from transifex 2012-10-03 02:05:14 +02:00
Robin Appelman ac44506b40 Merge branch 'master' into filesystem 2012-10-02 23:29:13 +02:00
Jenkins for ownCloud 32a6b3b862 [tx-robot] updated from transifex 2012-10-02 23:18:26 +02:00
Thomas Mueller 7abe1360b2 l18n support added to files_external/js 2012-10-02 23:09:28 +02:00
Björn Schießle 92b37119e3 remove textbox after pressing "enter" even if the name is the same 2012-10-02 18:38:17 +02:00
Jörn Friedrich Dreyer 39735721ec escape identifiers in queries 2012-10-02 14:11:25 +02:00
Frank Karlitschek 3fdebaa5dc automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
Björn Schießle 550813ce41 don't use the complete path but the basename if the file/foder has no extension. Otherwise
we can end up with  different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
Jenkins for ownCloud f0c4356392 [tx-robot] updated from transifex 2012-10-02 02:06:08 +02:00
Lukas Reschke 538c2662a9 Merge pull request #23 from lipemat/patch-1
Fix the File Upload Button in Chrome
Arrow was showing under the button in Chrome. With this commit it should be shown correctly.
2012-10-01 10:28:51 -07:00
Arthur Schiwon 33e9399ba3 LDAP: fix sharing doesn't work with ldap groups, oc-1819 2012-10-01 18:27:58 +02:00
Arthur Schiwon b23ad579dc Sharing: backward compatibility to links from OC 4.0. 2012-10-01 14:39:53 +02:00
Robin Appelman b7eb3f3dff merge master into filesystem 2012-10-01 14:21:49 +02:00
Mat Lipe d1010e58d8 Update apps/files/css/files.css
Fixed a strange comment issue
2012-10-01 06:43:31 -05:00
Mat Lipe 2330dd5f21 Update apps/files/css/files.css
Fix the File Upload Button in Chrome. Tested in IE9-8-7, Firefox, Chrome
2012-09-30 20:02:52 -05:00
Jenkins for ownCloud 377fb19818 [tx-robot] updated from transifex 2012-10-01 02:08:31 +02:00
Jenkins for ownCloud 27bd9df027 [tx-robot] updated from transifex 2012-09-28 23:36:09 +02:00
Bart Visscher 22d22d19c0 Do urlencoding in linkTo functions 2012-09-28 22:27:52 +02:00
Bart Visscher dbdf3bde7c Implement route for download in OC_Search_Provider_File 2012-09-28 22:20:17 +02:00
Bart Visscher c9317b5a68 Merge branch 'master' into routing 2012-09-28 21:41:21 +02:00
Bart Visscher 4e2f575938 Correctly fix oc-1016 and fix downloading of files 2012-09-28 21:18:20 +02:00
Bart Visscher bf1057143c Merge branch 'master' into routing
Conflicts:
	apps/files/js/filelist.js
	core/js/js.js
	lib/ocs.php
2012-09-28 15:38:49 +02:00
Jenkins for ownCloud 5144d26088 [tx-robot] updated from transifex 2012-09-28 02:06:03 +02:00
Lukas Reschke 232936b99a This .gitkeep is unneeded 2012-09-27 22:24:56 +02:00
Arthur Schiwon 3fa4b34a69 LDAP: comparison, not assignment. Thanks to Manuel Delgado 2012-09-27 19:52:52 +02:00
Björn Schießle aa9ffd119a check if file really exist before add/remove it 2012-09-27 12:37:23 +02:00
Björn Schießle a56f2ec183 only upload valid ssl root certificates 2012-09-27 11:21:29 +02:00
Jenkins for ownCloud 09aa95586a [tx-robot] updated from transifex 2012-09-27 02:03:09 +02:00
Björn Schießle 21c6cc45e6 take '\' on windows systems into account to prevent file deletion above upload direectory 2012-09-26 23:08:40 +02:00
Björn Schießle 9ab887fed5 fix security issue, don't allow to go back in the path 2012-09-26 21:35:14 +02:00
Robin Appelman 88bca9bc49 Merge branch 'master' into filesystem 2012-09-26 17:52:28 +02:00
Robin Appelman cfbca40fbe fix sharing for newly uploaded or created files 2012-09-26 13:25:11 +02:00
Jenkins for ownCloud 2c00f8c850 [tx-robot] updated from transifex 2012-09-26 13:22:37 +02:00
Arthur Schiwon 0192d920f0 Sharing: write update errors to logfile; do not die on errors 2012-09-26 12:27:43 +02:00
Björn Schießle fcd70246db Merge branch 'master' of github.com:owncloud/core 2012-09-26 10:50:06 +02:00
Björn Schießle c3c6e52104 - take webdav namespace for properties into account
- change update routine to add the namesapce to all stored properties
2012-09-26 10:48:30 +02:00
Jenkins for ownCloud 5855355faa [tx-robot] updated from transifex 2012-09-26 02:06:37 +02:00
Arthur Schiwon 7b8c7aaf0d Add missing Sharing permission 2012-09-25 18:01:56 +02:00
Arthur Schiwon 80fde2d8d1 Sharing update: take over reshares and thus don't fail 2012-09-25 12:14:20 +02:00
Björn Schießle 25499644e3 Merge branch 'master' of github.com:owncloud/core 2012-09-25 12:02:02 +02:00
Björn Schießle 90a1bd5721 seperate the form to set up the mount points and the form to upload ssl certificates 2012-09-25 12:01:09 +02:00
Arthur Schiwon 15e02726d7 Fix files_sharing update script, by making filesystem and users available 2012-09-25 11:47:53 +02:00
Jenkins for ownCloud e5487376da [tx-robot] updated from transifex 2012-09-25 02:05:18 +02:00
Brice Maron 7aca730f71 Small css fix for button new in files. fix oc-1638 2012-09-24 18:40:59 +00:00
Jenkins for ownCloud ecb90d72f3 [tx-robot] updated from transifex 2012-09-24 02:04:10 +02:00
Robin Appelman 4d2669f6b3 Merge branch 'master' into filesystem 2012-09-23 14:56:58 +02:00
Robin Appelman a22a5d6807 some js style fixes 2012-09-23 03:16:52 +02:00
Robin Appelman eed1ccd164 Merge branch 'master' into filesystem 2012-09-23 02:41:31 +02:00
Jenkins for ownCloud 81ecabb19c [tx-robot] updated from transifex 2012-09-23 02:04:41 +02:00
Robin Appelman f360d7c736 add getId to shared storage backend 2012-09-23 01:51:00 +02:00
Robin Appelman 96b798a59f move storage backend test cases to their own namespace 2012-09-22 14:51:15 +02:00
Robin Appelman 93292516d9 Merge branch 'master' into filesystem 2012-09-22 14:28:14 +02:00
Lukas Reschke b4de89e6b4 Sanitize download URL
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
Jenkins for ownCloud 08132587d1 [tx-robot] updated from transifex 2012-09-22 02:01:19 +02:00
Jenkins for ownCloud 01160d0fb4 [tx-robot] updated from transifex 2012-09-22 01:18:31 +02:00
Thomas Müller d5055639b2 Merge pull request #15 from scambra/delete-fixes
use post to delete files, get has a limit and fails with many files
2012-09-21 16:11:11 -07:00
Thomas Müller ac69974d73 Merge pull request #17 from scambra/4.5-l10n-fixes
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
Bart Visscher 8cfa618df5 Catch exceptions in upgrading files_sharing, skip the errors for now 2012-09-21 23:31:44 +02:00
Bart Visscher 11bdc8baa8 Fix the mimetype filter in OC_Share_Backend_File 2012-09-21 23:17:12 +02:00
Bart Visscher ee77ef86d3 Check mimetype filter in file share backend 2012-09-21 21:32:09 +02:00
Björn Schießle 3d2cd64a48 add a line break after every certificate 2012-09-21 16:54:08 +02:00
Tom Needham bcd3d1116c Change background colour of upload button to be consistant with new button 2012-09-21 12:45:11 +00:00
Arthur Schiwon 2a7a928ae9 LDAP: replace expensive recursiveArraySearch with direct SQL search, leading to a performance boost. Imorives UX especially on directories with tons of users, solves complains on ML and probably fixes oc.1080 2012-09-21 13:03:28 +02:00
scambra 107b641708 translate rename and history actions 2012-09-21 12:30:13 +02:00
scambra 22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Jenkins for ownCloud 8f2c76d3da [tx-robot] updated from transifex 2012-09-21 02:04:56 +02:00
Arthur Schiwon 57c02d16ca LDAP: add forgotten class, fixes oc-1803 2012-09-20 16:59:28 +02:00
Frank Karlitschek 6c644a0c83 change the new button color on mouse over so that the user understands that the button is actually two buttons. 2012-09-20 14:59:28 +02:00
icewind1991 4ea128ee43 Merge pull request #13 from scambra/safari-fixes
fix js success callback on safari when uploading files
2012-09-20 02:24:27 -07:00
scambra 1b411df83e use post to delete files, get has a limit and fails with many files 2012-09-20 08:28:35 +02:00
scambra aee8949c92 fix js success callback on safari when uploading files 2012-09-20 08:02:55 +02:00
Jenkins for ownCloud 7c42e88676 [tx-robot] updated from transifex 2012-09-20 02:09:31 +02:00
Bernhard Posselt 1c643ce4bc made upload button the same height in chrome and firefox
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
Tom Needham f9127192da Fix styling of public shared files download button 2012-09-19 19:51:52 +00:00
Tom Needham d7b878b303 Dynamicly resize public shared images 2012-09-19 19:46:49 +00:00
scambra 2b5133a1c4 check free space using folder's owner 2012-09-19 21:31:29 +02:00
Bart Visscher 5f997021d1 Fix syntax bug 2012-09-19 21:29:16 +02:00
Bart Visscher ee32d1aad5 Fix versioning of shared files 2012-09-19 21:29:16 +02:00
Bart Visscher 01ce2babd1 Fix sharing of single files, target name was not correct 2012-09-19 21:29:16 +02:00
Arthur Schiwon f66c441f77 LDAP: take out ldapUuidAttribute from on-the-fly check, cannot be set by the user and would lead to server error. Fixes oc-1625 2012-09-19 15:37:05 +02:00
Tom Needham 73ed13fe75 Increase click area of breadcrumb, fix oc-703 2012-09-19 12:31:02 +00:00
Björn Schießle 223bf3e47c fix for bug #1752 (Renaming of folders in files view does not work correctly in firefox 15) 2012-09-19 14:05:09 +02:00
Björn Schießle c199c4ad67 Merge branch 'master' of github.com:owncloud/core 2012-09-19 12:03:58 +02:00
Björn Schießle 6596094a28 add generated unique file name to the uploadingFiles list instead of the original name 2012-09-19 12:02:36 +02:00
Björn Schießle 1e880feab1 execute lastAction() before add new one 2012-09-19 11:56:31 +02:00
Michael Gapczynski 39e587b52c Remove the content and table to prevent covering the download link 2012-09-19 00:27:53 -04:00
Michael Gapczynski 749b5b52ca Show preview for public folder links 2012-09-18 23:56:14 -04:00
Jenkins for ownCloud b0e645fe13 [tx-robot] updated from transifex 2012-09-19 02:07:26 +02:00
Tom Needham 8a74a39c42 Fix oc-1769, renaming folders with extensions 2012-09-18 22:08:34 +00:00
Björn Schießle 842cd57fa7 use more oc file operations instead of plain PHP functions 2012-09-18 17:04:22 +02:00
Jenkins for ownCloud 06e963c54f [tx-robot] updated from transifex 2012-09-18 02:04:26 +02:00
Arthur Schiwon 6444c27e6a LDAP: fix MySQL-query with DUAL table by removing wrong backticks. Got broke when they were added to SQL queries. 2012-09-17 22:50:08 +02:00
Bart Visscher b04c7175dc Check if the versioned file exists before trying to do the versioning
This didn't work with chunked uploading
2012-09-17 20:00:31 +02:00
Tom Needham 597fed4fde Fix oc-1726, cannot delete multiple files one by one without refresh 2012-09-17 15:29:15 +00:00
Thomas Müller 21bffbfb69 Enhanced space handling - thx fmms 2012-09-17 11:14:44 +03:00
Thomas Müller 7a7d2a06b3 Adding a few more string to translation 2012-09-17 10:54:06 +03:00
Jenkins for ownCloud dbd2dea689 [tx-robot] updated from transifex 2012-09-17 02:07:23 +02:00
Michael Gapczynski 89fb5d47a4 Add chosen script and style, bug fix for oc-1745 2012-09-16 13:27:27 -04:00
Frank Karlitschek f17555285e Merge branch 'master' of https://github.com/owncloud/core 2012-09-16 17:14:04 +02:00
Frank Karlitschek 9d533fcd72 add a legend tag. it´s consistent and looks nicer 2012-09-16 17:13:16 +02:00
Robin Appelman 7da3492ab5 show the size of new files when using New->From Url 2012-09-16 17:05:08 +02:00
Jenkins for ownCloud 6568671bdc [tx-robot] updated from transifex 2012-09-16 02:03:40 +02:00
Jenkins for ownCloud fbdefd5601 [tx-robot] updated from transifex 2012-09-15 02:05:52 +02:00
Jenkins for ownCloud e41ccd4344 [tx-robot] updated from transifex 2012-09-14 02:03:18 +02:00
Michael Gapczynski f8d907df71 Set configured to true after configuring Dropbox storage 2012-09-12 21:30:04 -04:00
Jenkins for ownCloud bb0b438ace [tx-robot] updated from transifex 2012-09-13 02:03:54 +02:00
Bart Visscher 10b74f9d05 Don't hide errors doing the versioning copy 2012-09-13 00:09:00 +02:00
Michael Gapczynski 87b7a23648 Don't get metadata directly from the 'cached' file cache after upload 2012-09-12 17:00:46 -04:00
Sam Tuke 9bfdf47cd4 Fixed bug oc-1659 - history dialogue cannot be closed once opened 2012-09-12 14:10:12 +01:00
Jenkins for ownCloud 8c9c095d48 [tx-robot] updated from transifex 2012-09-12 02:02:58 +02:00
Sam Tuke ed980674a6 Development snapshot 2012-09-11 13:40:45 +01:00
Michael Gapczynski ff6141b1e9 Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again 2012-09-10 21:57:13 -04:00
Jenkins for ownCloud 6a29bbda7a [tx-robot] updated from transifex 2012-09-11 02:03:53 +02:00
Jenkins for ownCloud bd720bdf4c [tx-robot] updated from transifex 2012-09-10 02:04:59 +02:00
Michael Gapczynski deb1fbf9a1 Provide update script for files sharing 2012-09-09 18:29:47 -04:00
Michael Gapczynski 5c5955b31f Disable link sharing for folders temporarily - next release 2012-09-09 14:52:03 -04:00
Michael Gapczynski b163bd514f Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder 2012-09-08 23:09:57 -04:00
Robin Appelman a050915167 move breadcrumb css to core so we can reuse it 2012-09-09 03:00:01 +02:00
Jenkins for ownCloud 5e790368bc [tx-robot] updated from transifex 2012-09-09 02:03:35 +02:00
Jenkins for ownCloud d5d2e89622 [tx-robot] updated from transifex 2012-09-08 02:05:41 +02:00
Robin Appelman bd83422095 put filestorages in a namespace 2012-09-07 18:30:48 +02:00
Bart Visscher 5eba579827 Merge branch 'master' into routing
Conflicts:
	apps/files/js/fileactions.js
	lib/base.php
	lib/helper.php
	lib/ocs.php
2012-09-07 15:51:44 +02:00
Thomas Mueller 3829460ab8 adding space between) and { 2012-09-07 15:22:01 +02:00
Bart Visscher 785aa751bb Whitespace fixes 2012-09-07 14:10:43 +02:00
Bart Visscher 285c198c36 EOL fixes
apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
2012-09-07 14:10:00 +02:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Michael Gapczynski 17dadd5c8a Don't show the delete all action if delete permission is not granted 2012-09-07 00:02:22 -04:00
Jenkins for ownCloud a94b56b57b [tx-robot] updated from transifex 2012-09-07 02:07:22 +02:00
Michael Gapczynski d936590f77 Don't pass content for a new text file from UI, fixes bug oc-1660 2012-09-06 16:01:51 -04:00
Michael Gapczynski 837eb1871d Don't delete the file anymore to replace it in the UI, just overwrite it 2012-09-05 22:13:50 -04:00
Michael Gapczynski a5211e31bc Add permissions to new files/folders, bug fix for oc-1649 2012-09-05 21:47:09 -04:00
Jenkins for ownCloud af3e767489 [tx-robot] updated from transifex 2012-09-06 02:06:37 +02:00
Thomas Mueller ebb28412ca no more require_once() 2012-09-05 23:28:59 +02:00
Bart Visscher 9329af921d Add missing ; to js code 2012-09-05 22:26:09 +02:00
Robin Appelman aa8cee1afa I don't think this file was meant to be commited 2012-09-05 19:42:26 +02:00
Michael Gapczynski a26ea6d65c Implement support for replacing files during upload with the actions: replace, suggest name, and cancel 2012-09-05 00:12:25 -04:00
Jenkins for ownCloud e8fcc71129 [tx-robot] updated from transifex 2012-09-05 02:05:39 +02:00
Thomas Mueller 02f9de55a3 add translation string 2012-09-04 23:42:49 +02:00
Bart Visscher f188f6cc2f Fix some jslint warnings 2012-09-04 21:27:37 +02:00
Georg Ehrke 745f279fbc make use of OC_User::getHome in files_external app 2012-09-04 15:56:00 +02:00
Jenkins for ownCloud b867b738e8 [tx-robot] updated from transifex 2012-09-04 02:03:21 +02:00
Bart Visscher 5153b8b293 Add url-params to url with new parameter in linkTo function 2012-09-03 21:51:32 +02:00
Michael Gapczynski c6858fb5ca Add additional html tags to public links template for previewers 2012-09-03 13:14:23 -04:00
Jenkins for ownCloud d386e0172a [tx-robot] updated from transifex 2012-09-03 02:07:40 +02:00
Jenkins for ownCloud 2bb7cb9f64 [tx-robot] updated from transifex 2012-09-02 02:02:53 +02:00
Michael Gapczynski 29d1e8087d Implement generateTarget for file sharing backend 2012-09-01 13:46:57 -04:00
Jenkins for ownCloud c0c48cb3ee [tx-robot] updated from transifex 2012-09-01 13:37:28 +02:00
Thomas Mueller 10bd64debd translation support enhanced 2012-09-01 13:23:37 +02:00
Jenkins for ownCloud ab090d5277 [tx-robot] updated from transifex 2012-09-01 02:04:00 +02:00
Jenkins for ownCloud 75cd7eacf8 [tx-robot] updated from transifex 2012-08-31 02:07:19 +02:00
Jörn Friedrich Dreyer 73d0a2b8f7 use OC.PERMISSION_X to filter selected drag'n'drop elements 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer ca8120e9f4 unify permissions (3/3): remove old PERMISSION_X from FileActions & OC.Share 2012-08-31 01:11:10 +02:00
Jörn Friedrich Dreyer 3ba27e624f unify permissions (2/3): change apps to use OC::PERMISSION_X 2012-08-31 01:11:10 +02:00
Thomas Mueller 077e988136 oc-1548: prevent user from leaving the page while a file upload is in progress 2012-08-31 00:45:03 +02:00
Jörn Friedrich Dreyer 26ef012418 use permissions to quickfix drag selections 2012-08-31 00:13:02 +02:00
Bart Visscher b483f2aab8 Merge branch 'master' into routing
Conflicts:
	apps/contacts/js/contacts.js
	apps/contacts/lib/search.php
	apps/files_archive/js/archive.js
	apps/gallery/lib/tiles.php
	apps/gallery/templates/index.php
	lib/ocs.php
2012-08-30 21:49:28 +02:00
Arthur Schiwon 7027742bd6 LDAP settings, add missing p tags 2012-08-30 15:06:33 +02:00
Arthur Schiwon 1a6f34865c LDAP: on upgrade update user cols in database only when necessary 2012-08-30 15:03:02 +02:00
Arthur Schiwon 2440e500b8 LDAP: on upgrade set homeDirs of users where it is not set. Avoids new folders (empty), depending on the configuration 2012-08-30 14:55:07 +02:00
Michael Gapczynski f2534e7428 Show notification that no preview is available if no previewer is found for a public link to a file 2012-08-29 21:12:23 -04:00
Michael Gapczynski 756b514fee Check if file source exists before searching for link 2012-08-29 21:12:23 -04:00
Jenkins for ownCloud 898ca364a2 [tx-robot] updated from transifex 2012-08-30 02:06:45 +02:00
Bart Visscher c958d5ba80 Fix filesystem setup for shared public link with logged in user 2012-08-29 21:35:55 +02:00
Michael Gapczynski 8d490b9880 Fix shared storage working with user backend defined data directories 2012-08-29 14:39:13 -04:00
Bart Visscher db18218a1b Space before tab fixes 2012-08-29 20:34:44 +02:00
Bart Visscher 0365f8fd01 Remove php close at end of file 2012-08-29 20:29:43 +02:00
Bart Visscher 0e58800016 Whitespace fixes in apps 2012-08-29 20:29:43 +02:00
Bart Visscher cbaf858dea Merge remote-tracking branch 'gitorious/master' into routing
Conflicts:
	apps/files/js/fileactions.js
	apps/files_archive/js/archive.js
2012-08-29 20:16:39 +02:00
Arthur Schiwon 224e55e590 LDAP: fix debug message with undefined variable 2012-08-29 19:37:18 +02:00
Arthur Schiwon 741a21292e LDAP: fix potential infinite loop introduced with 4c4aa92eef, as side effect optimize groupExists-method. 2012-08-29 19:37:18 +02:00
Arthur Schiwon 8be8f6fff2 LDAP: Remove unnecessary debug output, fixes a Notice 2012-08-29 19:37:18 +02:00
Michael Gapczynski e5cbc532c3 Fix password authentication for links and fix template problems for links by creating a new base layout 2012-08-29 11:54:49 -04:00
Jenkins for ownCloud 9338d093f9 [tx-robot] updated from transifex 2012-08-29 02:06:48 +02:00
Thomas Mueller b64229a89e apply coding style 2012-08-29 01:39:42 +02:00
Arthur Schiwon 4c4aa92eef LDAP: check for existing username from other backends when creating one for an LDAP user or group. Led also to some code cleanup. Fixes oc-1551 in master. 2012-08-29 01:23:51 +02:00
Thomas Mueller fe49cbafc7 apply coding style 2012-08-29 00:50:12 +02:00
Thomas Mueller f301bfd8c9 apply coding style 2012-08-29 00:36:27 +02:00
Michael Gapczynski da44e5405a Fix typo 2012-08-28 11:12:18 -04:00
Michael Gapczynski c53310e49b Remove unnecessary ajax file from files_sharing 2012-08-28 09:57:09 -04:00
Michael Gapczynski 1e2ba8398d Remove old database xml file for files_sharing, bump version number 2012-08-28 09:55:24 -04:00
Michael Gapczynski 0a1f24142a Change public file from get.php to public.php 2012-08-28 09:53:31 -04:00
Arthur Schiwon 42a9969304 LDAP: implement getHome() function, use either username (default) or specify an LDAP attribute value to use 2012-08-28 14:24:50 +02:00
Frank Karlitschek 549f69cbc1 marked as shipped app 2012-08-28 07:35:31 +02:00
Michael Gapczynski 9cd55508c3 Add Share API settings to admin page 2012-08-27 20:39:31 -04:00
Michael Gapczynski 0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00
Jenkins for ownCloud 8374a49cc1 [tx-robot] updated from transifex 2012-08-28 02:03:56 +02:00
Jan-Christoph Borchardt 6b5f1ffdb4 upload button improvement, better separation, fix wrap issue 2012-08-27 14:05:18 -07:00
Frank Karlitschek c2290a542e add deprecated warning 2012-08-27 22:58:50 +02:00
Arthur Schiwon 5985d00c6f LDAP: transliterate other latin characters to ASCII when creating owncloud names. Already created usernames are not being affected. 2012-08-27 21:32:56 +02:00
Georg Ehrke ead7de6bff only mount every single homefolder when using sharing app 2012-08-27 16:10:37 +02:00
Jenkins for ownCloud c33a2ca01d [tx-robot] updated from transifex 2012-08-27 02:02:37 +02:00
Jenkins for ownCloud faf702b9e6 [tx-robot] updated from transifex 2012-08-26 19:47:33 +02:00
Frank Karlitschek 184438224c restore the webdavauth app 2012-08-26 17:51:01 +02:00
Frank Karlitschek 72e9a2ce57 moved to apps repository 2012-08-26 17:30:07 +02:00
Lukas Reschke 32bad688bd Wrong function
https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
2012-08-26 17:22:41 +02:00
Lukas Reschke 2028c81161 OC_Util is better thank OCP\JSON because it'll redirect the user to the index.php instead of displaying an error 2012-08-26 16:08:58 +02:00
Lukas Reschke 4885a52ba4 Check if app is enabled 2012-08-26 16:05:40 +02:00
Lukas Reschke bcd86bfd02 Remove some empty lines 2012-08-26 15:43:34 +02:00
Lukas Reschke 726be04e5f Use sanitizeHTML instead of strip_tags 2012-08-26 15:41:41 +02:00
Jenkins for ownCloud 922982f070 [tx-robot] updated from transifex 2012-08-26 02:22:02 +02:00
Thomas Mueller ad66d6d5e9 translation support for pdfviewer 2012-08-26 02:17:28 +02:00
Thomas Mueller 8e090d8f67 added translation for odfviewer 2012-08-26 02:17:28 +02:00
Jenkins for ownCloud a1a3862274 [tx-robot] updated from transifex 2012-08-26 02:02:48 +02:00
Jenkins for ownCloud bae07faa34 [tx-robot] updated from transifex 2012-08-26 01:20:16 +02:00
Thomas Mueller 814cb6bbfa translation support for text editor and impress added 2012-08-26 00:39:23 +02:00
Jenkins for ownCloud c82518cb0e [tx-robot] updated from transifex 2012-08-26 00:12:05 +02:00
Jörn Friedrich Dreyer 4f5eff2b6f Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 03:14:26 +02:00
jfd dc3bec6211 OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files 2012-08-25 03:13:59 +02:00
jfd e8ffd5c042 use limit parameter instead of LIMIT SQL for vcard 2012-08-25 02:27:43 +02:00
Jenkins for ownCloud f57d527a7c [tx-robot] updated from transifex 2012-08-25 02:08:36 +02:00
Jörn Friedrich Dreyer fa3497f6ed add backticks to SQL, use limit parameter instead of LIMIT SQL 2012-08-25 01:52:27 +02:00
Jörn Friedrich Dreyer fd5af9aff4 Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support 2012-08-25 00:06:20 +02:00
Jörn Friedrich Dreyer c8255a170c Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
Conflicts:
	3rdparty/Sabre/CardDAV/Plugin.php
	3rdparty/smb4php/smb.php
	apps/bookmarks/ajax/addBookmark.php
	apps/bookmarks/ajax/editBookmark.php
	apps/bookmarks/appinfo/migrate.php
	apps/calendar/ajax/calendar/edit.form.php
	apps/calendar/ajax/changeview.php
	apps/calendar/ajax/import/import.php
	apps/calendar/ajax/settings/guesstimezone.php
	apps/calendar/ajax/settings/setfirstday.php
	apps/calendar/ajax/settings/settimeformat.php
	apps/calendar/ajax/share/changepermission.php
	apps/calendar/ajax/share/share.php
	apps/calendar/ajax/share/unshare.php
	apps/calendar/appinfo/app.php
	apps/calendar/appinfo/remote.php
	apps/calendar/appinfo/update.php
	apps/calendar/appinfo/version
	apps/calendar/js/calendar.js
	apps/calendar/l10n/da.php
	apps/calendar/l10n/de.php
	apps/calendar/l10n/fi_FI.php
	apps/calendar/l10n/gl.php
	apps/calendar/l10n/he.php
	apps/calendar/l10n/hr.php
	apps/calendar/l10n/ja_JP.php
	apps/calendar/l10n/lb.php
	apps/calendar/l10n/lt_LT.php
	apps/calendar/l10n/nb_NO.php
	apps/calendar/l10n/pl.php
	apps/calendar/l10n/pt_PT.php
	apps/calendar/l10n/ro.php
	apps/calendar/l10n/ru.php
	apps/calendar/l10n/sv.php
	apps/calendar/l10n/zh_CN.php
	apps/calendar/l10n/zh_TW.php
	apps/calendar/lib/app.php
	apps/calendar/lib/calendar.php
	apps/calendar/lib/object.php
	apps/calendar/lib/share.php
	apps/calendar/templates/part.choosecalendar.rowfields.php
	apps/calendar/templates/part.import.php
	apps/calendar/templates/settings.php
	apps/contacts/ajax/activation.php
	apps/contacts/ajax/addressbook/delete.php
	apps/contacts/ajax/contact/add.php
	apps/contacts/ajax/contact/addproperty.php
	apps/contacts/ajax/contact/delete.php
	apps/contacts/ajax/contact/deleteproperty.php
	apps/contacts/ajax/contact/saveproperty.php
	apps/contacts/ajax/createaddressbook.php
	apps/contacts/ajax/cropphoto.php
	apps/contacts/ajax/currentphoto.php
	apps/contacts/ajax/importaddressbook.php
	apps/contacts/ajax/oc_photo.php
	apps/contacts/ajax/savecrop.php
	apps/contacts/ajax/selectaddressbook.php
	apps/contacts/ajax/updateaddressbook.php
	apps/contacts/ajax/uploadimport.php
	apps/contacts/ajax/uploadphoto.php
	apps/contacts/appinfo/migrate.php
	apps/contacts/appinfo/remote.php
	apps/contacts/css/contacts.css
	apps/contacts/import.php
	apps/contacts/index.php
	apps/contacts/js/contacts.js
	apps/contacts/l10n/ca.php
	apps/contacts/l10n/cs_CZ.php
	apps/contacts/l10n/da.php
	apps/contacts/l10n/de.php
	apps/contacts/l10n/el.php
	apps/contacts/l10n/eo.php
	apps/contacts/l10n/es.php
	apps/contacts/l10n/et_EE.php
	apps/contacts/l10n/eu.php
	apps/contacts/l10n/fa.php
	apps/contacts/l10n/fi_FI.php
	apps/contacts/l10n/fr.php
	apps/contacts/l10n/he.php
	apps/contacts/l10n/hr.php
	apps/contacts/l10n/hu_HU.php
	apps/contacts/l10n/ia.php
	apps/contacts/l10n/it.php
	apps/contacts/l10n/ja_JP.php
	apps/contacts/l10n/ko.php
	apps/contacts/l10n/lb.php
	apps/contacts/l10n/mk.php
	apps/contacts/l10n/nb_NO.php
	apps/contacts/l10n/nl.php
	apps/contacts/l10n/pl.php
	apps/contacts/l10n/pt_BR.php
	apps/contacts/l10n/pt_PT.php
	apps/contacts/l10n/ro.php
	apps/contacts/l10n/ru.php
	apps/contacts/l10n/sk_SK.php
	apps/contacts/l10n/sl.php
	apps/contacts/l10n/sv.php
	apps/contacts/l10n/th_TH.php
	apps/contacts/l10n/tr.php
	apps/contacts/l10n/zh_CN.php
	apps/contacts/l10n/zh_TW.php
	apps/contacts/lib/addressbook.php
	apps/contacts/lib/hooks.php
	apps/contacts/lib/vcard.php
	apps/contacts/photo.php
	apps/contacts/templates/part.contact.php
	apps/contacts/templates/part.contacts.php
	apps/contacts/templates/part.cropphoto.php
	apps/contacts/templates/part.importaddressbook.php
	apps/contacts/templates/part.selectaddressbook.php
	apps/contacts/thumbnail.php
	apps/files/ajax/download.php
	apps/files/ajax/newfile.php
	apps/files/ajax/timezone.php
	apps/files/appinfo/update.php
	apps/files/appinfo/version
	apps/files/index.php
	apps/files/js/fileactions.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/l10n/ar.php
	apps/files/l10n/bg_BG.php
	apps/files/l10n/ca.php
	apps/files/l10n/cs_CZ.php
	apps/files/l10n/da.php
	apps/files/l10n/de.php
	apps/files/l10n/el.php
	apps/files/l10n/eo.php
	apps/files/l10n/es.php
	apps/files/l10n/et_EE.php
	apps/files/l10n/eu.php
	apps/files/l10n/fa.php
	apps/files/l10n/fi_FI.php
	apps/files/l10n/fr.php
	apps/files/l10n/gl.php
	apps/files/l10n/he.php
	apps/files/l10n/hr.php
	apps/files/l10n/hu_HU.php
	apps/files/l10n/ia.php
	apps/files/l10n/id.php
	apps/files/l10n/it.php
	apps/files/l10n/ja_JP.php
	apps/files/l10n/ko.php
	apps/files/l10n/lb.php
	apps/files/l10n/lt_LT.php
	apps/files/l10n/mk.php
	apps/files/l10n/ms_MY.php
	apps/files/l10n/nb_NO.php
	apps/files/l10n/nl.php
	apps/files/l10n/nn_NO.php
	apps/files/l10n/pl.php
	apps/files/l10n/pt_BR.php
	apps/files/l10n/pt_PT.php
	apps/files/l10n/ro.php
	apps/files/l10n/ru.php
	apps/files/l10n/sk_SK.php
	apps/files/l10n/sl.php
	apps/files/l10n/sr.php
	apps/files/l10n/sr@latin.php
	apps/files/l10n/sv.php
	apps/files/l10n/th_TH.php
	apps/files/l10n/tr.php
	apps/files/l10n/uk.php
	apps/files/l10n/zh_CN.php
	apps/files/l10n/zh_TW.php
	apps/files_archive/js/archive.js
	apps/files_encryption/lib/cryptstream.php
	apps/files_encryption/lib/proxy.php
	apps/files_encryption/tests/proxy.php
	apps/files_external/appinfo/app.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/streamwrapper.php
	apps/files_external/tests/config.php
	apps/files_external/tests/smb.php
	apps/files_sharing/ajax/email.php
	apps/files_sharing/ajax/getitem.php
	apps/files_sharing/ajax/setpermissions.php
	apps/files_sharing/ajax/share.php
	apps/files_sharing/ajax/toggleresharing.php
	apps/files_sharing/ajax/unshare.php
	apps/files_sharing/ajax/userautocomplete.php
	apps/files_sharing/js/settings.js
	apps/files_sharing/js/share.js
	apps/files_sharing/lib_share.php
	apps/files_sharing/settings.php
	apps/files_sharing/sharedstorage.php
	apps/files_sharing/templates/settings.php
	apps/files_versions/ajax/rollbackVersion.php
	apps/files_versions/versions.php
	apps/gallery/ajax/thumbnail.php
	apps/gallery/appinfo/app.php
	apps/gallery/appinfo/update.php
	apps/gallery/appinfo/version
	apps/gallery/css/styles.css
	apps/gallery/index.php
	apps/gallery/js/pictures.js
	apps/gallery/l10n/ca.php
	apps/gallery/l10n/cs_CZ.php
	apps/gallery/l10n/de.php
	apps/gallery/l10n/el.php
	apps/gallery/l10n/es.php
	apps/gallery/l10n/fi_FI.php
	apps/gallery/l10n/fr.php
	apps/gallery/l10n/it.php
	apps/gallery/l10n/pl.php
	apps/gallery/l10n/pt_PT.php
	apps/gallery/l10n/ru.php
	apps/gallery/l10n/sl.php
	apps/gallery/l10n/sv.php
	apps/gallery/l10n/th_TH.php
	apps/gallery/l10n/tr.php
	apps/gallery/l10n/zh_CN.php
	apps/gallery/lib/album.php
	apps/gallery/lib/hooks_handlers.php
	apps/gallery/lib/managers.php
	apps/gallery/lib/photo.php
	apps/gallery/lib/tiles.php
	apps/gallery/lib/tiles_test.php
	apps/gallery/templates/index.php
	apps/media/lib_ampache.php
	apps/media/lib_collection.php
	apps/media/lib_media.php
	apps/remoteStorage/lib_remoteStorage.php
	apps/tasks/ajax/addtaskform.php
	apps/tasks/ajax/edittask.php
	apps/user_ldap/appinfo/update.php
	apps/user_ldap/group_ldap.php
	apps/user_ldap/lib_ldap.php
	apps/user_ldap/settings.php
	apps/user_ldap/templates/settings.php
	apps/user_ldap/user_ldap.php
	apps/user_migrate/appinfo/app.php
	apps/user_migrate/templates/settings.php
	apps/user_webfinger/host-meta.php
	config/config.sample.php
	core/js/js.js
	core/l10n/da.php
	core/l10n/de.php
	core/l10n/fi_FI.php
	core/l10n/gl.php
	core/l10n/he.php
	core/l10n/hr.php
	core/l10n/id.php
	core/l10n/ja_JP.php
	core/l10n/lb.php
	core/l10n/lt_LT.php
	core/l10n/nb_NO.php
	core/l10n/pl.php
	core/l10n/pt_PT.php
	core/l10n/ro.php
	core/l10n/ru.php
	core/l10n/sv.php
	core/lostpassword/index.php
	core/templates/layout.user.php
	core/templates/login.php
	db_structure.xml
	index.php
	l10n/af/calendar.po
	l10n/af/contacts.po
	l10n/af/core.po
	l10n/af/files.po
	l10n/af/settings.po
	l10n/ar/calendar.po
	l10n/ar/contacts.po
	l10n/ar/core.po
	l10n/ar/files.po
	l10n/ar/media.po
	l10n/ar/settings.po
	l10n/bg_BG/calendar.po
	l10n/bg_BG/contacts.po
	l10n/bg_BG/core.po
	l10n/bg_BG/files.po
	l10n/bg_BG/media.po
	l10n/bg_BG/settings.po
	l10n/ca/calendar.po
	l10n/ca/contacts.po
	l10n/ca/core.po
	l10n/ca/files.po
	l10n/ca/gallery.po
	l10n/ca/settings.po
	l10n/cs_CZ/calendar.po
	l10n/cs_CZ/contacts.po
	l10n/cs_CZ/core.po
	l10n/cs_CZ/files.po
	l10n/cs_CZ/gallery.po
	l10n/cs_CZ/settings.po
	l10n/da/calendar.po
	l10n/da/contacts.po
	l10n/da/core.po
	l10n/da/files.po
	l10n/da/settings.po
	l10n/de/calendar.po
	l10n/de/contacts.po
	l10n/de/core.po
	l10n/de/files.po
	l10n/de/gallery.po
	l10n/de/settings.po
	l10n/el/calendar.po
	l10n/el/contacts.po
	l10n/el/core.po
	l10n/el/files.po
	l10n/el/gallery.po
	l10n/el/settings.po
	l10n/eo/calendar.po
	l10n/eo/contacts.po
	l10n/eo/core.po
	l10n/eo/files.po
	l10n/eo/media.po
	l10n/eo/settings.po
	l10n/es/calendar.po
	l10n/es/contacts.po
	l10n/es/core.po
	l10n/es/files.po
	l10n/es/gallery.po
	l10n/es/settings.po
	l10n/et_EE/calendar.po
	l10n/et_EE/contacts.po
	l10n/et_EE/core.po
	l10n/et_EE/files.po
	l10n/et_EE/settings.po
	l10n/eu/calendar.po
	l10n/eu/contacts.po
	l10n/eu/core.po
	l10n/eu/files.po
	l10n/eu/settings.po
	l10n/fa/calendar.po
	l10n/fa/contacts.po
	l10n/fa/core.po
	l10n/fa/files.po
	l10n/fa/settings.po
	l10n/fi_FI/calendar.po
	l10n/fi_FI/contacts.po
	l10n/fi_FI/core.po
	l10n/fi_FI/files.po
	l10n/fi_FI/gallery.po
	l10n/fi_FI/settings.po
	l10n/fr/calendar.po
	l10n/fr/contacts.po
	l10n/fr/core.po
	l10n/fr/files.po
	l10n/fr/gallery.po
	l10n/fr/media.po
	l10n/fr/settings.po
	l10n/gl/calendar.po
	l10n/gl/contacts.po
	l10n/gl/core.po
	l10n/gl/files.po
	l10n/gl/settings.po
	l10n/he/calendar.po
	l10n/he/contacts.po
	l10n/he/core.po
	l10n/he/files.po
	l10n/he/settings.po
	l10n/hr/calendar.po
	l10n/hr/contacts.po
	l10n/hr/core.po
	l10n/hr/files.po
	l10n/hr/settings.po
	l10n/hu_HU/calendar.po
	l10n/hu_HU/contacts.po
	l10n/hu_HU/core.po
	l10n/hu_HU/files.po
	l10n/hu_HU/settings.po
	l10n/hy/calendar.po
	l10n/hy/contacts.po
	l10n/hy/core.po
	l10n/hy/files.po
	l10n/hy/settings.po
	l10n/ia/calendar.po
	l10n/ia/contacts.po
	l10n/ia/core.po
	l10n/ia/files.po
	l10n/ia/settings.po
	l10n/id/calendar.po
	l10n/id/contacts.po
	l10n/id/core.po
	l10n/id/files.po
	l10n/id/settings.po
	l10n/it/calendar.po
	l10n/it/contacts.po
	l10n/it/core.po
	l10n/it/files.po
	l10n/it/gallery.po
	l10n/it/settings.po
	l10n/ja_JP/calendar.po
	l10n/ja_JP/contacts.po
	l10n/ja_JP/core.po
	l10n/ja_JP/files.po
	l10n/ja_JP/settings.po
	l10n/ko/calendar.po
	l10n/ko/contacts.po
	l10n/ko/core.po
	l10n/ko/files.po
	l10n/ko/settings.po
	l10n/lb/calendar.po
	l10n/lb/contacts.po
	l10n/lb/core.po
	l10n/lb/files.po
	l10n/lb/settings.po
	l10n/lt_LT/calendar.po
	l10n/lt_LT/contacts.po
	l10n/lt_LT/core.po
	l10n/lt_LT/files.po
	l10n/lt_LT/settings.po
	l10n/mk/calendar.po
	l10n/mk/contacts.po
	l10n/mk/core.po
	l10n/mk/files.po
	l10n/mk/settings.po
	l10n/ms_MY/calendar.po
	l10n/ms_MY/contacts.po
	l10n/ms_MY/core.po
	l10n/ms_MY/files.po
	l10n/ms_MY/settings.po
	l10n/nb_NO/calendar.po
	l10n/nb_NO/contacts.po
	l10n/nb_NO/core.po
	l10n/nb_NO/files.po
	l10n/nb_NO/settings.po
	l10n/nl/calendar.po
	l10n/nl/contacts.po
	l10n/nl/core.po
	l10n/nl/files.po
	l10n/nl/settings.po
	l10n/nn_NO/calendar.po
	l10n/nn_NO/contacts.po
	l10n/nn_NO/core.po
	l10n/nn_NO/files.po
	l10n/nn_NO/settings.po
	l10n/pl/calendar.po
	l10n/pl/contacts.po
	l10n/pl/core.po
	l10n/pl/files.po
	l10n/pl/gallery.po
	l10n/pl/settings.po
	l10n/pt_BR/calendar.po
	l10n/pt_BR/contacts.po
	l10n/pt_BR/core.po
	l10n/pt_BR/files.po
	l10n/pt_BR/settings.po
	l10n/pt_PT/calendar.po
	l10n/pt_PT/contacts.po
	l10n/pt_PT/core.po
	l10n/pt_PT/files.po
	l10n/pt_PT/gallery.po
	l10n/pt_PT/settings.po
	l10n/ro/calendar.po
	l10n/ro/contacts.po
	l10n/ro/core.po
	l10n/ro/files.po
	l10n/ro/settings.po
	l10n/ru/calendar.po
	l10n/ru/contacts.po
	l10n/ru/core.po
	l10n/ru/files.po
	l10n/ru/gallery.po
	l10n/ru/settings.po
	l10n/sk_SK/calendar.po
	l10n/sk_SK/contacts.po
	l10n/sk_SK/core.po
	l10n/sk_SK/files.po
	l10n/sk_SK/settings.po
	l10n/sl/calendar.po
	l10n/sl/contacts.po
	l10n/sl/core.po
	l10n/sl/files.po
	l10n/sl/gallery.po
	l10n/sl/settings.po
	l10n/sr/calendar.po
	l10n/sr/contacts.po
	l10n/sr/core.po
	l10n/sr/files.po
	l10n/sr/settings.po
	l10n/sr@latin/calendar.po
	l10n/sr@latin/contacts.po
	l10n/sr@latin/core.po
	l10n/sr@latin/files.po
	l10n/sr@latin/settings.po
	l10n/sv/calendar.po
	l10n/sv/contacts.po
	l10n/sv/core.po
	l10n/sv/files.po
	l10n/sv/gallery.po
	l10n/sv/media.po
	l10n/sv/settings.po
	l10n/templates/bookmarks.pot
	l10n/templates/calendar.pot
	l10n/templates/contacts.pot
	l10n/templates/core.pot
	l10n/templates/files.pot
	l10n/templates/gallery.pot
	l10n/templates/media.pot
	l10n/templates/settings.pot
	l10n/th_TH/calendar.po
	l10n/th_TH/contacts.po
	l10n/th_TH/core.po
	l10n/th_TH/files.po
	l10n/th_TH/gallery.po
	l10n/th_TH/settings.po
	l10n/tr/calendar.po
	l10n/tr/contacts.po
	l10n/tr/core.po
	l10n/tr/files.po
	l10n/tr/gallery.po
	l10n/tr/settings.po
	l10n/uk/calendar.po
	l10n/uk/contacts.po
	l10n/uk/core.po
	l10n/uk/files.po
	l10n/uk/media.po
	l10n/uk/settings.po
	l10n/zh_CN/calendar.po
	l10n/zh_CN/contacts.po
	l10n/zh_CN/core.po
	l10n/zh_CN/files.po
	l10n/zh_CN/gallery.po
	l10n/zh_CN/settings.po
	l10n/zh_TW/calendar.po
	l10n/zh_TW/contacts.po
	l10n/zh_TW/core.po
	l10n/zh_TW/files.po
	l10n/zh_TW/settings.po
	lib/app.php
	lib/base.php
	lib/connector/sabre/file.php
	lib/connector/sabre/locks.php
	lib/connector/sabre/node.php
	lib/db.php
	lib/filecache.php
	lib/fileproxy/quota.php
	lib/files.php
	lib/filestorage/local.php
	lib/filesystemview.php
	lib/group/database.php
	lib/helper.php
	lib/installer.php
	lib/json.php
	lib/l10n.php
	lib/migrate.php
	lib/mimetypes.fixlist.php
	lib/ocs.php
	lib/preferences.php
	lib/public/json.php
	lib/public/util.php
	lib/template.php
	lib/user.php
	lib/user/database.php
	lib/util.php
	lib/vcategories.php
	ocs/providers.php
	settings/admin.php
	settings/ajax/lostpassword.php
	settings/ajax/removeuser.php
	settings/ajax/setbackgroundjobsmode.php
	settings/ajax/setlanguage.php
	settings/ajax/setquota.php
	settings/ajax/togglegroups.php
	settings/apps.php
	settings/css/settings.css
	settings/js/apps.js
	settings/js/users.js
	settings/l10n/bg_BG.php
	settings/l10n/ca.php
	settings/l10n/cs_CZ.php
	settings/l10n/da.php
	settings/l10n/de.php
	settings/l10n/el.php
	settings/l10n/eo.php
	settings/l10n/es.php
	settings/l10n/et_EE.php
	settings/l10n/eu.php
	settings/l10n/fa.php
	settings/l10n/fi_FI.php
	settings/l10n/fr.php
	settings/l10n/gl.php
	settings/l10n/he.php
	settings/l10n/hr.php
	settings/l10n/hu_HU.php
	settings/l10n/it.php
	settings/l10n/ja_JP.php
	settings/l10n/ko.php
	settings/l10n/lt_LT.php
	settings/l10n/mk.php
	settings/l10n/ms_MY.php
	settings/l10n/nb_NO.php
	settings/l10n/nl.php
	settings/l10n/nn_NO.php
	settings/l10n/pl.php
	settings/l10n/pt_BR.php
	settings/l10n/pt_PT.php
	settings/l10n/ru.php
	settings/l10n/sk_SK.php
	settings/l10n/sl.php
	settings/l10n/sv.php
	settings/l10n/th_TH.php
	settings/l10n/tr.php
	settings/l10n/zh_CN.php
	settings/personal.php
	settings/templates/admin.php
	settings/templates/users.php
2012-08-25 00:05:07 +02:00
Michael Gapczynski 0c4575db7a Temporary fix to prevent rename action in root of Shared directory 2012-08-24 15:12:16 -04:00
Thomas Tanghus ee04b626b4 Correct variable name. 2012-08-24 17:23:01 +02:00
Michael Gapczynski 36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
Michael Gapczynski cfec290ad9 Prevent resharing in UI if share permission not granted 2012-08-24 10:05:37 -04:00
Michael Gapczynski 3148edbdef Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders. 2012-08-24 10:01:46 -04:00
Lukas Reschke 63d6884e23 Sanitizing the user input to prevent a reflected XSS. Thanks to Nico Golde (ngolde.de) 2012-08-24 15:00:53 +02:00
Arthur Schiwon eadb894eff Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534 2012-08-24 15:00:53 +02:00
Lukas Reschke 9188d2a844 Add a missing exit(); 2012-08-24 15:00:53 +02:00
Lukas Reschke 4e5291c77a Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde. 2012-08-24 15:00:53 +02:00
Lukas Reschke 1d530192b9 Disable user enumeration 2012-08-24 15:00:53 +02:00
Lukas Reschke 9917c611d3 Disable listing of all users 2012-08-24 15:00:52 +02:00
Lukas Reschke 78e8cbd52c Check if webfinger is enabled 2012-08-24 14:58:48 +02:00
Michael Gapczynski ffb55d5a17 Don't return file handle if the mode supports writing and the file is not writable
Conflicts:
	apps/files_sharing/sharedstorage.php
2012-08-24 14:58:48 +02:00
Lukas Reschke 3644517b01 Missed an "echo" 2012-08-24 14:58:47 +02:00
Lukas Reschke 4f7e4c20d2 Sanitize user input 2012-08-24 14:58:47 +02:00
Georg Ehrke 2832311640 fix label for versioning in admin settings 2012-08-24 14:54:17 +02:00
Bart Visscher 5e9f92e5dd Calendar: remove double html encoding 2012-08-24 14:54:17 +02:00
Bart Visscher 646bc1fc24 Contacts: Fix no active Addressbooks 2012-08-24 14:54:16 +02:00
Arthur Schiwon 2af7473651 LDAP: sanitize base, user and group trees. fixes oc-1302 2012-08-24 14:54:16 +02:00
Thomas Tanghus 46d6fd15e4 Implemented sharing api for CalDAV. 2012-08-24 14:26:06 +02:00
Thomas Tanghus d1421ca5ab White-space. 2012-08-24 13:49:56 +02:00
Thomas Tanghus b716296203 Forgot to reenable the export plugin. 2012-08-24 05:04:45 +02:00
Thomas Tanghus 953f9d95f8 Implemented sharing api for CardDAV. Next step CalDAV. 2012-08-24 04:56:21 +02:00
Jenkins for ownCloud 07a889631e [tx-robot] updated from transifex 2012-08-24 02:07:18 +02:00
Thomas Tanghus 2cffcfbc03 Permission checking for shared addressbooks/contacts. 2012-08-23 22:03:36 +02:00
Thomas Tanghus f568ba9c8c Removed redundant __CLASS__ in logging. 2012-08-23 22:03:36 +02:00
Thomas Tanghus fdb4c820d3 Fix for deleting queued contacts. 2012-08-23 22:03:35 +02:00
Thomas Tanghus 394617e0b6 Missing IM variable assignments. 2012-08-23 22:03:35 +02:00
Thomas Tanghus 069d16fdd4 Use correct js class in first-run template. 2012-08-23 22:03:35 +02:00
Thomas Tanghus a3af9f4773 Used non-existing variable. 2012-08-23 22:03:35 +02:00
Thomas Tanghus d5127b14be Return newly created addressbook. 2012-08-23 22:03:35 +02:00
Sam Tuke e3ac15bad3 development snapshot 2012-08-23 19:19:39 +01:00
Arthur Schiwon d5c111a984 LDAP: identify (map) users with their directory UUID. Fixes the issue, that usernames for owncloud will change, when the DN changes (which happens rarely, but it happens). 2012-08-23 18:29:43 +02:00
Sam Tuke 32ee3de918 Extensive work on crypto stream wrapper implementation 2012-08-23 16:43:10 +01:00
Thomas Tanghus 2d97164f80 Limit styles so they don't interfere with sharing dropdown. 2012-08-23 05:02:30 +02:00
Thomas Tanghus 6941266e7b Remove obsolete closure. 2012-08-23 05:02:30 +02:00
Jenkins for ownCloud 082ed4ab71 [tx-robot] updated from transifex 2012-08-23 02:07:35 +02:00
Thomas Tanghus 99d17c5190 Don't add empty property parameters. 2012-08-23 01:18:59 +02:00
Thomas Tanghus 1df596e758 CSS fix for Windows. 2012-08-23 00:40:10 +02:00
Juan Carlos Cornejo 0944b4455b Moves the lastAction=null outside the if so it can include the undo requests from replace 2012-08-22 17:08:10 -04:00
Juan Carlos Cornejo 24a207a8fa Fixes a bug where if one tries to delete a file, then clicks undo, and then tries to delete the file again, no questions or undo options were presented.
Essentially, just set FileLists.lastAction = null when one clicks undo.
2012-08-22 16:56:00 -04:00
Thomas Tanghus 61c7700ce6 Add support for IMPP properties. 2012-08-22 18:51:17 +02:00
Michael Gapczynski 885b8c481b Check if files_sharing app is enabled, move file specific javascript to files_sharing app 2012-08-22 12:32:07 -04:00
Michael Gapczynski 3debb67458 Move share CSS to core, add script and style from inside Share API 2012-08-22 11:57:58 -04:00
Michael Gapczynski 25d474579a Removing most of files_sharing, the Share API implemented the majority of it 2012-08-22 11:57:58 -04:00
Arthur Schiwon 536fbb9189 LDAP: fix potentially unavailable LDAP resource, which can prevent successful login 2012-08-22 15:22:52 +02:00
Arthur Schiwon 63c454c7b2 LDAP: make refreshInterval for background jobs configurable in the DB 2012-08-22 12:44:46 +02:00
Arthur Schiwon 056d9adb23 LDAP: bg jobs: sane default refresh interval 2012-08-22 12:44:46 +02:00
Arthur Schiwon c48732987e LDAP: permanantly watch group members. Emit post_addToGroup resp. post_removeFromGroup on membership changes, so that Sharing App can take care of files shared within the groups. Requires and relies on background jobs. 2012-08-22 12:44:46 +02:00
Arthur Schiwon 2b8a2e16ed LDAP: don't pass -1 as length to array slice, when no limit is given. It cuts off the last item. 2012-08-22 12:44:46 +02:00
Thomas Tanghus ac9fd79329 Email type list wasn't initialized. 2012-08-22 12:40:35 +02:00
Thomas Tanghus 78b7e28ce0 Removed unused variable. 2012-08-22 12:40:35 +02:00
Thomas Tanghus 5c1dd82998 Minor layout change. 2012-08-22 12:40:35 +02:00
Jenkins for ownCloud e6d87b2c4b [tx-robot] updated from transifex 2012-08-22 02:08:16 +02:00
Michael Gapczynski 53350b2f19 Remove unnecessary file 2012-08-21 10:33:20 -04:00
Frank Karlitschek 1cfa831239 A first basic presentation app based on the amazing impress.js.
You have to put a presentation file that contains the presentation defined in html into your ownCloud with the file extension .impress
Then you can use this app to play it. It also contains a demo presentation that you can use to learn.
Help is welcome to improve this app. :-)
2012-08-21 14:44:23 +02:00
Thomas Tanghus 25dd0e940f Preliminary support for Apple X-ABLabel. Also for oc-1508. 2012-08-21 03:57:48 +02:00
Thomas Tanghus 8d38dc04a0 Remove class contactsection 2012-08-21 03:57:48 +02:00
Michael Gapczynski 68f5dc2a44 Remove unnecessary files 2012-08-20 21:22:23 -04:00
Jenkins for ownCloud b819aa33f7 [tx-robot] updated from transifex 2012-08-21 02:09:12 +02:00
Thomas Tanghus 1e42cd162e Added types to emails. Support for custom types. Partial fix for oc-1508. 2012-08-21 00:20:18 +02:00
Thomas Tanghus 719ae155db Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Arthur Schiwon ef3eebfd3e Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534. 2012-08-20 17:24:10 +02:00
Michael Gapczynski 82d81e8d39 Merge branch 'share_api'
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
2012-08-19 22:29:01 -04:00
Jenkins for ownCloud f893d21660 [tx-robot] updated from transifex 2012-08-20 02:03:51 +02:00
Jenkins for ownCloud 36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Thomas Tanghus 2d3ec5cb4b Removed stray img element. 2012-08-19 17:05:45 +02:00
Thomas Tanghus 4946e23bdc Strip slashes from commas and semi-colons. 2012-08-19 16:32:32 +02:00
Robin Appelman a4e840f4f1 improve hasUpdated for archive storage backend 2012-08-19 06:29:57 +02:00
Robin Appelman 758ebe0446 don't report ctime in the archive storage backend since it isn't reliable 2012-08-19 06:18:40 +02:00
Robin Appelman 7f6a037b8c small fix for normalizing paths in archives 2012-08-19 06:15:33 +02:00
Robin Appelman 808d6c58fe ensure proper result format when using opendir on the archive storage backend 2012-08-19 05:45:55 +02:00
Robin Appelman 2ea46ee1ca better file_get_contents, file_put_contents and toTmpFile for archive storage backend 2012-08-19 05:05:55 +02:00
Lukas Reschke d54390b1a0 Optimized image size 2012-08-18 13:56:04 +02:00
Lukas Reschke 6ef5edf5ea Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde. 2012-08-18 09:30:01 +02:00
Jenkins for ownCloud f1cabdd8e0 [tx-robot] updated from transifex 2012-08-18 02:04:07 +02:00
Georg Ehrke 41639f0517 fix fail in sql query of isDuplicate method of OC_Calendar_Import 2012-08-17 21:29:26 +02:00
Georg Ehrke 44272b9889 increase margin top of calendar import's color picker 2012-08-17 20:48:47 +02:00
Robin Appelman 53a888cc81 more path normalization 2012-08-17 01:22:54 +02:00
Jenkins for ownCloud 70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Sam Tuke 293a0f4d32 Started rewrite of cryptstream class (renamed to stream)
Added unit tests
Fixed decryption of user private key at login
Added functionality to keymanager
2012-08-16 19:18:18 +01:00
Michael Gapczynski df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Jenkins for ownCloud 1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Thomas Tanghus 4c638f101e Merge addressbooks. 2012-08-16 00:25:32 +02:00
Bart Visscher 3b9fac8f81 Fix gallery image view 2012-08-15 19:55:26 +02:00
Sam Tuke f11f524dfa working on streaming decrypted content
applied some dependency injection to keymanager.php
2012-08-15 18:49:53 +01:00
Bart Visscher ddfb9de147 Fix linkTo calls for new routing 2012-08-15 18:16:06 +02:00
Sam Tuke b883bb6b42 Converted test to PHPUnit format 2012-08-15 14:52:03 +01:00
Sam Tuke d725d07219 added two (currently passing) unit tests 2012-08-15 14:13:03 +01:00
Sam Tuke ea236e83d7 added first version of keymanager PHPUnit test files 2012-08-15 14:01:43 +01:00
Bart Visscher dd3208fe6f Fix webfinger documentation 2012-08-15 14:50:25 +02:00
Bjoern Schiessle d039f11905 provide ocs calls and keymanager functions to get/set both keys (private, public) of a user together 2012-08-15 13:18:11 +02:00
Bjoern Schiessle 92ec88c7bc move chane password code from keymanager.php to crypt.php 2012-08-15 09:54:21 +02:00
Jenkins for ownCloud da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Sam Tuke 6ce315fe58 added wrapper method in crypt class for encrypting asymmetric and symmetric simultaneously
fixed bugs with keymanager integration
added unit tests
2012-08-14 19:06:56 +01:00
Thomas Tanghus a75870489c Use correct class. 2012-08-14 20:06:45 +02:00
Lukas Reschke db5b995a6b Disable user enumeration 2012-08-14 17:23:26 +02:00