Commit Graph

4401 Commits

Author SHA1 Message Date
Arthur Schiwon 0c8740c1d5 LDAP: and don't forget the else part 2012-05-14 13:13:08 +02:00
Arthur Schiwon 82cfb3e0f5 LDAP: don't store agent password in plain text 2012-05-14 12:58:58 +02:00
Arthur Schiwon 2e34673989 LDAP: no whitespaces after the , in the DNs, resolves conflicts with some servers 2012-05-14 12:25:33 +02:00
Thomas Tanghus 1f2b37c08b Contacts: Photo upload handlers wern't being loaded for new contacts.
Name conflict with two FileUploads :-P
2012-05-14 11:08:00 +02:00
Klaas Freitag 3514ec5947 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-14 10:52:25 +02:00
Klaas Freitag 1fc74ea174 Add ctmp extension to blacklist to make sync test files not versioned. 2012-05-14 10:51:41 +02:00
Thomas Tanghus 40f91d9f7c Contacts: The proper DOM wasn't loaded after import and thumbnails weren't being updated. 2012-05-14 10:13:45 +02:00
Michael Gapczynski 6d37f9b951 Remove scroll to bookmarks_menu, no longer existent and the bookmark controls are always visible at the top anyways 2012-05-13 21:10:27 -04:00
Robin Appelman e7c106d91e selective app loading for remote/public 2012-05-14 00:28:28 +02:00
Robin Appelman 0fb90fa875 set public handeler in info,xml for sharing 2012-05-14 00:28:27 +02:00
Thomas Tanghus 4e1e978b89 Contacts: Forgot one file for the import fix. 2012-05-13 23:27:14 +02:00
Thomas Tanghus 9295f49553 Contacts: Add error checking and reporting to import from files app. 2012-05-13 23:27:14 +02:00
Michael Gapczynski 1629c77eb5 Validate bookmark inputs, fixes bug oc-636 2012-05-13 16:58:47 -04:00
Tom Needham 90518e8d2a Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-13 20:50:19 +00:00
Tom Needham b80b8656eb Third time lucky fixing google font include 2012-05-13 20:49:54 +00:00
Michael Gapczynski 8a42d159f7 Variable not declared in media app, fixes bug oc-633. Thanks to die3lustigen2. 2012-05-13 16:45:03 -04:00
Tom Needham ddb8d1460b Revert "Remove google webfont include"
This reverts commit 30d31fecd9.
2012-05-13 20:43:20 +00:00
Tom Needham 2e2eccc879 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-13 20:19:25 +00:00
Tom Needham 21dfe9dc5e Fixed keyboard shortcut for saving files. Thanks adlr in #ace! 2012-05-13 20:19:20 +00:00
Michael Gapczynski 198b73ddd1 Sanitize search queries, thanks to Lukas Reschke 2012-05-13 15:57:46 -04:00
Georg Ehrke 3ce6eca40a fix fail in previous commit 2012-05-13 21:46:34 +02:00
Georg Ehrke 3327aabe4d fix remote.php for servers which doesn't support PATH_INFO 2012-05-13 21:46:34 +02:00
Tom Needham 82d3fe2e1c Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-05-13 19:42:00 +00:00
Tom Needham 30d31fecd9 Remove google webfont include 2012-05-13 19:41:41 +00:00
Tom Needham 78ecfc89a7 Fix breadcrumb path 2012-05-13 19:33:42 +00:00
Michael Gapczynski a332c39472 Check if path_info is empty as well, fixes bug oc-632. Thanks to die3lustigen2. 2012-05-13 15:26:30 -04:00
Robin Appelman 6b6477a90a fix getting the db scheme from existing database 2012-05-13 21:22:08 +02:00
Robin Appelman 8d475debe0 additional logging when db upgrade fails 2012-05-13 21:21:39 +02:00
Robin Appelman 68fd5a5d58 some mdb2 pgsql fixes 2012-05-13 20:56:25 +02:00
Robin Appelman 1a2ab2ef68 prevent user creation with empty password 2012-05-13 20:53:56 +02:00
Robin Appelman 77e2387d94 more MDB2 updates 2012-05-13 20:53:55 +02:00
Georg Ehrke ddf0903ace add post user delete hook for calendar sharing 2012-05-13 20:03:52 +02:00
Robin Appelman ee0294bbb1 update translations 2012-05-13 20:00:34 +02:00
Georg Ehrke 6e9ed3791b Merge branch 'master' into calendar_dropimport 2012-05-13 19:12:35 +02:00
Georg Ehrke 0892abd050 some little js fixes for drop import 2012-05-13 15:08:27 +02:00
Thomas Tanghus 3926e2d4f3 VCategories: Made a small check for categories that seems to resolv the problems in Calender. Also reverts the changes from 9e6221b229. 2012-05-13 15:07:07 +02:00
Georg Ehrke 62a86748b5 Merge branch 'master' into calendar_dropimport 2012-05-13 15:06:02 +02:00
Georg Ehrke 63a1b066bc add first version of drop import 2012-05-13 15:05:57 +02:00
Georg Ehrke 5ac10a9c0e hide share tab for new events, because you can't share an event that haven't got an id yet 2012-05-13 12:28:28 +02:00
Georg Ehrke f45411f79d fix another php notice 2012-05-13 12:25:26 +02:00
Georg Ehrke 85cc34fd05 fix another php notice 2012-05-13 12:14:08 +02:00
Georg Ehrke f6dc158d51 fix php notice and displaying of events 2012-05-13 12:02:36 +02:00
Thomas Tanghus 9e6221b229 VCategories: Suppress error messages stemming from import from file app. 2012-05-13 09:16:53 +02:00
Thomas Tanghus 56bd3f1220 Revert "Edited combobox to adhere to coding standards and added a dblclick handler."
This reverts commit 19b55d3fce.
2012-05-13 06:22:15 +02:00
Thomas Tanghus 996020d82b Revert "Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-)"
This reverts commit a36a8faad4.

Moved it to unstable branch for now.
2012-05-13 06:22:15 +02:00
Frank Karlitschek af77ce9a9b This is RC now 2012-05-13 05:11:10 +02:00
Thomas Mueller 546ae30421 non-minified version added 2012-05-12 20:56:29 +02:00
Thomas Mueller 51cb1c9ffa fixing file headers with copyright 2012-05-12 20:46:07 +02:00
Thomas Tanghus 19b55d3fce Edited combobox to adhere to coding standards and added a dblclick handler. 2012-05-12 13:43:34 +02:00
Thomas Tanghus a36a8faad4 Contacts: Change placeholder text to avoid confusion. No, JanC, I won't change it back again ;-) 2012-05-12 13:43:33 +02:00