wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
30767 commits 157 branches 562 tags 714 MiB
Commit graph

30767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
1ba545dcef Merge pull request #22725 from owncloud/app-banners 
compress app banners on personal page
 2016-03-01 08:23:37 +01:00
Thomas Müller
eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key 
make decrypt all work with the master key
 2016-03-01 08:23:27 +01:00
Thomas Müller
da18d04b38 Merge pull request #22733 from owncloud/size-propagation-new-file 
fix size propagation for new files
 2016-03-01 08:20:34 +01:00
Thomas Müller
caf6c43187 Merge pull request #22736 from owncloud/propagation-ignore-encryption 
ignore encryption keys for propagation
 2016-03-01 08:19:42 +01:00
Thomas Müller
f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates 
Check correct permissions when resharing
 2016-03-01 08:17:56 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api 
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
 2016-03-01 07:24:57 +01:00
Roeland Jago Douma
8924b0a0dc Check correct permissions when resharing 
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
 2016-02-29 19:30:14 +01:00
Robin Appelman
003a686c1b ignore encryption keys for propagation 2016-02-29 17:47:09 +01:00
Robin Appelman
8c700cc99d fix size propagation for new files 2016-02-29 17:31:01 +01:00
Thomas Müller
52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external 
Print docker logs to the console fro debugging
 2016-02-29 16:36:34 +01:00
Thomas Müller
8a5cd0963f Merge pull request #22701 from owncloud/input-tel 
Style telephone inputs like other types
 2016-02-29 15:22:09 +01:00
Jan-Christoph Borchardt
687ea430bb compress app banners on personal page 2016-02-29 15:02:29 +01:00
Thomas Müller
527fb1f919 Merge pull request #22663 from owncloud/sidebar-mobile 
do not expand sidebar to full width on mobile, but up the min-width
 2016-02-29 15:00:53 +01:00
Bjoern Schiessle
95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Thomas Müller
a38e8b6436 Merge pull request #22662 from owncloud/comments-count 
remove comments count because it is not that relevant to show directly
 2016-02-29 13:44:56 +01:00
Thomas Müller
d98217d8ba Merge pull request #22713 from owncloud/fix-since-version-on-commentsvevent 
Fix since version
 2016-02-29 11:40:14 +01:00
Joas Schilling
a1c02a0567 Fix since version 2016-02-29 11:02:10 +01:00
Thomas Müller
9724fcc0c1 Merge pull request #22638 from owncloud/comments-db-indexes 
add index definitions for comments tables
 2016-02-29 11:01:34 +01:00
Joas Schilling
2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Thomas Müller
6526c122af Merge pull request #22683 from owncloud/fix_22682 
Relax rootfolder check
 2016-02-29 08:53:58 +01:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Thomas Müller
3e8e0049b4 Merge pull request #22673 from owncloud/fix_enforced_expire_date_setting 
Expiration date can only be enforced if default is enabled
 2016-02-29 07:08:57 +01:00
Hendrik Leppelsack
385671034c style telephone inputs like other types 2016-02-29 00:09:13 +01:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Roeland Jago Douma
b116e80c56 Relax rootfolder check 
* Updated unit tests
* Added intergration test
 2016-02-26 16:05:32 +01:00
Thomas Müller
5fa6d3ea58 Merge pull request #22669 from owncloud/fix-email-form 
Fix email form on personal page
 2016-02-26 14:05:29 +01:00
Roeland Jago Douma
bfcdf40a64 Expiration date can only be enforced if default is enabled 
If the default expiration date is not enebaled it can not be enforced.

* Added unit tests
 2016-02-26 11:38:06 +01:00
Thomas Müller
62d7885c3b Merge pull request #22660 from owncloud/fix_22656 
Do not allow sharing of the users root folder
 2016-02-26 10:49:12 +01:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670 
Move the tag filter at the end for now
 2016-02-26 10:48:55 +01:00
Thomas Müller
0795cc373d Merge pull request #22646 from owncloud/fix_22642 
Set default expiration date if none given on share creation
 2016-02-26 10:48:21 +01:00
Thomas Müller
66536f912e Merge pull request #22640 from owncloud/fix_22587 
Remove delete permissions for read-only federated reshares
 2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags 
Rename system tags app to collaborative tags
 2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773 
Allow theming of actions
 2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Thomas Müller
cbde4bb92f Merge pull request #22650 from owncloud/fix_hook 
Fix verifyExpirationDate passwordSet argument
 2016-02-26 09:32:41 +01:00
Joas Schilling
d03c537a26 Email endpoint is controlled by the username setting, not password 2016-02-26 09:28:18 +01:00
Joas Schilling
9a7cb02981 Correctly indent uneditable email/display name fields 2016-02-26 09:27:41 +01:00
Joas Schilling
4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Arthur Schiwon
b3ac81f134 exchange user_id_key for a unique one. 2016-02-26 01:02:22 +01:00
Vincent Petry
867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7 Make more action icons themable + style fixes 
Action icons now appear properly in public link page.
More actions are now CSS icons.
 2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt
0772bee15f do not expand sidebar to full width on mobile, but up the min-width, fix #19915 2016-02-25 21:46:47 +01:00
Thomas Müller
cb41b1a863 Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 
Before installing new shipped apps we need to load authentication apps
 2016-02-25 21:43:32 +01:00
Thomas Müller
290f159a97 Merge pull request #22653 from owncloud/integration-tests-for-dav-csrf 
Add integration test for CSRF protection on DAV
 2016-02-25 21:42:20 +01:00
Thomas Müller
84ffc4fbc4 Merge pull request #22654 from owncloud/icon-fixes 
add download icon for image detail view, ref gallery issue 51
 2016-02-25 21:42:03 +01:00