upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-24 15:53:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
8969 commits 867 branches 1197 tags 8.3 GiB
Commit graph

4405 commits

Author SHA1 Message Date
Robin Appelman
a67f11c8af Sharing: partailly fix searchByMime 2013-01-28 21:25:19 +01:00
Robin Appelman
86e5a9cd73 Files: fix sharing newly uploaded files 2013-01-28 21:09:18 +01:00
Robin Appelman
929b8c3e69 fix files_version hooks 2013-01-28 20:04:10 +01:00
Robin Appelman
7207211f3a change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
Robin Appelman
74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Thomas Müller
31d83fddc4 Merge pull request #1321 from owncloud/csp-fixes 
Files: CSP fixes
 2013-01-28 00:29:46 -08:00
Michael Gapczynski
10c428830e Add create permission, fixes #780 2013-01-27 23:31:31 -05:00
Robin Appelman
bca5ce724e Merge branch 'master' into filesystem 2013-01-28 02:35:51 +01:00
Jenkins for ownCloud
b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke
6c882d9806 Remove outdated comments 2013-01-26 14:03:17 +01:00
Thomas Müller
276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master 
Fixing 998 master
 2013-01-26 04:15:40 -08:00
Jenkins for ownCloud
af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Lukas Reschke
047f1988c3 Merge branch 'master' into no-inline-js 2013-01-25 16:11:07 +01:00
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Thomas Mueller
ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Jenkins for ownCloud
3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Lukas Reschke
c8bbbb48d3 Merge master... 2013-01-23 11:30:40 +01:00
Thomas Mueller
5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Robin Appelman
f858381775 merge master into filesystem 2013-01-22 23:27:04 +01:00
Björn Schießle
367aadb3b7 rename 'publicListView' switch to 'disableSharing' because this is not only used for the public list view 2013-01-22 18:34:59 +01:00
Sam Tuke
aa648fca75 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/templates/settings.php
 2013-01-22 17:31:05 +00:00
Sam Tuke
47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Sam Tuke
619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
Lukas Reschke
bd5ff29716 Merge branch 'master' into no-inline-js 2013-01-22 11:50:33 +01:00
Michael Gapczynski
e666ce3622 Fix external storage UI for new storage namespaces 2013-01-21 23:57:26 -05:00
Robin Appelman
f2d0eeae83 Merge branch 'master' into filesystem 2013-01-22 00:19:44 +01:00
Lukas Reschke
8223117569 Remove closing tag 2013-01-21 22:29:27 +01:00
Robin Appelman
1762378f67 Files: don't load fileactions.js when upgrading filecache 2013-01-21 22:07:55 +01:00
Lukas Reschke
9bc8df3649 Move publicListView to external JS 2013-01-21 20:36:19 +01:00
Lukas Reschke
0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Robin Appelman
83d6221322 merge master into filesytem 2013-01-20 03:11:04 +01:00
Jenkins for ownCloud
ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Thomas Mueller
5d6c1d52bd replace #notification with OC.Notification call 2013-01-19 21:37:05 +01:00
Thomas Mueller
b8318e6df4 Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/js/files.js
 2013-01-19 15:58:15 +01:00
Lukas Reschke
53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php 
Remove uneeded file
 2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb Merge pull request #1228 from owncloud/generating_zip_message 
Make the ZIP download information friendlier
 2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Michael Gapczynski
8ca30d244c Implement getETag() in shared storage 2013-01-19 00:02:40 -05:00
Thomas Mueller
1dd70ac506 update used space percent after each ajax call and display the notification 2013-01-19 00:31:49 +01:00
Thomas Mueller
cdd07b3339 introducing class OCA/files/lib/Helper with new function to build an array with storage stats 
DRYing the code by using \OCA\files\lib\Helper::buildFileStorageStatistics()
now returning used space percent on each ajax call
 2013-01-19 00:31:09 +01:00
Jenkins for ownCloud
a17ca3a69a [tx-robot] updated from transifex 2013-01-19 00:05:38 +01:00
Thomas Mueller
afb5de955e Merge branch 'master' into fixing-998-master 
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
 2013-01-18 23:22:34 +01:00
Lukas Reschke
f447e6469f Remove uneeded file 
I don't saw any usage of this file through the code, I assume it can
safely be removed.
 2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00