Commit Graph

17710 Commits

Author SHA1 Message Date
Volkan Gezer ce835a3247 add uncompressed jquery files - fixes #8294 2014-04-23 00:07:00 +02:00
David Prévot eebb756c38 Adapt chosen (css) path
Avoid shipping duplicate files in 3rdparty/css.

3rdparty/css/chosen/ already contains chosen.css and chosen-sprite.png
so its useless to duplicate them in 3rdparty/css.

Taking the same approach as in apps/calendar/appinfo/app.php and
apps/files_external/settings.php.
2014-04-22 14:15:09 -04:00
Lukas Reschke 9d3b639ce6 Remove uneeded newline 2014-04-22 20:11:34 +02:00
Lukas Reschke 589c74e176 Fix indentation 2014-04-22 20:10:46 +02:00
Lukas Reschke f07180639c Add unit tests for arrays and "
OC_Util::sanitizeHTML() also supports array but we actually had no unit test for it. Additionally this commit introduces a test for escaping " into "
2014-04-22 20:09:55 +02:00
Arthur Schiwon c1c2f2c49e add additional comments, PHPdoc and check whether it's really applicable 2014-04-22 18:36:43 +02:00
Arthur Schiwon 1c71d5c444 LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example 2014-04-22 18:36:37 +02:00
Robin Appelman b42ce6c30a Prevent error if previously cached data doesn't have an etag 2014-04-22 15:24:38 +02:00
Volkan Gezer 6e857de6b7 Make lib/** share.php strings extractable for translation
They were not ready for translation as they had no placeholders
and/nor wrapper function to be translated

This should fix: #8011
2014-04-22 14:56:44 +02:00
Volkan Gezer a4ab29da6e Merge pull request #8297 from owncloud/fix-text-master
fix spelling 'Allow user ...' -> 'Allow users ...'
2014-04-22 14:37:40 +02:00
Thomas Müller 0330481c5e Merge pull request #8263 from LEDfan/add-key-to-contacts
Add key to every contact
2014-04-22 14:20:53 +02:00
Tobia De Koninck efff7dd2a4 Change key to addressbook-key 2014-04-22 12:46:09 +02:00
Robin Appelman 3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Raghu Nayyar d56072cf2e Merge pull request #8255 from owncloud/fix-public-download-button
keep long file names in one line to not overflow download button on mobile
2014-04-22 15:44:29 +05:30
Thomas Müller f353e6f669 Merge pull request #8286 from owncloud/use-proper-jsdoc
Use proper JSDoc documentation instead of inconsistent documentation styles
2014-04-22 12:00:25 +02:00
Jan-Christoph Borchardt e7e87f4d9f improve upload and download icons 2014-04-22 11:47:01 +02:00
Jan-Christoph Borchardt 378f79b2d9 improve delete and close icons 2014-04-22 11:37:30 +02:00
Jan-Christoph Borchardt cef795790f thinner add icon 2014-04-22 11:36:39 +02:00
Thomas Müller 54873c7aae Merge pull request #8247 from owncloud/l10n-files_trasbin-fix
Fix localization issues of files_trashbin
2014-04-22 11:34:49 +02:00
Thomas Müller 5049664285 Merge pull request #8239 from owncloud/directlink-overflow
add max-width to directLink input to prevent overflow
2014-04-22 11:23:10 +02:00
Lukas Reschke 381c1c8b6e Fix typo
to => too
2014-04-22 10:43:35 +02:00
Jörn Friedrich Dreyer 4d9ff49f61 Merge pull request #8283 from owncloud/translatable-max-in-upload
make max. text translatable
2014-04-22 10:23:08 +02:00
Thomas Müller 29bc82be8d fixing typos 2014-04-22 09:54:25 +02:00
Thomas Müller 56bc5f8f43 fixing typo 2014-04-22 09:43:29 +02:00
Thomas Müller 54476c468c fix spelling 'Allow user ...' -> 'Allow users ...' 2014-04-22 09:34:08 +02:00
Jenkins for ownCloud a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Morris Jobke 0ebb4662ec Merge pull request #8281 from owncloud/public-responses
make download and redirectresponse public
2014-04-22 00:08:04 +02:00
Robin McCorkell abfd7ecb72 Permit personal mount points to be used for sharing
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
2014-04-21 21:42:35 +01:00
Frank Karlitschek ee70eb0808 Merge pull request #8287 from owncloud/phpdoc-base
Some more PHPDoc fixes
2014-04-21 20:13:45 +02:00
Lukas Reschke e88731a477 Some more PHPDoc fixes 2014-04-21 15:44:54 +02:00
Lukas Reschke 51eee3dec1 Fix JSDoc 2014-04-21 14:42:50 +02:00
Lukas Reschke 8fcffae1e2 Reuse selector 2014-04-21 14:28:54 +02:00
Lukas Reschke 539cecbd63 Use proper JSDoc documentation 2014-04-21 13:46:33 +02:00
Jenkins for ownCloud 4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Volkan Gezer 1aa7774178 make max. text translatable 2014-04-21 02:41:33 +02:00
Andreas Fischer f2f5a53d36 Merge pull request #7988 from owncloud/routing-cache-webroot
Keep cached urls with different hostnames or baseurls seperate

* owncloud/routing-cache-webroot:
  Sort parameters and cast to int
  add delimiter between host and baseurl
  Keep cached urls with different hostnames or baseurls seperate
2014-04-20 18:27:23 +02:00
Bernhard Posselt 7e447f4f42 make download and redirectresponse public 2014-04-20 16:12:46 +02:00
Andreas Fischer f2e5494edc Merge pull request #8203 from owncloud/correct-link
Use direct link instead of JS

* owncloud/correct-link:
  Link to previous directory
  Use direct link instead of JS
2014-04-20 15:58:53 +02:00
Andreas Fischer 93ed6a695e Merge pull request #8169 from owncloud/change-to-show
Change from showHTML to show

* owncloud/change-to-show:
  Change from showHTML to show
2014-04-20 15:53:33 +02:00
Andreas Fischer 96137027f8 Merge pull request #8277 from owncloud/add-type-hints
Add type hinting

* owncloud/add-type-hints:
  Add type hinting
2014-04-20 15:40:26 +02:00
Jenkins for ownCloud 8fba61f844 [tx-robot] updated from transifex 2014-04-20 01:56:03 -04:00
Bernhard Posselt 309aa3bcd2 fix phpdoc for entities 2014-04-20 02:55:59 +02:00
Lukas Reschke 199ee18c0c Merge pull request #8229 from owncloud/menutoggle-mobile
do not show menu toggle on public share links as there is no menu
2014-04-20 01:13:24 +02:00
Lukas Reschke 886c5177e7 Fix typo & add type 2014-04-20 01:09:25 +02:00
Lukas Reschke e930ce6436 Add type hinting 2014-04-20 00:55:01 +02:00
Bernhard Posselt 0c736feaba remove useless import 2014-04-19 19:31:49 +02:00
Bernhard Posselt 4a7e0561ca move db into iservercontainer 2014-04-19 19:30:12 +02:00
Bernhard Posselt 0fe4db0992 remove unusued variable 2014-04-19 16:02:15 +02:00
Bernhard Posselt f4bc5ee863 remove unusued variable 2014-04-19 16:00:19 +02:00
Bernhard Posselt 95a83233a9 fix doc strings for db facade 2014-04-19 15:32:17 +02:00