Thomas Müller
|
0aa652ecfd
|
Merge pull request #9859 from tiezdne/master
Update mimetypes.list.php
|
2014-07-28 11:16:43 +02:00 |
|
Thomas Müller
|
cfaa05cc0e
|
Merge pull request #9905 from owncloud/joblist-non-existing-class
Dont try to execute jobs that no longer exist
|
2014-07-28 11:09:27 +02:00 |
|
Thomas Müller
|
ab8efe3aa2
|
Merge pull request #9935 from owncloud/harden-get-urlco
Verify whether the URL is valid
|
2014-07-28 11:07:41 +02:00 |
|
Thomas Müller
|
f2982b7a08
|
Merge pull request #9904 from owncloud/loggedout-getuserfolder
Dont throw an error when calling $server->getUserFolder when logged out
|
2014-07-28 10:04:01 +02:00 |
|
Thomas Müller
|
37f673c8b5
|
Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master
don't silently exit in cli-mode in case ownCloud in not yet installed
|
2014-07-28 09:40:40 +02:00 |
|
Jenkins for ownCloud
|
a169572223
|
[tx-robot] updated from transifex
|
2014-07-28 01:54:30 -04:00 |
|
Jan-Christoph Borchardt
|
0b63111892
|
Merge pull request #9922 from visit1985/app_icon_size
max icon size for app menu
|
2014-07-28 00:47:55 +02:00 |
|
Lukas Reschke
|
260729fd7d
|
Verify whether the URL is valid
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017
@karlitschek Backport for stable6 and stable7 requested.
|
2014-07-27 16:46:32 +02:00 |
|
Jenkins for ownCloud
|
9a4d2871eb
|
[tx-robot] updated from transifex
|
2014-07-27 01:54:31 -04:00 |
|
Michael Göhler
|
1e69fc9af2
|
max icon size for app menu
|
2014-07-26 13:06:51 +02:00 |
|
Jenkins for ownCloud
|
010732019a
|
[tx-robot] updated from transifex
|
2014-07-26 01:54:40 -04:00 |
|
Jörn Friedrich Dreyer
|
ec7a10f882
|
reorder if statements to remove negation, indentation correction
|
2014-07-25 19:39:29 +02:00 |
|
Robin Appelman
|
43978befda
|
Dont try to execute jobs that no longer exist
|
2014-07-25 18:02:02 +02:00 |
|
Robin Appelman
|
acafb4a426
|
Merge pull request #9669 from owncloud/group-public
Add group management to the public api
|
2014-07-25 17:55:12 +02:00 |
|
Robin Appelman
|
bf12bba079
|
Dont throw an error when calling $server->getUserFolder when logged out
|
2014-07-25 17:52:50 +02:00 |
|
Björn Schießle
|
40f2a34be1
|
Merge pull request #9867 from owncloud/fix_sharing_update
fix sharing update, add proper escaping
|
2014-07-25 10:16:22 +02:00 |
|
Jenkins for ownCloud
|
3f58d949e0
|
[tx-robot] updated from transifex
|
2014-07-25 01:54:32 -04:00 |
|
Bjoern Schiessle
|
c22b5c7884
|
fix sharing update, add proper escaping
|
2014-07-24 20:16:40 +02:00 |
|
Vincent Petry
|
63ffae8373
|
Merge pull request #9861 from owncloud/console-dontloadappsonupdate
Do not load apps in console.php when an upgrade is due
|
2014-07-24 18:30:33 +02:00 |
|
Vincent Petry
|
2b1cd84fcc
|
Do not load apps when an upgrade is due
This makes it still possible to update from the command line, but
disables custom commands from apps
|
2014-07-24 16:53:30 +02:00 |
|
Thomas Müller
|
788a2eca2f
|
Merge pull request #9841 from owncloud/fix-password-reset-master
Fix password reset in console command and lost password controller
|
2014-07-24 15:58:02 +02:00 |
|
tiezdne
|
6a2f3921f6
|
Update mimetypes.list.php
|
2014-07-24 15:43:55 +02:00 |
|
Thomas Müller
|
b72a3e5be7
|
Merge pull request #9837 from owncloud/ignore-non-oc-tables-master
Adding test which breaks because bit and/or enum datatypes are used
|
2014-07-24 15:36:17 +02:00 |
|
Morris Jobke
|
fa333c02a0
|
Merge pull request #9703 from owncloud/files-preview-animate
[OC 7] Fix preview animation on uploading
|
2014-07-24 14:19:00 +02:00 |
|
Thomas Müller
|
2594fb80aa
|
don't silently exit in cli-mode in case ownCloud in not yet installed
|
2014-07-24 13:45:06 +02:00 |
|
Thomas Müller
|
a8b6cc6a07
|
- adding default value for $recoveryPassword
- set password correctly in lost password
|
2014-07-24 12:50:39 +02:00 |
|
Thomas Müller
|
7d60f7a222
|
register type mappings for unknown/unsupported mysql types
|
2014-07-24 12:17:26 +02:00 |
|
Thomas Müller
|
65c824a2c0
|
Adding test which breaks because bit and/or enum datatypes are used
|
2014-07-24 12:10:05 +02:00 |
|
Jenkins for ownCloud
|
e2327f83ed
|
[tx-robot] updated from transifex
|
2014-07-24 01:54:37 -04:00 |
|
Thomas Müller
|
4c99869e1f
|
Merge pull request #9815 from owncloud/update-preventupdatethroughcron
Prevent cron.php to trigger apps updating
|
2014-07-23 22:41:55 +02:00 |
|
Thomas Müller
|
fb0416884f
|
Merge pull request #9809 from owncloud/check-transaction-before-commit-migration-master
only commit in case a transaction is active
|
2014-07-23 21:35:54 +02:00 |
|
Vincent Petry
|
547927bdd2
|
Prevent cron.php to trigger apps updating
|
2014-07-23 21:29:24 +02:00 |
|
Thomas Müller
|
363ba04f5e
|
only commit in case a transaction is active
|
2014-07-23 20:13:19 +02:00 |
|
Vincent Petry
|
a547bf8fe6
|
Merge pull request #9788 from owncloud/design-app-styles
Simplify app navigation look
|
2014-07-23 18:39:12 +02:00 |
|
icewind1991
|
e495b4ea19
|
Merge pull request #9789 from owncloud/external-share-root
Fix remote share when remote server is installed at the root
|
2014-07-23 15:35:55 +02:00 |
|
Robin Appelman
|
97de7bb23e
|
Fix remote share when remote server is installed at the root
|
2014-07-23 13:45:56 +02:00 |
|
Jan-Christoph Borchardt
|
4e209c635d
|
fix settings entry width
|
2014-07-23 13:06:43 +02:00 |
|
Jan-Christoph Borchardt
|
4dca6d44d8
|
remove superfluous border from settings entry
|
2014-07-23 13:02:35 +02:00 |
|
Jan-Christoph Borchardt
|
6ee43255b7
|
simplify app navigation look, remove superfluous border as it is distinguished enough via background color
|
2014-07-23 13:01:10 +02:00 |
|
Jenkins for ownCloud
|
9834e38542
|
[tx-robot] updated from transifex
|
2014-07-23 01:54:36 -04:00 |
|
Sander
|
4e2954673a
|
Revert change
|
2014-07-22 19:45:01 +02:00 |
|
Sander
|
eacdf26cde
|
Allow getAppFolder to get another apps path
cc @Raydiation
|
2014-07-22 16:07:43 +02:00 |
|
Thomas Müller
|
0567fd031f
|
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
adding special handling of checkPrecondition() for chunked upload
|
2014-07-22 15:47:55 +02:00 |
|
Thomas Müller
|
8ed6adaf85
|
Merge pull request #9738 from owncloud/remove-uneeded-strip
Remove uneeded strip_tags
|
2014-07-22 15:06:23 +02:00 |
|
Thomas Müller
|
31149fb1c3
|
adding special handling of checkPrecondition() for chunked upload
|
2014-07-22 13:06:20 +02:00 |
|
Vincent Petry
|
5565eabb81
|
Merge pull request #9683 from owncloud/fix_#8819_sorting
Fix #8819 sorting
|
2014-07-22 10:11:00 +02:00 |
|
Jenkins for ownCloud
|
5696a88fc3
|
[tx-robot] updated from transifex
|
2014-07-22 01:54:29 -04:00 |
|
Remco Brenninkmeijer
|
319caa7089
|
Sorting triangles pointing up for ascending, down for descending
|
2014-07-21 23:07:52 +02:00 |
|
Vincent Petry
|
675e3eec32
|
Merge pull request #9750 from owncloud/issue/9745
Correctly use groups parameter only when its not empty
|
2014-07-21 20:45:24 +02:00 |
|
Joas Schilling
|
677c0288fb
|
Merge pull request #9757 from owncloud/issue/9756
Add language parameter to public API for getL10N()
|
2014-07-21 16:50:48 +02:00 |
|