Georg Ehrke
|
4700222ea9
|
Merge branch 'master' into subadmin
|
2012-07-15 16:33:17 +02:00 |
|
Georg Ehrke
|
044134a289
|
add another file which was missing in the previous commit
|
2012-07-15 16:32:57 +02:00 |
|
Georg Ehrke
|
e707e94857
|
subadmins can now add users
|
2012-07-15 16:31:28 +02:00 |
Thomas Tanghus
|
160e701fbf
|
Make list droppable too instead of just the header.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
db034f05ca
|
Improve temp file handling.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
8b49e304e0
|
Hide file form field behind image so it will maybe work with IE...
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
48521fcfaa
|
Made notifications more flexible.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
d71da67bee
|
Typo.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
7af608881b
|
Added notification.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
4e684b9e9d
|
Fixed sorting of addressbooks.
|
2012-07-15 12:28:29 +02:00 |
|
Thomas Tanghus
|
287285880c
|
Removed obsolete TODO.
|
2012-07-15 12:28:28 +02:00 |
Thomas Mueller
|
ce40576881
|
MySql testing added
|
2012-07-15 12:09:15 +02:00 |
|
Thomas Tanghus
|
eba4f08015
|
Refactored contacts import.
|
2012-07-15 04:17:30 +02:00 |
|
Thomas Tanghus
|
87912a8c65
|
Fix loading previous or next contact after deleting one.
|
2012-07-15 04:17:30 +02:00 |
Michael Gapczynski
|
b455149bae
|
Fix undo delete user
|
2012-07-14 16:57:16 -04:00 |
|
Michael Gapczynski
|
1ff2dd8f63
|
Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks
|
2012-07-14 14:06:57 -04:00 |
|
Michael Gapczynski
|
cc6c940b9a
|
Implement post_removeFromGroup()
|
2012-07-14 11:55:22 -04:00 |
|
Michael Gapczynski
|
82dea705d4
|
Add option to delete() to check the owner of the first search of reshares
|
2012-07-14 11:53:02 -04:00 |
|
Michael Gapczynski
|
0e9ab5cf2a
|
Fix post_deleteUser(), column name changed and item_source is no longer needed
|
2012-07-14 11:02:16 -04:00 |
|
Michael Gapczynski
|
459bcd8d5e
|
Update documentation
|
2012-07-14 10:55:34 -04:00 |
|
Michael Gapczynski
|
bbbfc2c565
|
Fix delete(), it was going in an infinite loop
|
2012-07-14 10:52:31 -04:00 |
|
Michael Gapczynski
|
8de69fcb18
|
Update documentation
|
2012-07-14 10:19:18 -04:00 |
|
Michael Gapczynski
|
51a4518396
|
Add support for CRUDS permissions
|
2012-07-14 09:35:39 -04:00 |
|
Thomas Tanghus
|
140263003a
|
Give default address book a more intuitive name and replace spaces with underscores in uri.
|
2012-07-14 14:11:43 +02:00 |
|
Thomas Tanghus
|
d45d73eecf
|
Try to avoid occasional error messages.
|
2012-07-14 14:11:43 +02:00 |
Robin Appelman
|
880d80be67
|
fix minified js and css
|
2012-07-14 00:10:17 +02:00 |
|
Robin Appelman
|
7d1f644011
|
use new way to register remote/public.php entries in user_webfinger
|
2012-07-13 23:24:22 +02:00 |
|
Robin Appelman
|
b45d3ced79
|
fix remote and public.php
|
2012-07-13 22:44:35 +02:00 |
Bjoern Schiessle
|
50eef9a71c
|
update script to fix fscache
|
2012-07-13 15:17:36 +02:00 |
|
Thomas Mueller
|
6ee228cac7
|
rediect test results to autotest-results-sqlite.xml
|
2012-07-13 15:10:30 +02:00 |
|
Thomas Mueller
|
fd0c6da410
|
autotest.sh added: create an fresh environment using sqlite (mysql anf pg will follow) and executes the test suite
|
2012-07-13 13:55:15 +02:00 |
|
Thomas Mueller
|
5de2a292fc
|
restructuring test suite invocation - now we load all test cases into one suite and execute this single suite. this is necessary to be able to generate one xml report and is also a precondition for code coverage analysis(which will follow soon)
|
2012-07-13 13:41:13 +02:00 |
|
Thomas Mueller
|
967c6d7d3c
|
allow command line based installation/setup
|
2012-07-13 13:25:43 +02:00 |
|
Bjoern Schiessle
|
80ed5412f1
|
if the '/Shared' was the modified directory, than scan it.
|
2012-07-13 11:57:14 +02:00 |
|
Michael Gapczynski
|
f638340d1f
|
Add check for folder item type as well
|
2012-07-12 14:29:51 -04:00 |
|
Michael Gapczynski
|
63b6f20e05
|
Move already shared with check out of user and group cases, and add check for already shared with inside a collection
|
2012-07-12 12:11:04 -04:00 |
|
Michael Gapczynski
|
ecae3ea430
|
Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type
|
2012-07-12 12:10:50 -04:00 |
|
Michael Gapczynski
|
bdcfa4bb63
|
Add check if file is found in file cache
|
2012-07-11 20:43:48 -04:00 |
|
Michael Gapczynski
|
f496a9dea6
|
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
|
2012-07-11 20:29:59 -04:00 |
|
Michael Gapczynski
|
ac395dced1
|
Rename $contacts to $has_contacts, it missed this commit: 7cb74a0
|
2012-07-11 20:28:29 -04:00 |
|
Michael Gapczynski
|
4bf13adff2
|
Merge branch 'master' into share_api
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
|
2012-07-11 20:25:59 -04:00 |
|
Michael Gapczynski
|
88f4845ca3
|
Sanitization isn't required here
|
2012-07-11 20:04:18 -04:00 |
|
Michael Gapczynski
|
7b2ec41477
|
Revert santizing toaddress, because PHPMailer now throws exceptions
Conflicts:
apps/files_sharing/ajax/email.php
|
2012-07-11 19:38:57 -04:00 |
|
Michael Gapczynski
|
632fc6ec61
|
Fix log write() parameters in wrong order
|
2012-07-11 19:38:57 -04:00 |
Lukas Reschke
|
ac5abc5603
|
Handling exceptions
|
2012-07-11 19:38:57 -04:00 |
|
Michael Gapczynski
|
e887fd7ba8
|
Catch exceptions from PHPMailer
|
2012-07-11 19:38:57 -04:00 |
|
Michael Gapczynski
|
ebcf5bce3c
|
Sanitize toaddress for emailing private links
Conflicts:
apps/files_sharing/ajax/email.php
|
2012-07-11 19:38:56 -04:00 |
|
Michael Gapczynski
|
71491612e3
|
Move line counter so we only count lines towards the offset that are equal or above the log level
|
2012-07-11 19:38:56 -04:00 |
|
Michael Gapczynski
|
bc3462f022
|
Improvements and bug fix for log reading, fixes bug oc-982
|
2012-07-11 19:38:56 -04:00 |
|
Michael Gapczynski
|
8890a41280
|
Fix setting custom quota size for users, bug fix for oc-1128
|
2012-07-11 18:25:08 -04:00 |