Vincent Petry
6fa03870e9
Merge pull request #11541 from owncloud/usersession-activeuser-setsession
...
Unset the cached active user when using a different session object
2014-10-15 13:31:05 +02:00
Vincent Petry
4650101674
Merge pull request #11548 from owncloud/extstorage-ocfields
...
Allow specifying protocol in ext storage OC config
2014-10-15 13:27:23 +02:00
Arthur Schiwon
ab6890b854
instead of dis/enabling tabs on save, cancel tab change. avoids noisy ui
2014-10-15 12:51:46 +02:00
Arthur Schiwon
4385188920
show busy cursor and lock tabs on save
2014-10-15 12:41:53 +02:00
Bjoern Schiessle
d18da08a1a
set password field placeholder back if passward was disabled
2014-10-15 12:30:31 +02:00
Vincent Petry
dd0b1e83b2
Merge pull request #11590 from owncloud/publiclinkscrollanimatefix
...
Use body element when animating scroll in public page
2014-10-15 10:52:29 +02:00
Vincent Petry
704ffaa6a3
Use body element when animating scroll in public page
...
In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
2014-10-15 10:14:20 +02:00
Jenkins for ownCloud
3b3affa1ef
[tx-robot] updated from transifex
2014-10-15 01:54:26 -04:00
Carla Schroder
887d6155b8
commented out instanceid and passwordsalt
2014-10-14 16:57:45 -07:00
Carla Schroder
a8a0bcaffc
some small tweaks
2014-10-14 10:00:20 -07:00
Arthur Schiwon
c26e9c675a
show Spinner when stuff is being saved
2014-10-14 17:39:27 +02:00
Thomas Müller
d3eebad591
fixing typos
2014-10-14 15:38:39 +02:00
Lukas Reschke
13b1b45ee4
Refactor MailSettings controller
...
- Do not store the password (fixes https://github.com/owncloud/core/issues/11385 )
- Refactor to AppFramework
- Add unit tests
Conflicts:
settings/admin/controller.php
2014-10-14 15:38:34 +02:00
Lukas Reschke
1b3feb710d
Use `rawurlencode` since this seems to be expected by cURL
...
Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
2014-10-14 13:16:23 +02:00
Lukas Reschke
bf84cd4bcc
Add darwin to if block
...
Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
2014-10-14 12:58:00 +02:00
Jörn Friedrich Dreyer
766314a6be
Merge pull request #11556 from owncloud/cache-js-and-css
...
adding cache control headers for css and js - fixes #11496
2014-10-14 10:41:10 +02:00
Vincent Petry
c2cfeea888
Merge pull request #11534 from owncloud/issue/11500
...
Issue/11500 Do not set overwrite* settings by default
2014-10-14 09:16:31 +02:00
Jenkins for ownCloud
526abf1ad6
[tx-robot] updated from transifex
2014-10-14 01:54:28 -04:00
Thomas Müller
4b5c7d3d9d
adding cache control headers for css and js - fixes #11496
2014-10-14 06:36:53 +02:00
Joas Schilling
0407bc0978
Set overwritemailurl* configs on setup
...
Correctly use overwritemailurl value when generating absolute urls in CLI
Fix #11500
Rename the config to *cli
Add overwrite.cli.url to the sample config
Revert separator fix, fixes unit test
2014-10-14 05:07:09 +02:00
Bernhard Reiter
b416f7d8ac
PHPDoc fixes as suggested by @MorrisJobke.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
1770179648
Add getTag() function for accessing of a single tag.
2014-10-14 00:06:33 +02:00
Bernhard Reiter
bc265e8b52
Make loading of tags from DB more explicit.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
226d7233e1
In Tags::rename($from, $to), check if there already is a tag named $to.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7e9baafc53
Add option to include tags for shared items.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
7963125c41
Remove two obsolete try...catch blocks.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
5471189fe6
Implement Tag and TagMapper classes.
...
Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
cf6fb2c2e4
Remove redundant null initializations.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
3e5d725502
Test addMultiple() with $sync=true.
2014-10-14 00:06:07 +02:00
Bernhard Reiter
a67803fb5d
Test Tags::getFavorites().
2014-10-14 00:06:07 +02:00
Bernhard Reiter
b33cb0e342
Fix a comment.
2014-10-14 00:06:07 +02:00
Jörn Friedrich Dreyer
7535b09851
cleanup variable names and duplicate jQuery selectors
2014-10-13 18:40:57 +02:00
Thomas Müller
baffe5353f
Merge pull request #11543 from owncloud/closeSessionForAppsLoading
...
Close session when loading apps
2014-10-13 17:59:12 +02:00
Jörn Friedrich Dreyer
7f1ba86789
fix flickering users
2014-10-13 17:58:29 +02:00
Vincent Petry
e95372bf01
Merge pull request #11546 from owncloud/users-deletewithfilecache
...
Retrieve storage numeric id earlier when still available
2014-10-13 17:27:13 +02:00
Vincent Petry
ab5149f5df
Allow specifying protocol in ext storage OC config
...
Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
2014-10-13 17:15:58 +02:00
Björn Schießle
48ce2ef18b
Merge pull request #11542 from owncloud/fix_failing_unit_tests
...
distinguish between file dependent shares and other shares
2014-10-13 17:01:13 +02:00
Vincent Petry
4fd8cb43ae
Merge pull request #11537 from owncloud/filenamewithzeroes
...
Fixed array detection on public download
2014-10-13 16:56:11 +02:00
Robin Appelman
7dd4314fea
Add unit test
2014-10-13 16:31:26 +02:00
Vincent Petry
d485c0098d
Retrieve storage numeric id earlier when still available
...
The numeric id is only available before the storage entry is deleted, so
get it at that time.
2014-10-13 15:52:48 +02:00
Bjoern Schiessle
c6c9a51b11
distinguish between file dependent shares and other shares
2014-10-13 15:04:54 +02:00
Lukas Reschke
50841f8307
Close session when loading apps
...
Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
2014-10-13 15:03:44 +02:00
Robin Appelman
912fbfab01
Unset the cached active user when using a different session object
2014-10-13 13:11:48 +02:00
Robin Appelman
19de425a50
Use the cached fileinfo to get creatable permissions
2014-10-13 13:09:05 +02:00
Vincent Petry
6cbabdf217
Fixed array detection on public download
...
When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
2014-10-13 12:54:21 +02:00
Jenkins for ownCloud
4b9465b937
[tx-robot] updated from transifex
2014-10-13 01:54:35 -04:00
Lukas Reschke
bf674487aa
Merge pull request #11367 from owncloud/removeIsMimeSupported
...
Remove uneeded slicing of element
2014-10-12 19:45:00 +02:00
Jenkins for ownCloud
a3635fedbb
[tx-robot] updated from transifex
2014-10-12 01:54:39 -04:00
Nazar Mokrynskyi
257cf1fc34
Page size calculation based on real page height
...
This is fix for https://github.com/owncloud/core/issues/10060
Instead of hard coding page size as 20 items, we check real page height, and divide by 50 (height of one row).
This will allow to load fewer items on small screens and enough items on large screens (4k, portrait orientation, etc.).
Also checking page height on every load to respond on browser window resizing,
2014-10-11 15:10:54 +02:00
Jenkins for ownCloud
a0db01ecd3
[tx-robot] updated from transifex
2014-10-11 01:55:02 -04:00