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

33674 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Appelman
31ea10b04e
add missing var 2016-07-08 12:35:43 +02:00
Robin Appelman
951ff0897c
hint global handlebars 2016-07-08 12:35:33 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type 2016-07-08 12:35:23 +02:00
Robin Appelman
8f84c99e3f
Fix undefined properties 2016-07-08 12:35:16 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
c8ba8f637e Merge pull request #314 from jernst/master 
Allow wildcard * to be used in trusted domains
 2016-07-07 19:34:11 +02:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Johannes Ernst
c2309f1bcd Extended documentation on trusted_domains to cover ports and wildcards. 2016-07-07 16:23:20 +00:00
Morris Jobke
f5ed016170 Merge pull request #312 from nextcloud/files-other-lists-goto 
Add "goto" links for files in non-default file lists
 2016-07-07 15:48:38 +02:00
Morris Jobke
beae00a5e5 Simplify test code and don't show anything if no date is set 2016-07-07 15:10:04 +02:00
Morris Jobke
43b26b9506 add unit tests 2016-07-07 15:10:04 +02:00
Morris Jobke
059cc1f22e Update header during update callback 2016-07-07 15:10:03 +02:00
Morris Jobke
c809db86f5 Not set expiration date is represented as 0 2016-07-07 15:10:03 +02:00
Morris Jobke
ab3c8d4de9 add "Never" if expiration date is not set 2016-07-07 15:10:03 +02:00
Morris Jobke
b5dea82e45 Add expiration date to share by link view 2016-07-07 15:10:03 +02:00
Juan Pablo Villafáñez
6d680bdebf Change png icons to svg 2016-07-07 15:09:28 +02:00
Morris Jobke
2791b8f00d Revert "occ web executor (#24957)" 
This reverts commit 854352d9a0.
 2016-07-07 12:14:45 +02:00
Morris Jobke
e3b509220b Revert "Bypass upgrade page when occ controller is requested" 
This reverts commit 89e581acf8.
 2016-07-07 12:14:39 +02:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Morris Jobke
ed28885d73 Merge pull request #323 from Faldon/database_port 
Added occ install option for database-port
 2016-07-07 10:20:08 +02:00
Jenkins for ownCloud
38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Johannes Ernst
66a134e69e Disallow certain malformed domain names even if they match the trusted domain expression 
Stricter checking for valid domain names
 2016-07-06 23:51:04 +00:00
Johannes Ernst
2b4ceae620 Trusted domain wildcard checking made shorter, supporting multiple * 
Added test cases
 2016-07-06 23:38:30 +00:00
Vincent Petry
d769e718a5 Set content type when downloading log file to force download in some browsers (#25382) 2016-07-06 22:47:16 +02:00
Vincent Petry
dc21a38a85 Use named parameter instead of direct value for system tags search param (#25380) 2016-07-06 22:39:34 +02:00
Roeland Douma
f78f44d1e9 Merge pull request #327 from nextcloud/add-php-5.4-5.5 
Add PHP 5.4 and 5.5 jobs to CI
 2016-07-06 16:37:57 +02:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Morris Jobke
e328d98b6c Add PHP 5.4 and 5.5 jobs to CI 2016-07-06 15:01:11 +02:00
Morris Jobke
e1abe5a62b Merge pull request #324 from nextcloud/fix-naming-issue-drone 
Fix docker image naming issue for CI
 2016-07-06 14:48:30 +02:00
Morris Jobke
cb69571cda Fix docker image naming issue for CI 
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
 2016-07-06 13:25:13 +02:00
Vincent Petry
21b5533b83 Merge pull request #25361 from owncloud/sharing-inttestforusershareaftergroupshare 
Add integration test for sharing with group, then user in group
 2016-07-06 12:49:30 +02:00
Vincent Petry
cf6fe95cbf Merge pull request #25325 from owncloud/filelist-prependslash 
Filelist change dir auto-prepend slash
 2016-07-06 12:44:03 +02:00
Vincent Petry
1f9d728538 Ignore invalid paths in the JS file list (#25368) 2016-07-06 11:55:02 +02:00
Thomas Pulzer
0638937ada Changed the input option for database-port to required when parameter was provided. 
Added casting database port to int for input sanitation in pgsql and oci connections.
 2016-07-06 11:31:28 +02:00
Carlos Damken
d58e6b59d3 Upgrading the log level From Debug to INFO to be consistent with files_trashbin (#25367) 2016-07-06 10:33:31 +02:00
Thomas Pulzer
d367318088 Added occ install option for database-port. 
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
 2016-07-06 09:58:38 +02:00
Roeland Douma
54666a6418 Merge pull request #319 from nextcloud/config-sample 
Fix config sample text
 2016-07-06 09:58:14 +02:00
Morris Jobke
68b03a0eab Fix config sample text 2016-07-06 08:59:38 +02:00
Jenkins for ownCloud
6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
Johannes Ernst
3516b58be6 Duh, no 'next' in PHP. 
Use === instead of == for extra paranoia.
 2016-07-06 04:51:49 +00:00
Robin Appelman
d623763aac Add "goto" links for files in non-default file lists 2016-07-05 22:22:55 +02:00
Johannes Ernst
b1867dc8d1 Allow wildcard * to be used in trusted domains, to support setups where no reliable DNS entry is available (e.g. mDNS) or for simple-to-setup aliasing (e.g. *.example.com) 2016-07-05 18:49:18 +00:00
Joas Schilling
fcf25864d6 Merge pull request #311 from Bugsbane/master 
Update system tags icon
 2016-07-05 13:52:17 +02:00
Bugsbane
29ffe0b790 Replace tag svg with optimized version 
Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
 2016-07-05 06:52:10 -04:00
Bugsbane
01149c9e97 Clean the svg with inkscapes clean document function 2016-07-05 06:18:02 -04:00
Bugsbane
515df6db59 Update system tags icon 
Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
 2016-07-05 06:16:25 -04:00
Vincent Petry
563c895a46 Merge pull request #25356 from owncloud/checkupgrade-bypass 
Bypass upgrade page when occ controller is requested
 2016-07-05 12:04:19 +02:00
Vincent Petry
b77fcc19d4 Merge pull request #25344 from owncloud/fix-ldap-check-user 
check if renamed user is still valid by reapplying the ldap filter
 2016-07-05 11:29:55 +02:00