upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 11:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
15762 commits 1033 branches 1221 tags 8.7 GiB
Commit graph

15762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
cf2af3ce4d Merge pull request #7633 from owncloud/fix-7582-stable6 
Fix 7582 stable6
 2014-03-10 15:10:07 +01:00
Thomas Müller
d54f314c93 fixing ident 2014-03-07 20:05:11 +01:00
Thomas Müller
ff078db8cb we first shall check if the current session is valid - otherwise the session-id will be regenerated on login via basic auth 2014-03-07 20:03:51 +01:00
Björn Schießle
acc35849af Merge pull request #7586 from owncloud/dont_create_shared_folder_stable6 
[oc6] don't allow to create a file or folder named 'Shared' in the root folder
 2014-03-07 10:31:08 +01:00
Frank Karlitschek
c9c91c7e15 Merge pull request #7609 from owncloud/fix-updater-6 
Use $installedVersion instead of $currentVersion
 2014-03-06 23:19:11 +01:00
Lukas Reschke
ce5f8d72a4 Use $installedVersion instead of $currentVersion 
Additionally use 6.00.4 as the internal version has been changed
 2014-03-06 22:43:08 +01:00
Vincent Petry
c358373dfa Merge pull request #7578 from owncloud/introduce-generateUrl-stable6 
adding new javascript function OC.generateUrl(url, params)
 2014-03-06 17:26:17 +01:00
Frank Karlitschek
95ddadd146 increase the version number 2014-03-06 16:52:44 +01:00
Morris Jobke
91392c5a87 add dprecated warning for OC.Router 2014-03-06 15:17:55 +01:00
Jan-Christoph Borchardt
26b70bce28 fix noise not repeating 2014-03-06 14:55:04 +01:00
Bjoern Schiessle
7f81b14eff don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-06 12:09:32 +01:00
Thomas Müller
87d385303f adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:28:11 +01:00
Lukas Reschke
eaf96335ad Merge pull request #7565 from owncloud/stable6-trusteddomainerrorpage 
[stable6] Show warning page when accessing server from an untrusted domain
 2014-03-05 21:04:11 +01:00
Vincent Petry
d7163c9b5a Fixed X-Forwarded-Host parsing 2014-03-05 20:06:05 +01:00
Vincent Petry
98ff74a70e Added unit tests for serverHost and other related functions 2014-03-05 20:06:04 +01:00
Vincent Petry
f1b948d4dc Added localhost as trusted domain 2014-03-05 18:59:34 +01:00
Vincent Petry
9b6b02af6d Show warning page when accessing server from an untrusted domain 
Added early check for the requested domain host and show a warning
page if the domain is not trusted.
 2014-03-05 18:59:34 +01:00
Jan-Christoph Borchardt
6b45835ecf add hover/focus states for star icons to hint at action 2014-03-05 15:29:52 +01:00
Bjoern Schiessle
c02c815603 don't create files folder, let ownCloud core handle it 2014-03-05 14:32:25 +01:00
Vincent Petry
5bf9aab464 Fixed configkey casing for PostgreSQL 
Backport of fd5dec0 from master
 2014-03-04 17:59:48 +01:00
Vincent Petry
722b81627c Merge pull request #7464 from owncloud/enc_fseek_fallback_stable6 
Enc fseek fallback stable6
 2014-03-04 12:53:08 +01:00
Vincent Petry
7e2659f017 Fix mail template to use p() for colors 
Now using p() instead of print_unescaped() for colors.

Backport of 25251d4 from master
 2014-03-03 17:43:52 +01:00
Frank Karlitschek
52b3187962 Merge pull request #7510 from owncloud/stable6-theme-mailtemplate 
[stable6] Enable theming of the mail template header
 2014-03-03 17:21:53 +01:00
Jan-Christoph Borchardt
b3c5aaa1ca make mail notification header color themable 2014-03-03 16:50:05 +01:00
Jan-Christoph Borchardt
ea62d23cb3 compress mail notification logo 2014-03-03 16:50:01 +01:00
Jan-Christoph Borchardt
289f64b191 mail template: remove off-white background color to better blend into mail client 2014-03-03 16:49:54 +01:00
Jan-Christoph Borchardt
5878d27068 remove border from log in input fields, simpler and works better with themes 2014-03-03 16:19:49 +01:00
Frank Karlitschek
071e371803 increasing the internal verison one more 2014-03-03 14:59:34 +01:00
Björn Schießle
ccf2bf74ea Merge pull request #7501 from owncloud/stable6-libxmlfixsubmoduleupdate 
Updated submodule for libxml entity fixes
 2014-03-03 13:04:05 +01:00
Vincent Petry
9e439305fd Updated submodule for libxml entity fixes 2014-03-03 12:58:18 +01:00
Björn Schießle
dadd67e7bd Merge pull request #7498 from owncloud/stable6-dbschemaxmlentityfix 
Allow XML entity loader for MDB2 schema loader
 2014-03-03 12:55:38 +01:00
Vincent Petry
762b0d9510 Allow XML entity loader for MDB2 schema loader 2014-03-03 12:15:51 +01:00
Frank Karlitschek
dc0a7428bd 6.0.2 2014-02-28 22:59:59 +01:00
Thomas Müller
7534fae9bc Merge pull request #7462 from owncloud/ldap_proxy_access 
Ldap proxy access
 2014-02-28 21:51:37 +01:00
Jan-Christoph Borchardt
68a9ceacbb Merge pull request #7472 from owncloud/stable6-icons.css-updates 
stable6 icons.css backports
 2014-02-28 15:24:56 +01:00
Jan-Christoph Borchardt
8a3a5a2ff1 icons: automatically show delete hover instead of using explicit class 2014-02-28 11:37:00 +01:00
jbtbnl
8995c81103 Remove necessity of icon class 
Only the icon specific class is needed
 2014-02-28 11:36:51 +01:00
jbtbnl
095f9114dd Add white color variant of checkmark icon 2014-02-28 11:36:39 +01:00
Arthur Schiwon
470a0ad611 remove remaining testing artefact 2014-02-28 10:58:51 +01:00
Bjoern Schiessle
9661001af1 remember original fopen access type in pre-proxy because sometimes they change 
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
 2014-02-28 10:38:58 +01:00
Vincent Petry
17f869b2fb Merge pull request #7459 from owncloud/deletestorage-legacy 
Also delete legacy storages when deleting a user
 2014-02-28 10:30:52 +01:00
Vincent Petry
162ba722f6 Merge pull request #7468 from owncloud/stable6-enc-fixfieldnametypo 
[stable6] Fixed wrong field name
 2014-02-27 23:52:20 +01:00
Vincent Petry
4756d18a14 Fixed wrong field name 
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
 2014-02-27 19:50:16 +01:00
Bjoern Schiessle
9cff832282 add test for the stream wrapper to read encrypted files from the system folder /tmp 2014-02-27 18:02:13 +01:00
Bjoern Schiessle
7ced22ccc6 test for isEncryptedPath() 2014-02-27 18:02:05 +01:00
Bjoern Schiessle
6455722f29 extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek 2014-02-27 18:01:58 +01:00
Bjoern Schiessle
8b3d99308c implement ftell stream wrapper and fix return value from fseek stream wrapper 2014-02-27 18:01:51 +01:00
Bjoern Schiessle
f87319f834 fall back to getLocalFile if storage doesn't support fseek 2014-02-27 18:01:45 +01:00
Arthur Schiwon
4605c2cc2d intendetion. where did the whitespaces come from? 2014-02-27 16:20:53 +01:00
Arthur Schiwon
49e567a5cc LDAP: let proxy for multiple server access methods from Access 2014-02-27 16:18:03 +01:00