fe08700b59
Merge pull request #21885 from owncloud/add-size-minus-zero-to-avatar
...
Adding support of -1 as size to be passed into get and getFile
2016-01-25 19:54:15 +01:00
a4ea3563e7
Merge pull request #21830 from owncloud/systemtags-sidebar-permissions
...
Systemtags sidebar permissions
2016-01-25 17:33:40 +01:00
728caf13f8
Adding support of -1 as size to be passed into get and getFile
2016-01-25 16:54:40 +01:00
0a1350d5ac
System tags sidebar selector now respects permissions
...
For admins: display the namespace behind the tag name.
For users: no namespace, don't display non-assignable tags in the
dropdown, display already assigned non-assignable tags with a different
style
2016-01-25 10:45:02 +01:00
d4198607ec
Expose whether user is an admin through a method
...
Which is nicer than an obscure global variable
2016-01-25 10:07:47 +01:00
ce753231eb
Merge pull request #18444 from owncloud/occ-config-types
...
occ config:system:set can now set other value types
2016-01-25 10:02:51 +01:00
9d36972e0f
Merge pull request #21401 from owncloud/dav-cache-getchildren
...
Put nodes from Directory->getChildren in the ObjectTree cache
2016-01-25 10:02:32 +01:00
d69167caff
Merge pull request #21424 from owncloud/appversions
...
Use appConfig to get app versions
2016-01-25 10:02:02 +01:00
adf532fe4e
Merge pull request #21806 from owncloud/mdusher-master
...
[jenkins] Added ' to characters allowed in the username
2016-01-25 10:01:43 +01:00
44043cb1d7
Merge pull request #21811 from owncloud/fix-unauthenticated-avatar
...
Show default placeholder if avatar image can't be fetched
2016-01-25 10:01:23 +01:00
ef4fca22d1
Merge pull request #21844 from owncloud/drop-image-path
...
Remove OC_Helper::imagePath and use the proper public interface
2016-01-25 10:00:21 +01:00
f90dccf172
Merge pull request #21862 from owncloud/sync-certificates-with-upstream
...
[master] Sync certificates with upstream
2016-01-25 10:00:05 +01:00
d62ea66645
Merge pull request #21878 from owncloud/fix-apps-management-templating
...
Include author and license in l10n string to be able to change order
2016-01-25 09:59:45 +01:00
e84a663b05
Merge pull request #21879 from owncloud/remove-unused-code
...
remove unused variable
2016-01-25 09:58:33 +01:00
287e6d36bf
remove unused variable
2016-01-25 09:29:44 +01:00
37f5f5077a
Merge pull request #21877 from owncloud/fix_dav_app
...
Add missing use statements for IGroupManager and IUserSession
2016-01-25 08:50:41 +01:00
605df6c36b
Includ author and license in l10n string to be able to change order
...
* fixes #21874
2016-01-25 08:44:43 +01:00
d0799af484
Add missing use statements for IGroupManager and IUserSession
2016-01-25 08:05:53 +01:00
a331979a67
[tx-robot] updated from transifex
2016-01-25 01:54:39 -05:00
75e6734ef4
Remove OC_Helper::imagePath and use the proper public interface
2016-01-24 18:04:20 +01:00
82d3852815
[tx-robot] updated from transifex
2016-01-24 01:54:40 -05:00
f92119e02f
[tx-robot] updated from transifex
2016-01-23 01:55:35 -05:00
c0640f7998
Sync certificates with upstream
2016-01-22 22:10:17 +01:00
0a4142d5df
Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
...
Streaming download from Swift in files_external
2016-01-22 17:27:41 +01:00
99e9c81c8b
Merge pull request #21841 from owncloud/share2_deletefromself
...
[Share 2.0] Add deleteFromSelf method
2016-01-22 17:27:17 +01:00
a203089cfd
Merge pull request #21836 from RomanKreisel/master
...
Solves #21835 (https://github.com/owncloud/core/issues/21835 )
2016-01-22 17:26:28 +01:00
7731b29136
Merge pull request #21719 from owncloud/move-notification-api-to-ocp
...
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
21131d133a
Merge pull request #21814 from owncloud/systemtags-backend-permissions
...
Fix DAV backend to respect system tags permissions
2016-01-22 16:08:22 +01:00
a6600e95dc
[Share 2.0] Add deleteFromSelf method
...
This allows recipient to delete a share. For user shares this is the
same as deleting (at least for now).
But for group shares this means creating a new share with type 2. With
permissions set to 0.
2016-01-22 15:06:50 +01:00
2d569d92eb
Merge pull request #21850 from owncloud/more-output-for-integrity-check
...
Print output for integrity check during ./occ upgrade
2016-01-22 14:59:29 +01:00
e7aab8f31f
Print output for integrity check during ./occ upgrade
2016-01-22 13:18:00 +01:00
9b4c9a0357
Merge pull request #18531 from owncloud/ext-user-credentials
...
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
0bccdbc959
Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess
...
Add custom marker into htaccess and execute integrity check after installation
2016-01-22 13:13:59 +01:00
e3013a99ef
Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-autoguessing
...
Use path instead of app id for occ app signing
2016-01-22 13:13:41 +01:00
969581cc68
Merge pull request #21847 from owncloud/issue-21807-default-app-icon
...
Add a default app icon for apps that don't have one
2016-01-22 12:53:40 +01:00
a0b383c5e8
Run on installer
2016-01-22 11:52:53 +01:00
bc62aa1ef5
Exclude .htaccess modifications from code checker
...
After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker.
2016-01-22 11:51:54 +01:00
3038006e8e
Add a default app icon for apps that don't have one
2016-01-22 11:38:11 +01:00
6a3efc6f1b
Merge pull request #21843 from owncloud/increase-version
...
Increase version due to new tables
2016-01-22 11:17:12 +01:00
57b17cdd98
Merge pull request #21826 from owncloud/dav-fix-user-deletion
...
No card ID when deleting is acceptable
2016-01-22 11:16:30 +01:00
7d1416fe12
Increase version due to new tables
2016-01-22 11:04:04 +01:00
31c5848e51
Allow automatic injection of the Manager
2016-01-22 11:02:40 +01:00
1410120758
Merge pull request #20768 from owncloud/mount-cache
...
cache mountpoints in the db
2016-01-22 11:01:54 +01:00
9ea7ae6f87
Adjust the since on the interface
2016-01-22 10:51:36 +01:00
ee02165005
Move the notification API to public namespace
2016-01-22 10:32:42 +01:00
e2e5eedb40
Merge pull request #21824 from owncloud/list-of-notifiers
...
Make it possible to get a list of notifiers for a potential settings …
2016-01-22 10:24:46 +01:00
67c79faae0
Merge pull request #21840 from owncloud/fix-phpdoc
...
Fix PHPDoc - @changed is no official tag -> use @since
2016-01-22 10:24:26 +01:00
3cca8498cb
Make it possible to get a list of notifiers for a potential settings page
2016-01-22 08:47:21 +01:00
75ee5a9e9a
Fix PHPDoc - @changed is no official tag -> use @since
2016-01-22 08:43:05 +01:00
766ba1cd5f
Merge pull request #21532 from owncloud/share2.0_getShares
...
[Share 2.0] get shares
2016-01-22 07:58:36 +01:00
Thomas Müller
Vincent Petry
Morris Jobke
Lukas Reschke
Roeland Jago Douma
Jenkins for ownCloud
Joas Schilling