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

10950 commits

Author SHA1 Message Date
Joas Schilling
90ce876378 Adjust comments to the new constants 2016-01-26 14:56:07 +01:00
Thomas Müller
3da78c8f1c Merge pull request #21901 from owncloud/fix-setup 
Fix setup page
 2016-01-26 11:42:55 +01:00
Thomas Müller
5285460669 Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-change 
Changing the avatar of the user emits the changeUser event which trig…
 2016-01-26 11:37:17 +01:00
Thomas Müller
2bafb1c649 Merge pull request #21894 from owncloud/refactor-csrf 
Add new CSRF manager for unit testing purposes
 2016-01-26 11:36:56 +01:00
Morris Jobke
2ecc202843 Fix setup page 
* fixes #21897
 2016-01-26 09:05:10 +01:00
Jenkins for ownCloud
ecf2d178b1 [tx-robot] updated from transifex 2016-01-26 01:56:06 -05:00
Thomas Müller
4c9e328211 Merge pull request #21892 from owncloud/issue-21890-parameters 
Add parameters types to IQueryBuilder
 2016-01-25 21:13:41 +01:00
Thomas Müller
a1ca9de0f5 Trigger change on avatar delete 2016-01-25 20:56:04 +01:00
Thomas Müller
f165ad8864 Changing the avatar of the user emits the changeUser event which triggers update of the system addressbook 2016-01-25 20:05:11 +01:00
Lukas Reschke
12b22c2759 Regenerate CSRF token upon login 
Otherwise somebody else might be able to note down the CSRF token before login on a shared computer.
 2016-01-25 20:03:40 +01:00
Lukas Reschke
a977465af5 Add new CSRF manager for unit testing purposes 
This adds a new CSRF manager for unit testing purposes, it's interface is based upon https://github.com/symfony/security-csrf. Due to some of our required custom changes it is however not possible to use the Symfony component directly.
 2016-01-25 20:03:40 +01:00
Joas Schilling
09ae160463 Replace other usages 2016-01-25 17:17:36 +01:00
Joas Schilling
c5046fb2a9 Add parameters to public interface 2016-01-25 17:17:20 +01:00
Thomas Müller
728caf13f8 Adding support of -1 as size to be passed into get and getFile 2016-01-25 16:54:40 +01:00
Thomas Müller
d69167caff Merge pull request #21424 from owncloud/appversions 
Use appConfig to get app versions
 2016-01-25 10:02:02 +01:00
Thomas Müller
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
Thomas Müller
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
Morris Jobke
287e6d36bf remove unused variable 2016-01-25 09:29:44 +01:00
Jenkins for ownCloud
a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Morris Jobke
75e6734ef4 Remove OC_Helper::imagePath and use the proper public interface 2016-01-24 18:04:20 +01:00
Thomas Müller
99e9c81c8b Merge pull request #21841 from owncloud/share2_deletefromself 
[Share 2.0] Add deleteFromSelf method
 2016-01-22 17:27:17 +01:00
Thomas Müller
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
Thomas Müller
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
Roeland Jago Douma
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
Thomas Müller
9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials 
External storage 'Login credentials' auth mechanism
 2016-01-22 13:14:14 +01:00
Thomas Müller
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
Thomas Müller
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
Lukas Reschke
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
Joas Schilling
31c5848e51 Allow automatic injection of the Manager 2016-01-22 11:02:40 +01:00
Thomas Müller
1410120758 Merge pull request #20768 from owncloud/mount-cache 
cache mountpoints in the db
 2016-01-22 11:01:54 +01:00
Joas Schilling
9ea7ae6f87 Adjust the since on the interface 2016-01-22 10:51:36 +01:00
Joas Schilling
ee02165005 Move the notification API to public namespace 2016-01-22 10:32:42 +01:00
Thomas Müller
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
Joas Schilling
3cca8498cb Make it possible to get a list of notifiers for a potential settings page 2016-01-22 08:47:21 +01:00
Morris Jobke
75ee5a9e9a Fix PHPDoc - @changed is no official tag -> use @since 2016-01-22 08:43:05 +01:00
Roman Kreisel
b35aa513ab Solves # 2016-01-21 17:29:14 +01:00
Roeland Jago Douma
658959592d [Share 2.0] Fix displaying old shares proplery 2016-01-21 16:06:12 +01:00
Roeland Jago Douma
3a582e88e5 Comments from Vincent 2016-01-21 16:06:12 +01:00
Roeland Jago Douma
9b5ea18ce5 Add Unit tests for the default share provider 2016-01-21 16:06:12 +01:00
Roeland Jago Douma
0a9cd91e1d [Share 2.0] Add subfiles=x 2016-01-21 15:56:44 +01:00
Roeland Jago Douma
0c9f881e7d [Share 2.0] Resolve group shares 2016-01-21 15:56:44 +01:00
Roeland Jago Douma
3666c34a19 [Sharing 2.0] Start with getShares 2016-01-21 15:56:44 +01:00
Thomas Müller
e2f231d051 Merge pull request #21761 from owncloud/share2_link 
Share2 link
 2016-01-21 15:43:08 +01:00
Thomas Müller
2b4532c6b9 Merge pull request #21797 from owncloud/proper-controller-in-core 
Move controller in core/ to a common subfolder
 2016-01-21 15:20:10 +01:00
Thomas Müller
7c7467fe42 Merge pull request #21792 from owncloud/systemtags-managerfactory 
Allow custom implementation of system tag managers
 2016-01-21 12:13:01 +01:00
Jenkins for ownCloud
50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00
Thomas Müller
2f7dcf1a2c Merge pull request #21782 from owncloud/update-system-addressbook-on-user-change-2 
Introduce IUser::setEMailAddress and add hook mechanism
 2016-01-21 00:07:46 +01:00
Roeland Jago Douma
e40d21673e [Share 2.0] Add fetching link shares to share manager 2016-01-20 21:12:26 +01:00
Lukas Reschke
ea367b598a Use path instead of app id 
This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …)

Also it adds an example command usage as well as a link to the documentation
 2016-01-20 20:38:18 +01:00
Vincent Petry
899f9bd113 Allow custom implementation of system tag managers 
Added config.php option to replace the default implementation of system
tag manager and system tag object mapper.

Also adjusted the comments manager factory to inject the server container
 2016-01-20 16:36:10 +01:00