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 |
Frank Karlitschek
|
eab4a05d78
|
implement missing getusers call
|
2012-05-04 11:13:07 +02:00 |
|
Thomas Tanghus
|
27da29525a
|
Made the global settings icon accessable via keyboard.
Bug http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-561
|
2012-05-04 09:53:36 +02:00 |
|
Thomas Tanghus
|
8d1754041e
|
VCategories: Check if any categories are selected before json call. Add Close button. Remove log calls.
|
2012-05-04 01:33:47 +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 |
|
Thomas Tanghus
|
a4a3d62a55
|
Check for callback in OC.dialogs.alert.
|
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 |
Robin Appelman
|
3d6909f372
|
add mount config to gitignore
|
2012-05-03 23:17:03 +02:00 |
|
Robin Appelman
|
a22a79cddd
|
fix filecache for postgresql
|
2012-05-03 23:17:03 +02:00 |
|
Arthur Schiwon
|
76a60a2fc3
|
ups, we don't have a CSS file therefore
|
2012-05-03 23:03:05 +02:00 |
|
Robin Appelman
|
9e03ea4a28
|
ensure the files app is always loaded
|
2012-05-03 20:47:18 +02:00 |
|
Bart Visscher
|
b62a8ba0f8
|
Better regex for old apps rewrite rule
|
2012-05-03 17:33:57 +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
|
55194e0343
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-03 13:07:28 +02:00 |
|
Frank Karlitschek
|
97a8af7f25
|
ported oc_db
|
2012-05-03 13:06:08 +02:00 |
Bartek Przybylski
|
5611e6c9d3
|
fix incorrect dialog computing in ff
|
2012-05-03 12:32:37 +02:00 |
|
Frank Karlitschek
|
f85d076a4e
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2012-05-03 12:26:28 +02:00 |
|
Frank Karlitschek
|
43caa3b3b9
|
ported oc_json
|
2012-05-03 12:23:29 +02:00 |
|
Bartek Przybylski
|
8feb7dd9d9
|
fix filepicker in webkit
|
2012-05-03 12:09:59 +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 |