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

9124 commits

This branch
This branch
All branches
Author SHA1 Message Date
Björn Schießle
c00b66fe5b implement DisplayNamesInGroup for database back-end 2013-01-28 15:47:57 +01:00
Robin Appelman
232cc3211b add oc:// streamwrapper to provide access to ownCloud's virtual filesystem 2013-01-28 15:35:30 +01:00
Robin Appelman
c9c919da57 Move streamwrappers to seperate files and put them in a namespace 2013-01-28 15:34:15 +01:00
Björn Schießle
320233ec3d merge conflict fixed 2013-01-28 15:10:00 +01:00
Björn Schießle
e6cc0cd08a implement display names for the database back-end 2013-01-28 15:07:31 +01:00
Lukas Reschke
99ec26578a Merge pull request #1313 from owncloud/updater-CSP 
Make update page with CSP compatible
 2013-01-28 05:43:47 -08:00
Björn Schießle
3e0d117d60 add display name to the database table oc_users 2013-01-28 14:38:38 +01:00
Björn Schießle
70c3ab3c53 update the display name for the database back-end 2013-01-28 14:23:15 +01:00
Björn Schießle
e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Björn Schießle
022a7b13b8 prepare user table to show and edit display names 2013-01-28 13:12:44 +01:00
Björn Schießle
996b5cf368 change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names 2013-01-28 13:10:54 +01:00
Björn Schießle
f28857377d use hidden input field to disable sharing 2013-01-28 11:28:16 +01:00
Björn Schießle
8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Thomas Müller
857b15db37 Merge pull request #1318 from j-ed/master 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-28 01:42:46 -08:00
Thomas Mueller
1d44a99ebb Merge branch 'master' into updater-CSP 
Conflicts:
	core/templates/update.php
 2013-01-28 09:57:24 +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
Thomas Müller
44d6ff61e2 Merge pull request #1337 from owncloud/fix-issue-780 
Add create permission, fixes #780
 2013-01-27 23:52:09 -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
Robin Appelman
3e59a87153 Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view 2013-01-28 01:02:04 +01:00
Robin Appelman
577e3b11d7 Filesystem: return all matching mounts in Mount::findById 2013-01-28 00:59:43 +01:00
Jenkins for ownCloud
b655444709 [tx-robot] updated from transifex 2013-01-28 00:05:43 +01:00
Lukas Reschke
9e498b6548 Merge pull request #1326 from owncloud/event-source-token 
Use global oc_requesttoken for Event Source
 2013-01-26 15:18:23 -08:00
Robin Appelman
4cae141673 Filesystem: also add getPath to \OC\Filesystem 2013-01-27 00:18:15 +01:00
Robin Appelman
17bcea1585 Filesystem: add View->getPath to the cache api 2013-01-27 00:13:50 +01:00
Robin Appelman
9e2a066c7b Cache: add function to get storage id and internal path of a file by id 2013-01-27 00:13:50 +01:00
Robin Appelman
8c42e2de8c Test cases for new mount management 2013-01-27 00:13:49 +01:00
Robin Appelman
69f11151e9 Filesystem: add Mount::findById 2013-01-27 00:13:49 +01:00
Jenkins for ownCloud
00a28062e1 [tx-robot] updated from transifex 2013-01-27 00:06:21 +01:00
TheSFReader
9c7a18044d Merge remote-tracking branch 'refs/remotes/upstream/master' 2013-01-26 23:19:40 +01:00
Michael Gapczynski
0986b6f910 Use global oc_requesttoken for Event Source 2013-01-26 16:36:48 -05:00
Michael Gapczynski
03b947e3ec Don't check for updates for sub storages, these scans should be done in the background 2013-01-26 16:11:35 -05:00
Robin Appelman
f25db779d9 Filesystem: move mount management to it's own class 2013-01-26 21:44:33 +01:00
Robin Appelman
177537dbcc Cache: port test cases to PHPUnit 2013-01-26 21:44:33 +01:00
Michael Gapczynski
7237ebf08b Fix OC_Helper and change deprecated methods 2013-01-26 15:16:53 -05:00
Michael Gapczynski
31ebea0f6a Permanently display shared status icons 2013-01-26 13:25:15 -05:00
Robin Appelman
930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke
c9e25d3fab Merge pull request #1320 from owncloud/implements-1316-master 
lookup for OCA classes in all apps folders
 2013-01-26 05:20:15 -08: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
Lukas Reschke
7f0a3018b6 Fix undefined variable 2013-01-26 13:46:00 +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
Thomas Müller
3b547895ec Merge pull request #1306 from owncloud/smart-app-banner 
add smart app banner to promote ios app
 2013-01-26 04:00:57 -08:00
Thomas Mueller
2cc77759aa lookup for OCA classes in all apps folders 2013-01-26 12:45:50 +01:00
j-ed
93834b78a1 Update lib/mail.php 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-26 12:09:54 +01:00
j-ed
4d74738fe7 Update config/config.sample.php 
added parameter mail_smtpauthtype to set SMTP authentication type.
 2013-01-26 12:04:06 +01:00
Jenkins for ownCloud
af4411e33d [tx-robot] updated from transifex 2013-01-26 00:10:07 +01:00
Lukas Reschke
a65410f23c Remove the CSP header for Firefox 
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
 2013-01-25 21:57:51 +01:00
Lukas Reschke
dbc13cf6ee Move update inline JS 2013-01-25 19:18:16 +01:00
Lukas Reschke
7f49d35930 Move checkMaintenance and checkUpgrade 
This is needed to ensure that the routing and linkTo() function for CSP
are available.
 2013-01-25 19:15:02 +01:00