Commit graph

1802 commits

Author SHA1 Message Date
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
Thomas Tanghus
56e064bd09 Don't trigger unnecessary change events. 2012-04-22 00:44:53 +02:00
Thomas Tanghus
16fc4dfd1a Contacts: Fixed contact photo drag'n'drop upload - again... 2012-04-22 00:44:53 +02:00
Thomas Tanghus
a34631f84e Contacts: Add check for empty FN field. 2012-04-22 00:44:53 +02:00
Frank Karlitschek
69f3b5e2d2 make the button a bit more consistent to the other ownCloud interface 2012-04-21 23:34:24 +02:00
Frank Karlitschek
260c48c29a cleanup the admin page layout mess a bit. Still a lot to improve in the future :-) 2012-04-21 23:23:02 +02:00
Georg Ehrke
0918fc7d91 fix merge conflicts 2012-04-21 23:21:50 +02:00
Frank Karlitschek
80950f2e1c make field completely visible 2012-04-21 23:10:35 +02:00
Frank Karlitschek
ff3b199cc8 use less space 2012-04-21 23:08:52 +02:00
Frank Karlitschek
1a49497899 structure the information a bit more so that is easier readable 2012-04-21 22:55:18 +02:00
Georg Ehrke
74e5402711 fix a php notice 2012-04-21 22:27:19 +02:00
Georg Ehrke
e29ae46609 fix merge conflicts 2012-04-21 22:12:31 +02:00
Georg Ehrke
711aa229b8 Merge branch 'master' into movable_apps 2012-04-20 22:41:39 +02:00
Georg Ehrke
c3d78cf77a remove require once lib base in files scan.php 2012-04-20 22:34:13 +02:00
Georg Ehrke
3aeea0c196 Merge branch 'merge-requests/105' 2012-04-19 20:31:24 +02:00
Georg Ehrke
3706bbec1b Merge commit 'refs/merge-requests/105' of git://gitorious.org/owncloud/owncloud into merge-requests/105 2012-04-19 20:30:58 +02:00
Robin Appelman
5cefd34660 emulate touch with custom mtime for swift backend 2012-04-19 00:25:47 +02:00
Robin Appelman
9a707e10bf add SWIFT (openstack object storage) storage backend 2012-04-18 20:54:28 +02:00
Robin Appelman
d1ad4dc8d6 add test cases for cryptstream 2012-04-18 20:54:28 +02:00
Robin Appelman
b39c3d4c4e make use of the fact that stream_read will always read 8192 bytes for encryption stream
https://bugs.php.net/bug.php?id=21641
2012-04-18 20:54:28 +02:00
Robin Appelman
26e9a0dd13 bugfixes for encryption library and test cases 2012-04-18 20:54:28 +02:00
Georg Ehrke
b44bc9f4b2 remove require once lib base in some more files 2012-04-18 17:42:11 +02:00
Georg Ehrke
45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00
Georg Ehrke
eb29c577c2 Merge branch 'master' into movable_apps 2012-04-18 12:20:09 +02:00
Georg Ehrke
cf492a9649 Merge branch 'master' into calendar_sharing 2012-04-18 11:51:59 +02:00
Georg Ehrke
de71842888 implement shared calendar activation on server side 2012-04-18 11:50:12 +02:00
Georg Ehrke
8959e0af3d implement shared calendar activation on js-side 2012-04-18 11:39:00 +02:00
Georg Ehrke
7402543d3e resotre old templates/part.choosecalendar.rowfields.php - i hate merge conflicts 2012-04-18 09:53:54 +02:00
Georg Ehrke
69ee0efc0b remove the require_once lib base from all (or nearly all) files 2012-04-17 19:31:29 +02:00
Robin Appelman
4dabd0fb9c test data for archives 2012-04-17 18:04:06 +02:00
Arthur Schiwon
66018b89b2 LDAP: don't forget to unbind 2012-04-16 18:03:02 +02:00
Arthur Schiwon
86192c2f8d checked, works for me 2012-04-16 17:31:39 +02:00
Arthur Schiwon
9cd5221d47 group ldap: check configuration 2012-04-16 17:28:58 +02:00
Arthur Schiwon
ed54de1bbf group LDAP: implement groupExists function, needed for Sharing 2012-04-16 16:23:00 +02:00
Arthur Schiwon
320fde9eec OC_Group does expect object, not string 2012-04-16 15:09:38 +02:00
Arthur Schiwon
899c7631d5 minor code beautification 2012-04-16 15:09:38 +02:00
Arthur Schiwon
e1948c651b use the right attribute for member retrieval 2012-04-16 15:09:38 +02:00
Arthur Schiwon
02f4e78f3e a string be a string 2012-04-16 15:09:38 +02:00
Jan-Christoph Borchardt
70d0103a67 updated logos and icons 2012-04-16 11:34:16 +02:00
Georg Ehrke
77cefdedb8 Merge branch 'master' into sabredav_1.6 2012-04-15 22:28:11 +02:00
Georg Ehrke
dc18e65b46 fix merge conflicts 2012-04-15 22:26:55 +02:00
Tom Needham
b0e68d039c Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-15 15:09:54 +00:00
Tom Needham
712e25bb02 Update ace 2012-04-15 15:09:37 +00:00
Jakob Sack
0b426b5e64 Display correct URL in caldav and carddav paths 2012-04-15 16:50:45 +02:00
Jakob Sack
9b1d6246a9 Remove useless, unmaintained dav.php 2012-04-15 16:50:44 +02:00
Robin Appelman
9ac65c51f5 dont try to view psd files 2012-04-15 16:26:08 +02:00
Tom Needham
fef3434bdf Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-15 14:02:13 +00:00
Tom Needham
738601f4fe Remove google web font 2012-04-15 14:01:59 +00:00
Thomas Müller
679ddc0e32 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-15 16:01:06 +02:00
Thomas Müller
f36d31f74d pdfjs updated from github 2012-04-15 15:59:31 +02:00
Arthur Schiwon
80f4c4f923 Bookmarks: handle input with & and ?, fixes oc-201 2012-04-15 15:53:40 +02:00
Tom Needham
9ee3eb1412 remove unused css 2012-04-15 13:44:43 +00:00
Robin Appelman
b3ae2208b1 clean the collection view after rescanning 2012-04-15 15:19:30 +02:00
Robin Appelman
cf3bb08dfb enable archive support on default 2012-04-15 15:19:30 +02:00
Robin Appelman
9ee931e790 only run archive tests if the test data is available 2012-04-15 15:19:30 +02:00
Arthur Schiwon
819af69972 group LDAP: simple basic tests 2012-04-15 14:50:03 +02:00
Arthur Schiwon
0a46c7a393 group LDAP: usersInGroup not getUsersInGroup
offer static readonly properties
2012-04-15 14:50:03 +02:00
Arthur Schiwon
2a03db6065 don't forget changes in lib_ldap for last commit 2012-04-15 14:50:03 +02:00
Arthur Schiwon
8a6fa65ed6 group LDAP: implemented getUsersInGroup() 2012-04-15 14:50:03 +02:00
Arthur Schiwon
b480071946 group LDAP: implemented getUserGroups() 2012-04-15 14:50:03 +02:00
Arthur Schiwon
0912f40ebe typo 2012-04-15 14:50:03 +02:00
Arthur Schiwon
54a9fd2e6a group LDAP: implemented inGroup() 2012-04-15 14:50:03 +02:00
Georg Ehrke
8ddea7e95c Merge branch 'master' into calendar_sharing 2012-04-15 14:28:31 +02:00
Jan-Christoph Borchardt
7ddd043427 renamed extention to extension, also now only showing lowercase 2012-04-15 13:34:30 +02:00
Georg Ehrke
e292b1fcdb fix merge conflicts 2012-04-15 12:43:07 +02:00
Bart Visscher
3b71e46cf7 Contact: Don't use non core class in appinfo/app.php 2012-04-14 18:34:59 +02:00
Arthur Schiwon
29bb5d27e4 few pieces of documentation 2012-04-14 18:26:51 +02:00
Arthur Schiwon
19243b3e91 give back expected result types as long as logic is not there yet 2012-04-14 18:08:40 +02:00
Arthur Schiwon
e160acefe3 test for ldap group backend 2012-04-14 18:08:40 +02:00
Arthur Schiwon
61a43419a5 starting to create the ldap group backend (with some inspiration from Yoann Gini) and preparing an general LDAP class 2012-04-14 18:08:40 +02:00
Robin Appelman
b1bcc60d83 reuse OC_L10N objects 2012-04-14 16:44:15 +02:00
Robin Appelman
926b2b78fe keep version numbers in their own files for faster reading 2012-04-14 16:29:11 +02:00
Tom Needham
44c34115a4 Remove go to line 2012-04-14 12:49:31 +00:00
Tom Needham
9b1c881ca8 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-14 11:18:25 +00:00
Bart Visscher
5c55b9c5ac Sharing: Add a filename after public share link
We don't do anythink with the name, but it is nice to know the file the
link point to.
2012-04-14 12:45:32 +02:00
Bart Visscher
524bd2e75f Sharing: Don't get share icon for undefined filename 2012-04-14 12:45:32 +02:00
Bart Visscher
7504ceb6f2 Sharing: Define missing template vars 2012-04-14 12:45:32 +02:00
Robin Appelman
3babb8c22c improve flexibility of search providers a bit 2012-04-14 11:29:54 +02:00
Arthur Schiwon
8ed4606685 LDAP: don't keep possibly outdated passwords 2012-04-14 11:08:50 +02:00
Georg Ehrke
e256ac8791 fix unsharing of events 2012-04-13 21:49:24 -04:00
Georg Ehrke
c65adc12d5 add chosen script to calendar 2012-04-13 21:29:51 -04:00
Georg Ehrke
5d4c546693 fix public sharing of calendars 2012-04-13 17:36:47 -04:00
Georg Ehrke
ea3499a712 fix class name 2012-04-13 17:26:34 -04:00
Georg Ehrke
1e0364baa8 check permission check in share function 2012-04-13 17:16:28 -04:00
Georg Ehrke
77a9e343aa Merge branch 'master' into sabredav_1.6 2012-04-13 16:42:10 -04:00
Georg Ehrke
afcb0aee40 fix merge conflicts 2012-04-13 16:40:10 -04:00
Georg Ehrke
02dc343209 fix address of public shared calendars 2012-04-13 16:26:06 -04:00
Georg Ehrke
854eaff34f hide share tab in shared events 2012-04-13 16:20:19 -04:00
Tom Needham
0aaaefbb4b Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-04-13 20:10:35 +00:00
Tom Needham
1165b358b4 Update language string 2012-04-13 20:09:04 +00:00
Bart Visscher
b9f9228a22 Contacts: Save the category list update when updating/adding contact 2012-04-13 21:13:58 +02:00
Bart Visscher
4c52007996 Calendar: Update category list when updating/adding event 2012-04-13 21:13:58 +02:00
Bart Visscher
471e735b0c Calendar: Document active parameter in allCalendars 2012-04-13 21:13:58 +02:00
Bart Visscher
7cf7d5c3dd Calendar: Also set repeat options when editing a non repeating event 2012-04-13 21:13:58 +02:00
Bart Visscher
28e0d64ede Calendar: Fix saving of Categories in an event 2012-04-13 21:13:58 +02:00
Bart Visscher
f9b7ed3a1f Calendar: Implement rescan of Categories 2012-04-13 21:13:58 +02:00
Thomas Tanghus
6aee6dae6b VCategories css is now in styles.css 2012-04-13 18:50:40 +02:00
Thomas Tanghus
b654121b50 Contacts: Better error reporting. 2012-04-13 18:50:40 +02:00
Robin Appelman
6066ea3170 only run tests for files_external when asked for explicitly 2012-04-13 18:49:50 +02:00
Robin Appelman
8686667b10 some idexes for the media player tables 2012-04-13 18:49:50 +02:00
Georg Ehrke
df2e788a1c fix calendarid in eventform and validation of calendarid 2012-04-12 23:15:19 -04:00
Georg Ehrke
a7908ba76b fix bugs in share class 2012-04-12 22:11:48 -04:00
Bart Visscher
e9c1f8b4e6 Contacts: No need to sort the categories anymore 2012-04-12 23:10:49 +02:00
Bart Visscher
43ba23430d Contacts: Change "category" to "group" in UI 2012-04-12 23:10:49 +02:00
Bart Visscher
78189e2247 Contacts: update category list when the categories change 2012-04-12 23:10:49 +02:00
Bart Visscher
9165b5c28e Use the same category input and management as the contacts app 2012-04-12 23:10:49 +02:00
Bart Visscher
b2011bd0a0 Remove unused function getCategoryOptions from OC_Calendar_Object 2012-04-12 23:10:49 +02:00
Bart Visscher
5fa90cd214 Contacts: Also initialize org var in updateValuesFromAdd 2012-04-12 23:10:49 +02:00
Bart Visscher
86edc0da31 Contacts: add space before parameter 2012-04-12 23:10:49 +02:00
Bart Visscher
fa853102e4 Contacts: Move use of OC_Contacts_App::$categories to inside of OC_Contacts_App
This is in preparation of making $categories protected and initialized
with default categories.
2012-04-12 23:10:49 +02:00
Frank Karlitschek
48f99fe661 off by default. great tool for developers but confusing for users. 2012-04-12 20:23:45 +02:00
Deepak Mittal
bd262eaac0 Fixed OC-261 by modifying js files in apps/media/ 2012-04-12 17:56:53 +02:00
Daniele E. Domenichelli
d9aa31fd92 Use OC_Helper::serverHost() in openid settings 2012-04-12 17:51:17 +02:00
Robin Appelman
8cea656ad7 upgrade getid3 2012-04-12 15:54:08 +02:00
Georg Ehrke
0f16935763 fix bugs and optimize OC_Calendar_Object Class 2012-04-11 10:21:45 -04:00
Georg Ehrke
613e15035e Merge branch 'master' into sabredav_1.6 2012-04-10 22:44:13 -04:00
Georg Ehrke
ac2d14101c Merge branch 'master' into calendar_sharing 2012-04-10 20:10:07 -04:00
Georg Ehrke
64d3301523 make shared events editable and add (empty) classes for alarm and attendees 2012-04-10 16:03:38 -04:00
Bart Visscher
2dfa02a346 Contacts: fix function names to coding standard 2012-04-10 21:53:36 +02:00
Bart Visscher
3f6e971571 Contacts: Don't lowercase categories value when saving 2012-04-10 21:19:39 +02:00
Bart Visscher
fd72556fd1 Contacts: Make part.no_contacts.php translatable 2012-04-10 21:15:38 +02:00
Georg Ehrke
eaa649cfb2 fix bug in share lib of calendar 2012-04-10 11:18:02 -04:00
Frank Karlitschek
47f94548ce don´t enable by default. still broken 2012-04-10 15:05:33 +02:00
Frank Karlitschek
6cf3f10d35 fix includes 2012-04-09 22:51:53 +02:00
Frank Karlitschek
b0894b3148 Add Craigs granite library to 3rdparty and files_versioning. Still not working and lots ot stuff to do. 2012-04-09 22:10:29 +02:00
Thomas Tanghus
4fda6af725 Contacts: Fix for not being able to add contact to empty/non-existant address book. 2012-04-09 16:30:58 +02:00
Thomas Tanghus
9c247ce874 Removed padding. 2012-04-09 16:30:58 +02:00
Thomas Tanghus
53091551d8 Re-added file I had accidentally removed earlier :-P 2012-04-09 16:30:58 +02:00
Tom Needham
ecc596534a Decode json response for admin exports 2012-04-08 19:08:17 +00:00
Georg Ehrke
9294a95438 fix view of single shared events 2012-04-07 22:54:38 -04:00
Georg Ehrke
960553f9c4 fix path and class name 2012-04-07 22:45:44 -04:00
Georg Ehrke
5a4237a31d make dropdown menu work with single event sharing 2012-04-07 22:41:24 -04:00
Georg Ehrke
97d216c94d add dropdown to eventform 2012-04-07 22:40:20 -04:00
Georg Ehrke
4d884c3849 clean up events.php of calendar 2012-04-07 22:39:37 -04:00
Georg Ehrke
e940152bce fix bugs in share lib of calendar 2012-04-07 22:39:02 -04:00
Georg Ehrke
eef9a1e7ed add access check to ajax files 2012-04-07 22:37:26 -04:00
Georg Ehrke
e18c0d54f6 add output functions and access function to app.php of calendar 2012-04-07 22:35:29 -04:00
Tom Needham
c0869887cf Return JSON for import and export methods of OC_Migrate 2012-04-07 21:55:16 +00:00
Tom Needham
9edf45a324 Merge branch 'master' into migration 2012-04-07 17:31:30 +00:00
Tom Needham
d2886f2020 Hide instance import as it eats data 2012-04-07 17:27:09 +00:00
Tom Needham
00449cdf37 rename admin_export -> admin_migrate 2012-04-07 17:23:25 +00:00