Commit graph

4329 commits

Author SHA1 Message Date
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
Bartek Przybylski
ab9927d5fc oc-627, calling base function instead of loading too much useless functions 2012-05-12 13:25:04 +02:00
Michael Gapczynski
b4e7c05959 Encoded slashes (%2F) don't look pretty in our private link urls 2012-05-11 20:58:21 -04:00
Michael Gapczynski
faebee5f25 Turn async off when fetching users to make sure the users get removed from the select form 2012-05-11 20:39:48 -04:00
Robin Appelman
9eb91a111d update to jquery 1.7.2 2012-05-12 00:37:19 +02:00
Robin Appelman
d07512c82d fix gallery previous not showing 2012-05-12 00:37:19 +02:00
Bart Visscher
20499e336b Remove duplicate line 2012-05-11 22:13:05 +02:00
Brice Maron
5b7c69f978 Change sqlite escaping of identifier to double quote. Fixing some issues 2012-05-11 19:45:53 +00:00
Bart Visscher
919681f3e6 Make processed css files cachable 2012-05-11 21:33:02 +02:00
Robin Appelman
847832ae77 also set remote/public paths on installing apps 2012-05-11 20:58:23 +02:00
Robin Appelman
d12021e3c4 fix sqlite3 driver against updated MDB2 2012-05-11 20:56:02 +02:00
Robin Appelman
cf3940425f don't do the initial scanning of the users home folder trough the update system 2012-05-11 20:49:19 +02:00
Robin Appelman
0622fa79ba add temporary filestorage backend for testing purposed 2012-05-11 20:33:56 +02:00
Robin Appelman
b40f9670ae allow clearing hooks and fileproxies 2012-05-11 20:33:56 +02:00
Robin Appelman
736739bbbd load remote and public paths from info.xml during upgrade instead of setting them every time 2012-05-11 20:33:56 +02:00
Robin Appelman
d2bd78c41a update MDB2 and XML_Parser 2012-05-11 20:33:56 +02:00
Arthur Schiwon
3c2af95108 LDAP: offer only ownCloud-enabled users for sharing 2012-05-11 19:21:13 +02:00
Thomas Tanghus
8e5240d579 Contacts: Make the structured name dialog modal to avoid confusion. 2012-05-11 18:21:55 +02:00
Thomas Tanghus
646a4bd635 Contacts: Clone event handlers as well. 2012-05-11 18:21:55 +02:00
Thomas Tanghus
08e0b6cf5e Contacts: Also strip parameters. 2012-05-11 18:21:55 +02:00
Sam Tuke
d98d72aa99 improved url generation - made use of OC.linkTo() for linking to versions history page 2012-05-11 17:13:58 +01:00
Michiel de Jong
c99d7dd94f the ',last' breaks all other rewrite rules and is also not there in the committed .htaccess, so removing it. anybody know why it was there? 2012-05-11 17:59:21 +02:00
Robin Appelman
9c2f105164 update PEAR to 1.9.4 2012-05-11 17:57:55 +02:00