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

5988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Tanghus
1e42cd162e Added types to emails. Support for custom types. Partial fix for oc-1508. 2012-08-21 00:20:18 +02:00
Thomas Tanghus
719ae155db Try to align and float contact parts better. 2012-08-21 00:20:18 +02:00
Arthur Schiwon
ef3eebfd3e Fix deletion for browser that do not support onBeforeUnload, fixes oc-1534. 2012-08-20 17:24:10 +02:00
Michael Gapczynski
cb0464ca4e Bump version number for Share API 2012-08-19 22:36:19 -04:00
Michael Gapczynski
82d81e8d39 Merge branch 'share_api' 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php
 2012-08-19 22:29:01 -04:00
Michael Gapczynski
5eca531f99 Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master. 2012-08-19 22:14:38 -04:00
Jenkins for ownCloud
f893d21660 [tx-robot] updated from transifex 2012-08-20 02:03:51 +02:00
Jenkins for ownCloud
36474e5681 [tx-robot] updated from transifex 2012-08-20 02:01:32 +02:00
Michael Gapczynski
f987e22d85 Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions 2012-08-19 16:30:38 -04:00
Thomas Tanghus
2d3ec5cb4b Removed stray img element. 2012-08-19 17:05:45 +02:00
Thomas Tanghus
4946e23bdc Strip slashes from commas and semi-colons. 2012-08-19 16:32:32 +02:00
Robin Appelman
a4e840f4f1 improve hasUpdated for archive storage backend 2012-08-19 06:29:57 +02:00
Robin Appelman
758ebe0446 don't report ctime in the archive storage backend since it isn't reliable 2012-08-19 06:18:40 +02:00
Robin Appelman
7f6a037b8c small fix for normalizing paths in archives 2012-08-19 06:15:33 +02:00
Robin Appelman
50cc5d5921 fix creating nested folders inside tar files 2012-08-19 05:54:16 +02:00
Robin Appelman
808d6c58fe ensure proper result format when using opendir on the archive storage backend 2012-08-19 05:45:55 +02:00
Robin Appelman
2ea46ee1ca better file_get_contents, file_put_contents and toTmpFile for archive storage backend 2012-08-19 05:05:55 +02:00
Robin Appelman
3da1339cd8 fix error when adding string data to an archive 2012-08-19 05:04:58 +02:00
Robin Appelman
154ce0f68d also add getLocalFolder to OC_Filsystem and OC_FilesystemView 2012-08-19 02:42:15 +02:00
Robin Appelman
9b44d0cb32 add OC_FileStorage::getLocalFolder 2012-08-19 02:30:33 +02:00
Robin Appelman
eb42148210 fix error in check if app is installed 2012-08-18 23:15:38 +02:00
Robin Appelman
5962469892 add OC_Archive::addRecursive 2012-08-18 22:42:35 +02:00
Lukas Reschke
d54390b1a0 Optimized image size 2012-08-18 13:56:04 +02:00
Lukas Reschke
6ef5edf5ea Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde. 2012-08-18 09:30:01 +02:00
Jenkins for ownCloud
f1cabdd8e0 [tx-robot] updated from transifex 2012-08-18 02:04:07 +02:00
Thomas Tanghus
c3cd49926a Merge commit 'refs/merge-requests/139' of git://gitorious.org/owncloud/owncloud into merge-requests/139 2012-08-18 00:40:29 +02:00
Georg Ehrke
41639f0517 fix fail in sql query of isDuplicate method of OC_Calendar_Import 2012-08-17 21:29:26 +02:00
Georg Ehrke
44272b9889 increase margin top of calendar import's color picker 2012-08-17 20:48:47 +02:00
Georg Ehrke
ced234a81a rename subadmin to group admin 2012-08-17 16:00:24 +02:00
Frank Karlitschek
850ee93711 add impress mimetype 2012-08-17 12:39:05 +02:00
Jenkins for ownCloud
017d8b410a [tx-robot] updated from transifex 2012-08-17 02:02:51 +02:00
Robin Appelman
53a888cc81 more path normalization 2012-08-17 01:22:54 +02:00
Jenkins for ownCloud
70e8a7e25c [tx-robot] updated from transifex 2012-08-17 00:45:46 +02:00
Anders Nor Berle
b6a3bf154d Comment out javascript that hides login button 
It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.
 2012-08-16 20:55:10 +00:00
Michael Gapczynski
df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Jenkins for ownCloud
1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Thomas Tanghus
4c638f101e Merge addressbooks. 2012-08-16 00:25:32 +02:00
Michael Gapczynski
9cb3113f42 Fix problems exposed by tests 2012-08-15 11:59:08 -04:00
Michael Gapczynski
137e4cb342 Add tests for Share API, all tests passing :) 2012-08-15 11:55:54 -04:00
Bart Visscher
dd3208fe6f Fix webfinger documentation 2012-08-15 14:50:25 +02:00
Jenkins for ownCloud
da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Michael Gapczynski
ddfa760a5e Change to correct function call getItemSharedWithBySource() 2012-08-14 17:06:41 -04:00
Michael Gapczynski
b440dfc67e Remove setTarget() function, changing target names only leads to confusion 2012-08-14 17:05:38 -04:00
Michael Gapczynski
9661a63a72 Ensure permissions can't be escalated during a reshare 2012-08-14 16:54:38 -04:00
Michael Gapczynski
028c79fc9d Use if instead of switch for detecting share type and throw exceptions when setting permissions 2012-08-14 16:30:13 -04:00
Thomas Tanghus
a75870489c Use correct class. 2012-08-14 20:06:45 +02:00
Lukas Reschke
db5b995a6b Disable user enumeration 2012-08-14 17:23:26 +02:00
Michael Gapczynski
937d1b29d8 Retrieve all file dependent items when looking for file item type 2012-08-14 11:02:29 -04:00
Michael Gapczynski
4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Arthur Schiwon
62e4f55f72 LDAP: adjust usersInGroup to updated interface 2012-08-14 14:30:03 +02:00