Commit graph

28534 commits

Author SHA1 Message Date
Thomas Müller
a92a354c22 Merge pull request #20793 from owncloud/add-app-to-shiplist
Add Workflow app to shipped list
2015-11-27 14:47:41 +01:00
Joas Schilling
67a83d8fd6 Add Workflow app to shipped list 2015-11-27 14:26:39 +01:00
Thomas Müller
bdbefe17d6 Merge pull request #20782 from mitar/better-https
Also allow empty value for no-HTTPS
2015-11-27 14:24:23 +01:00
Thomas Müller
df4bd322b2 Merge pull request #20770 from owncloud/add-servercontainer-alias
Add full interface of server container as alias
2015-11-27 13:16:28 +01:00
Thomas Müller
1d30f0fcdb Merge pull request #20760 from owncloud/webdav-authredirectfix
Only reject ajax auth if user is really logged out
2015-11-27 13:16:01 +01:00
Thomas Müller
d0059da7f3 Merge pull request #20772 from owncloud/symfony_console-2.7.7
[3rdparty] bump symfony/console to 2.7.7
2015-11-27 11:51:45 +01:00
Mitar
e0e51fd79f Added tests. 2015-11-27 02:45:49 -08:00
Roeland Jago Douma
7e624ed241 [3rdparty] bump symfony/console to 2.7.7 2015-11-27 11:11:57 +01:00
Mitar
59511d97ee Also allow empty value for no-HTTPS.
This makes it work better with old version of Nginx.
2015-11-27 01:01:56 -08:00
Thomas Müller
9722935043 Merge pull request #20765 from owncloud/punic-1.6.3
[3rdparty] Bump punic to 1.6.3
2015-11-27 09:20:05 +01:00
Jenkins for ownCloud
39fb320bae [tx-robot] updated from transifex 2015-11-27 01:55:14 -05:00
Thomas Müller
06aeeb3366 Merge pull request #20706 from owncloud/federation-integration-tests
Split contexts and start of federation tests
2015-11-26 20:48:10 +01:00
Roeland Jago Douma
df8c1791ee [3rdparty] Bump punic to 1.6.3 2015-11-26 20:38:38 +01:00
Morris Jobke
7aed592957 Add full interface of server container as alias 2015-11-26 18:20:25 +01:00
Vincent Petry
d02e0eaaf1 Only reject ajax auth if user is really logged out 2015-11-26 17:04:21 +01:00
Sergio Bertolin
9d44576819 Restructured FeatureContext to reuse some parts and run two servers in parallel 2015-11-26 17:03:17 +01:00
Thomas Müller
8fe878afe9 Merge pull request #20602 from owncloud/fix-installed-apps
Always installed apps includes the hardcoded ones from shipped.json
2015-11-26 16:50:05 +01:00
Thomas Müller
80c43ffc6c Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
Thomas Müller
100d9e7457 Merge pull request #20752 from owncloud/assetic-1.3.2
[3rdparty] Bump assetic to 1.3.2
2015-11-26 16:47:35 +01:00
Thomas Müller
19d5059109 Merge pull request #20393 from owncloud/querybuilder-select-with-alias
Add a method to select a field or value with alias
2015-11-26 16:19:20 +01:00
Roeland Jago Douma
dbcee0449f [3rdparty] Bump assetic to 1.3.2 2015-11-26 15:47:51 +01:00
Thomas Müller
49b76114be Merge pull request #20742 from owncloud/symfony_routing-2.7.7
[3rdparty] Bump symfony/routing to 2.7.7
2015-11-26 15:46:14 +01:00
Thomas Müller
97ebc6d80c Merge pull request #20746 from owncloud/untangle-linkToDocs
Untangle the linkToDocs method in OC_Helper
2015-11-26 15:08:28 +01:00
Thomas Müller
95896411fb Merge pull request #20755 from owncloud/integration_test_not_sharee_requesting
Added test case about a user without a share requesting it
2015-11-26 15:07:01 +01:00
Thomas Müller
4d22c75d49 Merge pull request #20562 from owncloud/comments-interfaces
public interfaces for Comments
2015-11-26 15:06:35 +01:00
Sergio Bertolin
094a1bc7cb Added test case about a user without a share requesting it 2015-11-26 13:19:49 +00:00
Morris Jobke
675417a75c Untangle the linkToDocs method in OC_Helper
* now uses the proper URLGenerator interface
* add comment about DI problems
2015-11-26 13:58:43 +01:00
Roeland Jago Douma
142ba42fd9 [3rdparty] Bump symfony/routing to 2.7.7 2015-11-26 12:47:41 +01:00
Thomas Müller
3882cc8ef3 Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup
Remove last occurences of OC_Helper::getMimeType()
2015-11-26 12:37:25 +01:00
Thomas Müller
cc8c38e8ba Fix principal collection for CavDAVTester 2015-11-26 12:15:11 +01:00
Arthur Schiwon
d660c6162f proper description for IllegalIDChangeException 2015-11-26 12:15:00 +01:00
Thomas Müller
ff7d1eb931 Merge pull request #20707 from owncloud/files_external_table_status
Fix status icon styling for external storages
2015-11-26 12:01:53 +01:00
Thomas Müller
5a33390a69 Merge pull request #20731 from owncloud/per-storage-updater
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
Thomas Müller
f687616626 Merge pull request #20745 from owncloud/remove-unused-internal-methods
Remove unused internal methods
2015-11-26 12:01:31 +01:00
Morris Jobke
0b8296a756 remove unused method 2015-11-26 10:58:30 +01:00
Morris Jobke
4fcab98694 Remove unused internal methods
* removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace
* keeps public interface wrapper working as expected
2015-11-26 10:25:43 +01:00
Morris Jobke
9318606faf Remove last occurences of OC_Helper::getMimeType()
* ref #4774
2015-11-26 10:18:32 +01:00
Jenkins for ownCloud
dd18ea611b [tx-robot] updated from transifex 2015-11-26 01:55:22 -05:00
Thomas Müller
b799e42b4e Introduce \OCP\IUser::getEMailAddress() 2015-11-25 22:23:34 +01:00
Thomas Müller
c25a7cc4da Users are available under it's own principal resource named 'principals/users' this will allow us to introduce e.g. groups as principals (one day) and system specific principals (needed for federation) 2015-11-25 22:23:34 +01:00
Thomas Müller
28783030d0 Merge pull request #20680 from owncloud/add-dav-sync-support
Adding sync support - including dav tests
2015-11-25 22:13:55 +01:00
Thomas Müller
e0fa2f7b7e Update to sabre dav 3.0.x-dev 2015-11-25 21:14:16 +01:00
Thomas Müller
b02dea29e6 CardDavBackEnd requires principalBackend on ctor 2015-11-25 21:14:16 +01:00
Thomas Müller
54f26532de Use sqlite 2015-11-25 21:14:15 +01:00
Thomas Müller
06c85dd1eb Output owncloud.log to the console 2015-11-25 21:14:15 +01:00
Thomas Müller
d28390a649 Adding sync support - including dav tests 2015-11-25 21:14:15 +01:00
Thomas Müller
906aea4252 Merge pull request #19212 from owncloud/search-shortcut
Add Ctrl+F shortcut for the search bar
2015-11-25 20:02:13 +01:00
Thomas Müller
6b5460f755 Merge pull request #20733 from owncloud/scan-eventsource-no-paths
Dont output paths in scan.php
2015-11-25 20:01:52 +01:00
Thomas Müller
49779bb651 Merge pull request #20734 from owncloud/federation-icon
add icon for Federation app
2015-11-25 16:25:48 +01:00
Jan-Christoph Borchardt
38abdc1007 add icon for Federation app 2015-11-25 16:06:36 +01:00