Commit Graph

2174 Commits

Author SHA1 Message Date
Arthur Schiwon 5a1ea62437 LDAP: Fall back to Base DN if user/group base settings are blanked 2012-05-07 18:38:02 +02:00
Michael Gapczynski bf8b3b0696 Forgot to set token variable 2012-05-07 12:36:29 -04:00
Arthur Schiwon e9c7ecf22d applying coding guideline 2012-05-07 17:35:23 +02:00
Arthur Schiwon 0ff5ab65be applying coding guideline 2012-05-07 17:35:23 +02:00
Michael Gapczynski e0a5f976e7 Fix bug oc-542, encode urls for private links 2012-05-07 11:30:36 -04:00
Michael Gapczynski 71423ec566 Fix bug oc-402, check if token is set for a private link 2012-05-07 10:47:55 -04:00
Michael Gapczynski b9033d3b78 Only load sharing statuses if in files app 2012-05-07 10:47:55 -04:00
Georg Ehrke f28d71bb9c fix gallery sharing 2012-05-07 16:46:35 +02:00
Georg Ehrke ef073a148f make calendar compatible with public.php 2012-05-07 15:48:41 +02:00
Georg Ehrke 936c8ba1cc improve remote.php and create public.php 2012-05-07 15:39:17 +02:00
Georg Ehrke 5904d5cf50 Merge branch 'remote.php' 2012-05-07 15:07:16 +02:00
Georg Ehrke 1138df0f4b fix webdav, bloody merge conflicts 2012-05-07 12:47:34 +02:00
Georg Ehrke 6bdbcc1f49 fix path of carddav in addressbook management 2012-05-07 12:18:58 +02:00
Georg Ehrke b125caaaf6 fix path of caldav in calendar management 2012-05-07 12:16:25 +02:00
Georg Ehrke ef10603c26 fix pathes in calendar and contacts 2012-05-07 12:02:20 +02:00
Georg Ehrke 46fe2e3e2a fix merge conflicts 2012-05-07 11:47:14 +02:00
Georg Ehrke 7d2a68fc31 make carddav work with remote.php 2012-05-07 11:24:19 +02:00
Florian Hülsmann 8534373f2f better invalid webfinger URI handling 2012-05-07 11:15:24 +02:00
Michiel de Jong 3a184e2e1d whitespace correction in webfinger.php 2012-05-07 09:51:37 +02:00
Michiel de Jong c4e47953ac require base lib and deal with malformed user addresses in webfinger.php 2012-05-07 09:46:15 +02:00
Michiel de Jong 5155f589fd prevent xss in webfinger 2012-05-07 09:26:54 +02:00
Thomas Tanghus 65b9850e53 Code cleanup. 2012-05-07 04:46:09 +02:00
Michael Gapczynski 471cad7d90 Remove manual file cache insertions of shared files, update mtime of shared folder 2012-05-06 20:14:29 -04:00
Michael Gapczynski 41179a1456 Fix feedback for sharing errors 2012-05-06 19:06:24 -04:00
Brice Maron 333345d201 Add php-pdo to soft depend check 2012-05-06 21:42:33 +00:00
Brice Maron fe8b10a922 Add php-xml as dependency for core fix oc-364 2012-05-06 21:38:35 +00:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Thomas Tanghus 2488cdb8a1 Calendar: Fixed image paths. 2012-05-06 19:19:16 +02:00
Thomas Tanghus 5bf69cace1 Contacts: Re-added some styling that got lost in a revert. 2012-05-06 19:19:15 +02:00
Brice Maron 9dbc6b5158 Correct wrong DB quotes for calendar share functions 2012-05-06 15:41:14 +00:00
Thomas Tanghus bede32be24 Contacts: Fix for Android browser again, again. 2012-05-06 13:51:16 +02:00
Thomas Tanghus c1019a6e98 Contacts: Resized Add button. Now how do I add a gradient? ;-) 2012-05-06 13:51:16 +02:00
Thomas Tanghus 400ade063c Revert Android positioning 'fix'.
This reverts commit 20f1c1e6ca and 93ae945414.
2012-05-06 13:51:16 +02:00
Thomas Tanghus f2ec68d40c Revert "Contacts: Fix for leftcontent positioning in Android browser."
This reverts commit 93ae945414.
2012-05-06 13:51:16 +02:00
Bart Visscher f69f764e8b Working remote.php with webdav and caldav 2012-05-06 00:12:51 +02:00
Georg Ehrke c996600786 push changes 2012-05-05 22:54:14 +02:00
Georg Ehrke 6c2fc0cbe8 fix writing of webdav.php 2012-05-05 20:43:11 +02:00
Georg Ehrke aa4f01fbcc fix pathes for cal andcarddav 2012-05-05 18:58:58 +02:00
Georg Ehrke 4b4c3c3f3a remove debug messages 2012-05-05 18:58:58 +02:00
Bart Visscher 24a8451b2e Tasks: Fix addtask for <5.4 php version 2012-05-05 18:48:24 +02:00
Georg Ehrke 101406eba7 fix writing in remote folder 2012-05-05 18:29:26 +02:00
Bart Visscher 2facf509cc Merge branch 'tasks' for Tasks app 2012-05-05 18:26:13 +02:00
Bart Visscher 2092caf6d3 Tasks: Fix add task action 2012-05-05 18:16:14 +02:00
Robin Appelman 70cb053e6b improve cryptstream fro writing non-chunksized data 2012-05-05 16:49:48 +02:00
Robin Appelman d875191777 only emit the filesystem hooks once when creating a new file 2012-05-05 16:49:48 +02:00
Florian Hülsmann 4a7591d0ab Custom icons for contacts app 2012-05-05 16:31:58 +02:00
Thomas Tanghus 74a0df335a Contacts: Make editable fields more discoverable. Align group field vertically #pixelpushing 2012-05-05 15:23:48 +02:00
Thomas Tanghus eda42cece9 Contacts: Don't try to render invalid properties. 2012-05-05 13:49:47 +02:00
Thomas Tanghus f9aadfff7a Contacts: Set min-width on note to make it render correctly. 2012-05-05 13:49:47 +02:00
Frank Karlitschek 9bcc5c11a8 porting the hooks and starting with the templates 2012-05-05 10:18:45 +02:00
Thomas Tanghus 2c264f836c Contacts: Better checks for GD library. 2012-05-04 23:53:29 +02:00
Bart Visscher d0b7b01737 Tasks: Some styling 2012-05-04 20:57:37 +02:00
Bart Visscher 19d2b94837 Tasks: More updates to public API 2012-05-04 20:20:37 +02:00
Thomas Tanghus 76b8d06284 Add missing file. 2012-05-04 20:17:15 +02:00
Bart Visscher 1fef13b0c0 Calendar: Use array_merge to join event arrays 2012-05-04 17:34:13 +02:00
Bart Visscher eae21f3269 Tasks: Fix ajax calls in javascript 2012-05-04 17:27:10 +02:00
Bart Visscher 0006b432f5 Tasks: Update for movable apps 2012-05-04 17:20:24 +02:00
Bart Visscher 439467746a Tasks: Update to new public API 2012-05-04 17:19:25 +02:00
Bart Visscher 1e47156226 Merge branch 'master' into tasks 2012-05-04 17:04:11 +02:00
Thomas Tanghus 01da64caf7 Contacts: Changed the Add property button to not fixed and use plain button. 2012-05-04 16:36:45 +02:00
Thomas Tanghus 248eae2d0f Contacts: Improve NOTE UI. Cleanup markup. 2012-05-04 15:47:55 +02:00
Arthur Schiwon 907fa9d85b LDAP: check first, if requested attribute exists 2012-05-04 14:13:23 +02:00
Arthur Schiwon 716c5a3c8e LDAP: use the correct attribute for the display name 2012-05-04 14:02:04 +02:00
Arthur Schiwon 231eec7325 LDAP: also those functions were not meant to be static 2012-05-04 13:48:55 +02:00
Arthur Schiwon 6c670cb82d LDAP: more cleanup 2012-05-04 13:48:18 +02:00
Arthur Schiwon 333e8986f6 LDAP: copyright stuff 2012-05-04 13:26:07 +02:00
Arthur Schiwon def59755ad LDAP: cleanup 2012-05-04 13:26:07 +02:00
Arthur Schiwon adb32ad347 LDAP: checkPassword ain't static 2012-05-04 13:26:07 +02:00
Arthur Schiwon 594221a467 LDAP: make oc_user_ldap::checkPassword make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 3499783ea5 remove debug info 2012-05-04 13:26:07 +02:00
Arthur Schiwon 7aad40ca4d LDAP: make oc_user_ldap::userExists make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 6f982d2e20 LDAP: make oc_user_ldap::getUsers make use of central OC_LDAP 2012-05-04 13:26:07 +02:00
Arthur Schiwon 7a06e144ec LDAP: central function for user and group list retrieval (will replace retrieveList from group part) 2012-05-04 13:26:07 +02:00
Thomas Tanghus 2296521a2e Changed $APPROOT to $APPSROOT as in https://gitorious.org/owncloud/owncloud/merge_requests/116 2012-05-04 11:16:29 +02:00
Thomas Tanghus e61e40c23d Contacts: Hack around malformed BDAY. 2012-05-04 01:27:59 +02:00
Thomas Tanghus bde5b4a7ff Contacts: Don't load event handlers more than once, or you're asking for trouble :-P 2012-05-04 00:13:35 +02:00
Bart Visscher 07ff1e723a Calendar: Fix repeating events 2012-05-03 23:33:44 +02:00
Bart Visscher 89c8316f8f Merge branch 'master' of git://gitorious.org/owncloud/owncloud 2012-05-03 23:26:43 +02:00
Bart Visscher 077ea94f71 Merge commit 'refs/merge-requests/89' of git://gitorious.org/owncloud/owncloud
Conflicts:
	apps/calendar/ajax/events.php
2012-05-03 23:18:43 +02:00
Arthur Schiwon 76a60a2fc3 ups, we don't have a CSS file therefore 2012-05-03 23:03:05 +02:00
Bart Visscher b6ea57c8b6 Bookmarks: Move delete code to Bookmarks class, also change to use id 2012-05-03 17:33:57 +02:00
Thomas Tanghus 8076b1e12d Contacts: Remove some logging. 2012-05-03 16:01:40 +02:00
Thomas Tanghus a89231ac1d Contacts: Clean up tipsies. 2012-05-03 16:01:40 +02:00
Thomas Tanghus 5be9084c73 Contacts: Fixed paths in import. 2012-05-03 16:01:40 +02:00
Thomas Tanghus cbee0d3128 Contacts: Fix paths and improve markup and css in address book overview. 2012-05-03 16:01:40 +02:00
Frank Karlitschek 97a8af7f25 ported oc_db 2012-05-03 13:06:08 +02:00
Frank Karlitschek 43caa3b3b9 ported oc_json 2012-05-03 12:23:29 +02:00
Thomas Tanghus 375ba98645 Contacts: Move gif used by jquery.Jcrop and make style sheet use %webroot% path. 2012-05-03 11:15:44 +02:00
Thomas Tanghus 15be032740 Contacts: Improve loading contact. 2012-05-03 11:15:44 +02:00
Thomas Tanghus 6cc9f600d2 Contacts: Don't resize profile picture if it's not too big. 2012-05-03 11:15:44 +02:00
Frank Karlitschek 351740601a port oc_response 2012-05-03 10:46:27 +02:00
Michael Gapczynski 80dff77b65 Fix private links 2012-05-02 19:24:43 -04:00
Robin Appelman e5ef3e1340 move archive library to core so we can properly depend on it 2012-05-02 23:48:23 +02:00
Robin Appelman 0b51c53443 run none of the extranal storage tests on default 2012-05-02 23:44:00 +02:00
Robin Appelman 4ba527625f don't try to register file actions when we're not in the files app 2012-05-02 23:26:57 +02:00
Bart Visscher 47081a2471 Gallery: Update version for database update 2012-05-02 21:36:34 +02:00
Bart Visscher f7e410147f Contacts: check for malformed VCards in calendar hook 2012-05-02 21:36:33 +02:00
Michael Gapczynski 6d37b8567b Refactoring and upload support for Google Drive backend 2012-05-02 14:41:57 -04:00
Frank Karlitschek 4fe90f62f4 port checkAppEnabled 2012-05-02 19:08:37 +02:00
Frank Karlitschek eec7c3833c fix install 2012-05-02 19:02:41 +02:00
Bart Visscher 71f9b1968e Tasks: Make it possible to close the details area 2012-05-02 17:28:19 +02:00
Georg Ehrke 33c343ed11 add require_once('../lib/base.php'); to webdav.php 2012-05-02 16:47:25 +02:00
Georg Ehrke da03d05700 create folder 'remote' for the remote services like caldav, carddav and webdav 2012-05-02 16:41:23 +02:00
Frank Karlitschek 82a61e2e1a port oc_preferences 2012-05-02 15:54:34 +02:00
Frank Karlitschek ff66600bc0 port appconfig 2012-05-02 14:11:29 +02:00
Frank Karlitschek 8e99475886 first part of the config stuff 2012-05-02 13:28:56 +02:00
Frank Karlitschek 8c7f854671 move all the files stuff into a files class 2012-05-02 12:54:31 +02:00
Thomas Tanghus f1830866a3 Contacts: Removed styling and (most) js from template. Started making app more keyboard/screenreader friendly. General cleanup in code and markup. 2012-05-02 12:10:44 +02:00
Thomas Tanghus 72256abf34 Contacts: Trying to improve PHOTO handling a bit. 2012-05-02 11:44:00 +02:00
Arthur Schiwon 6750998984 files is not internal any more, part II 2012-05-02 11:26:22 +02:00
Thomas Müller 8ed8d9cd91 fixing namespace 2012-05-02 00:55:26 +02:00
Frank Karlitschek 2fe646dcec ported the oc_app calls 2012-05-02 00:50:26 +02:00
Frank Karlitschek 93b63cf375 ported the rest of the OC_Helper calls 2012-05-02 00:20:45 +02:00
Frank Karlitschek e48f511606 port linkto and serverHost 2012-05-01 23:19:39 +02:00
Frank Karlitschek 31e32e3c10 ported checkLoggedIn and checkAdmin 2012-05-01 22:59:38 +02:00
Frank Karlitschek e2fb094693 some more porting 2012-05-01 21:07:08 +02:00
Frank Karlitschek ab58471904 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-01 20:07:36 +02:00
Frank Karlitschek 1a2bbd2ee4 ported addSyript and other small stuff 2012-05-01 20:03:41 +02:00
Michael Gapczynski 20f3875f1b Change default from address to sharing-noreply@server for emailing private links 2012-05-01 13:06:17 -04:00
Frank Karlitschek 254b8b9506 porting of OC_User to public API complete.
What better thing to do during a long train ride than refactoring ;-)
2012-05-01 19:04:20 +02:00
Frank Karlitschek 70cea18cce ported getUser 2012-05-01 18:50:31 +02:00
Frank Karlitschek 5bf69237b2 ported isLoggedIn 2012-05-01 18:46:15 +02:00
Frank Karlitschek d0554bef06 finish porting of the LOG calls or the apps to the public api 2012-05-01 17:38:27 +02:00
Frank Karlitschek 3f9ac6405a port some of the log call to the new public api
more to come
2012-05-01 14:29:34 +02:00
Arthur Schiwon 51b6aab436 LDAP: remove Notices on settings 2012-05-01 12:25:17 +02:00
Arthur Schiwon 54854b2e3d LDAP: decent behaviour and log message when there is no connection to the LDAP server 2012-05-01 12:17:33 +02:00
Bartek Przybylski 11314c81d9 add/remove handlers 2012-05-01 10:07:48 +02:00
Frank Karlitschek e8ec999090 port to use the new public api 2012-05-01 09:49:22 +02:00
Frank Karlitschek e409e7cd4c forgot a file 2012-05-01 09:38:10 +02:00
Thomas Müller 5193ddd7d7 fixing syntax error 2012-04-30 21:55:25 +02:00
Georg Ehrke 8a3d41c043 fix a PHP Notice 2012-04-30 21:46:33 +02:00
Georg Ehrke 6c908a4cd0 fix path in calendars geo.js 2012-04-30 21:18:54 +02:00
Frank Karlitschek f425b80deb one todo less 2012-04-30 19:21:29 +02:00
Frank Karlitschek b20b30b6fe Implement a basic versioning configuration. Only a on/off switch for now.
I changed my mind about the more complex configuration options. We go with good default for now and don´t expose all the technical options to the users.
They can still override in the config file if it´s really really needed and they know what they are doing
2012-04-30 19:18:00 +02:00
Thomas Mueller 07f2e316e4 removing executable bit from various files 2012-04-30 12:05:57 +02:00
Thomas Tanghus 9c520c70a8 Various file path fixes. 2012-04-30 01:48:01 +02:00
Thomas Tanghus a8b6fdd396 Contacts: Small css tweaks. 2012-04-30 01:01:24 +02:00
Thomas Tanghus 0bccd9c18c Contacts: Forgot to add the import template. 2012-04-29 23:26:14 +02:00
Thomas Tanghus f6fefe9a36 Contacts: Ensure TYPE parameters on email aren't deleted on edit. They are still not shown in the UI.
Remove an obsolute file and did some cleanup.
2012-04-29 22:12:27 +02:00
Thomas Tanghus 023479b1e2 Contacts: removed unused method and ajax file. 2012-04-29 22:12:27 +02:00
Thomas Tanghus 163344243b jquery.combobox: Added 'showButton' option 2012-04-29 22:12:27 +02:00
Frank Karlitschek b862c49ae6 enable by default. at least during oC4 testing 2012-04-29 21:18:28 +02:00
Frank Karlitschek 0d0129221b add a info.xml to files 2012-04-29 21:17:22 +02:00
Robin Appelman 84bd83b1dc fix file deletion 2012-04-29 16:09:41 +02:00
NIEK Antoine c6f034a5d2 Support "songs" ampache API action for proper rhythmbox support 2012-04-29 00:47:57 +02:00
Jan-Christoph Borchardt afeb9d9cbf moving the file actions properly 2012-04-28 23:11:48 +02:00
Georg Ehrke bef701c448 add version file to files app 2012-04-28 13:35:05 +02:00
Georg Ehrke 7eb7492360 some fixes for sharing 2012-04-27 23:14:53 +02:00
Bartek Przybylski 72c0d6968e fix duplicated entries on upload 2012-04-27 22:48:27 +02:00
Bart Visscher 6e7f5ec4ce Tasks: Add input to edit the task location 2012-04-27 20:26:12 +02:00
Bart Visscher c627657fc6 Tasks: Fix the display of the list of tasks 2012-04-27 17:48:08 +02:00
Sam Tuke a1b309a42a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-27 13:23:58 +01:00
Georg Ehrke 0aaf6d16a5 Merge branch 'master' into movable_apps_2 2012-04-27 14:22:12 +02:00
Sam Tuke 80c850d018 added revert attempt outcome messages, removed contextual ajax revert button for now as it's not functional, improved readaibility of scripts 2012-04-27 13:19:16 +01:00
Thomas Tanghus 768041b6cb Contacts: Added convinience method for notifications. 2012-04-27 10:35:31 +02:00
Thomas Tanghus 18c11ec81b jquery.combobox: Added 'editable' option and cleaned up a bit. 2012-04-27 10:35:31 +02:00
Thomas Tanghus 1384fdfe01 Contacts: Updated first run page. 2012-04-27 10:35:31 +02:00
Georg Ehrke f7fb4a54c9 ampache should work now 2012-04-26 22:00:37 +02:00
Georg Ehrke 5fda0e4b3b make *DAV work with movable apps 2012-04-26 21:56:29 +02:00
Georg Ehrke 6930af4c0f Merge branch 'master' into movable_apps_2 2012-04-26 21:27:22 +02:00
Georg Ehrke 78b2da583d move files to the correct place 2012-04-26 21:24:41 +02:00
Sam Tuke d96e962fc1 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-26 18:45:59 +01:00
Sam Tuke 18a024e251 started implementing ajax file rollback 2012-04-26 18:45:17 +01:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 40f95ffdf3 fix security check for the path of the requested file 2012-04-26 17:55:00 +02:00
Sam Tuke c693ee2adb added available version names to files dropdown menu via new ajax script 2012-04-26 16:48:43 +01:00
Georg Ehrke 0249a72cab fix downloading of files in files app 2012-04-26 17:35:12 +02:00
Michael Gapczynski 754844f5c9 Add ability to send private links from sharing via email 2012-04-26 10:33:24 -04:00
Sam Tuke 6312067ab5 improved styling, called css file in history.php 2012-04-26 14:32:29 +01:00
Georg Ehrke ebd82ee772 fixes for media app 2012-04-26 15:23:17 +02:00
Georg Ehrke 2c92a79b5d fixes for contacts app 2012-04-26 15:20:01 +02:00
Sam Tuke b19fae392b linked more button to history page 2012-04-26 13:54:38 +01:00
Georg Ehrke 3f64eb25ab some fixes fore movable apps 2012-04-26 14:52:55 +02:00
Sam Tuke 02c1127de3 changed function name to avoid clash with sharing dropdown 2012-04-26 13:41:22 +01:00
Thomas Tanghus 4bb1a2c2d6 Contacts: Some js cleanup. 2012-04-26 10:38:39 +02:00
Thomas Tanghus 5dbf362623 Contacts: Added import with with file picker. 2012-04-26 03:21:52 +02:00
Michael Gapczynski c20abfef38 Fix a counting mistake 2012-04-25 19:30:58 -04:00
Michael Gapczynski 32de47d1d9 Update sharing when users are removed, added to groups, and removed from groups 2012-04-25 18:18:58 -04:00
Georg Ehrke b75f680b8e gallery app seems to work now :) 2012-04-25 21:20:30 +02:00
Georg Ehrke 1a913ac282 bookmarks app seems to work now :) 2012-04-25 21:20:06 +02:00
Michael Gapczynski 6895c54a3f Fix javascript checkbox toggle for resharing 2012-04-25 14:37:14 -04:00
Arthur Schiwon cbba469990 LDAP rewrite, use unique LDAP user and group identifiers on LDAP side as well as fancy (unqiue as far as users a know from LDAP) names on the ownCloud side. It's done via mapping of owncloud names and LDAP identifiers.
some performance enhancements: faster searching for users and groups in their specific subtrees. Reading instead of searching were possible.

thanks for the feedback of Kevin van Kuik
2012-04-25 20:35:30 +02:00
Arthur Schiwon 0933b5e7ab use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things. 2012-04-25 20:35:30 +02:00
Arthur Schiwon a82d709f87 don't forget new JS file 2012-04-25 20:35:30 +02:00
Arthur Schiwon e1cd690a7c LDPA: group settings into basic and advanced to look less crowded. Still needs some love. Looks different to the other admin settings, though. 2012-04-25 20:35:29 +02:00
Sam Tuke c00762b49b added dropdown js menu for file versions, improved readability of history.php 2012-04-25 17:37:45 +01:00
Michael Gapczynski 7d9587bab3 Forgot to remove error log messages... 2012-04-25 11:54:16 -04:00
Michael Gapczynski b369adbd94 Allow admin to disable resharing of files 2012-04-25 11:51:30 -04:00
Sam Tuke a3dff248a1 fixed path to history script 2012-04-25 14:27:55 +01:00
Sam Tuke 8ae1430090 added script and loaded it for adding history button 2012-04-25 13:56:43 +01:00
Sam Tuke 81f549baee made code a little more readable 2012-04-25 13:51:08 +01:00
Thomas Tanghus 4795295fb1 Contacts: Fixed some file paths. 2012-04-25 10:44:27 +02:00
Georg Ehrke d76552a009 Merge branch 'sabredav_1.6' 2012-04-25 10:39:31 +02:00
Thomas Tanghus 20f1c1e6ca Forgot to fix one file... 2012-05-06 00:39:01 +02:00
Bart Visscher 6c554d0ffa Calendar: Fix calendar export link 2012-05-06 00:35:49 +02:00
Thomas Tanghus 93ae945414 Contacts: Fix for leftcontent positioning in Android browser. 2012-05-06 00:34:08 +02:00
Thomas Tanghus 2953f4d11a Contacts: Removed redundant styles. 2012-05-06 00:34:07 +02:00
Frank Karlitschek b462795be2 added a nice API to get the installes Apps with names, urls and icon from the outside.
This is useful for some nice upcoming desktop and mobile integration
2012-05-05 23:42:38 +02:00
Michael Gapczynski 565e02d061 Add back removed groups to the select form correctly 2012-05-05 17:10:07 -04:00
Bart Visscher d854e4a144 Calendar: fix return of insert id 2012-05-05 22:32:55 +02:00
Bart Visscher f991948a71 Fix loading by apptype in webdav 2012-05-05 21:58:10 +02:00
Michael Gapczynski ef9511c713 Refactor sharing UI; bug fixes, code clean-up, and more efficient with less ajax calls 2012-05-05 15:18:14 -04:00
Michael Gapczynski d764585d8b Remove blind effect for email private link in drop down 2012-05-05 14:57:25 -04:00
Georg Ehrke 03f81fdd88 fix js fail in media player 2012-04-25 10:27:17 +02:00
Georg Ehrke 323b19a4a0 some fixes in contacts javascript files 2012-04-25 10:17:54 +02:00
Georg Ehrke 60c0827ba3 Merge branch 'master' into movable_apps 2012-04-25 09:23:01 +02:00
Georg Ehrke 9ee2bb9719 fix js fail in media player 2012-04-25 09:22:19 +02:00
Robin Appelman 5b70e2fb25 some performance improvements to the openstack swift backend 2012-04-25 00:12:12 +02:00
Robin Appelman 5c3ea14819 fix mimetypes of encrypted files 2012-04-25 00:12:12 +02:00
Georg Ehrke f17eea506a fix merge conflicts 2012-04-24 21:59:56 +02:00
Georg Ehrke 684007bbae fix pathes in contacts 2012-04-24 21:33:34 +02:00
Frank Karlitschek a3d0a74d03 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-24 15:38:36 +02:00
Frank Karlitschek 69a2173fdb non working app. moved to the apps-playground repository 2012-04-24 14:00:44 +02:00
Thomas Tanghus b824425186 Added loading indicator. 2012-04-24 11:38:11 +02:00
Thomas Tanghus 988f98fc6f Contacts: Check that UIDs really are unique on import. Better solution would be to suggest to merge contacts, but that will have to wait to OC5 ;-) 2012-04-24 11:35:56 +02:00
Thomas Tanghus 22f4acadc0 Contacts: In app import (for Chrome and Firefox only) 2012-04-24 01:44:07 +02:00
Thomas Tanghus b8da5c5262 Contacts: Tried to format NOTE field a bit. Needs to be improved more though. 2012-04-24 01:44:07 +02:00
Thomas Tanghus dfc94cbe84 Contacts: In app import. Cleanup still needed. 2012-04-24 01:44:07 +02:00
Thomas Tanghus 0cd9570277 Applied patches by Nicolas progweb at free.fr - https://mail.kde.org/pipermail/owncloud/2012-April/002900.html 2012-04-24 01:44:07 +02:00
Frank Karlitschek 4ea927a798 wrote a new versioning app over the weekend. Basic functionality to far but it works (TM) and has all the needed features (TM) for ownCloud 4. Userinterface integration and small improvements still missing. 2012-04-23 23:54:49 +02:00
Bart Visscher b704ff1bc7 Tasks: Simple add task action 2012-04-23 22:13:35 +02:00
Georg Ehrke fd47fbe176 fix contacts app a bit 2012-04-23 20:42:52 +02:00
Georg Ehrke 9092692b8e make calendar work with movable apps 2012-04-23 20:32:55 +02:00
Georg Ehrke 10eea3f464 fix pathes of shared calendars 2012-04-23 20:13:55 +02:00
Georg Ehrke d1110c62ef fix file path in apps/media/ajax/api.php 2012-04-23 20:01:48 +02:00
Georg Ehrke 42a570788b Merge branch 'master' into movable_apps 2012-04-23 19:56:07 +02:00
Bart Visscher 728e6a6bf9 Tasks: Simple categories input 2012-04-23 18:28:44 +02:00
Georg Ehrke 3b9d283245 fix path in apps/files/templats/index.php 2012-04-23 16:25:07 +02:00
Georg Ehrke c0df15367f fix style.css of the files app 2012-04-23 16:18:15 +02:00
Georg Ehrke 08fe6bdb27 fix path in /apps/files/js/timezone.php 2012-04-23 16:17:35 +02:00
Jan-Christoph Borchardt 3ba9a9e6a8 adding proper copyright and license notice to the style files 2012-04-23 14:19:03 +02:00
Arthur Schiwon 912c87eeda LDAP: optimize LDAP requests for users and groups. Settings are still to do, though. 2012-04-23 13:04:58 +02:00
Georg Ehrke 1b084cc120 Merge branch 'master' into movable_apps 2012-04-23 13:03:50 +02:00
Arthur Schiwon 6ee7dc5f59 only retrieve requested attributes 2012-04-23 12:32:17 +02:00
Arthur Schiwon fffbf26159 don't forget to declare class properties 2012-04-23 11:22:11 +02:00
Thomas Tanghus 82ba2151d1 Wrong app check. 2012-04-23 10:52:13 +02:00
Thomas Tanghus 8f2e9caf96 Contacts: Tipsyfied photo toolbar. 2012-04-23 10:52:13 +02:00
Robin Appelman d17eba19c1 fix image viewer 2012-04-22 21:27:20 +02:00
Robin Appelman c5b31b001a add the option to disable file encryption while still being able to decrypt existing files 2012-04-22 21:27:20 +02:00
Thomas Tanghus e8f062dc93 Contacts:
- Added overlay toolbar to contact photo with 'Delete current', 'Edit current', 'Load from OC_Filesystem' and 'Upload' options.
- Made action icons translucent instead of hiding them.
2012-04-22 20:47:24 +02:00
Thomas Tanghus 8a6cb23170 Contacts: Clear cache for contact photo and thumbnail when it has been changed. 2012-04-22 20:47:24 +02:00
Georg Ehrke e888f4d9bc Merge branch 'master' into sabredav_1.6 2012-04-22 13:20:50 +02:00
Georg Ehrke 4c2cf35050 fix merge conflicts 2012-04-22 13:19:12 +02:00
Georg Ehrke 1bba445642 hide alarm and attendees tab 2012-04-22 13:15:24 +02:00
Thomas Tanghus f08cfcecec Personal settings: Emphasized labels etc, mono-spaced generated paths and moved text formatting to style sheet. 2012-04-22 03:59:28 +02:00
Thomas Tanghus 24aff287cf Link to icon was absolute. 2012-04-22 03:39:59 +02:00
Thomas Tanghus f85aaf1f58 Contacts: Added bg color and shadow to controls. I suck at CSS... 2012-04-22 02:32:51 +02:00
Thomas Tanghus 80ddf37bb7 Missing double quote. 2012-04-22 02:09:13 +02:00
Thomas Tanghus 651de1e588 Contacts: Fix error on photo crop. 2012-04-22 01:50:46 +02:00
Thomas Tanghus 9e3242d05e Contacts: Changed layout as discussed with JanC. Still WiP. 2012-04-22 00:44:53 +02:00